Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/Cipher_code

[Cipher_code.git] / IDA_new / ida_gf65_paper3.cpp

diff --git a/IDA_new/ida_gf65_paper3.cpp b/IDA_new/ida_gf65_paper3.cpp
index 74495b70b5f701a148a4c96c8faa35d2e40c2ce2..ccc7a69445235395833bfc28eb1a17401325dd88 100644 (file)
--- a/IDA_new/ida_gf65_paper3.cpp
+++ b/IDA_new/ida_gf65_paper3.cpp
@@ -61,7 +61,7 @@ void display(mylong *mat, int r, int c) {
 mylong *matrix_multiply(gf_t *gf, mylong *m1, mylong *m2, int r1, int c1, int r2, int c2, int w, float *toto)
 {
   mylong *product;
 mylong *matrix_multiply(gf_t *gf, mylong *m1, mylong *m2, int r1, int c1, int r2, int c2, int w, float *toto)
 {
   mylong *product;

-  int i=iii, j, k;
+  int i, j, k;

 
   product = (mylong *) malloc(sizeof(mylong)*r1*c2);
   for (i = 0; i < r1*c2; i++) product[i] = 0;
 
   product = (mylong *) malloc(sizeof(mylong)*r1*c2);
   for (i = 0; i < r1*c2; i++) product[i] = 0;


@@ -504,13 +504,18 @@ int main(int argc, char **argv)
   display(matG, n, t);
 */
 
   display(matG, n, t);
 */
 

+  int nb_iter=1000;
+  

 //  sleep(2);
 //  sleep(2);

+  float toto=0.001;

   auto start = std::chrono::system_clock::now();
   auto start = std::chrono::system_clock::now();

-  matC=matrix_multiply(&gf, matG, matS, n, t, t, len, w,0);
+  for(int i=0;i<nb_iter;i++) {
+    matC=matrix_multiply(&gf, matG, matS, n, t, t, len, w,&toto);
+  }

   auto end = std::chrono::system_clock::now();
   std::chrono::duration<double> elapsed_seconds = end-start;
   total_time+=elapsed_seconds.count();
   auto end = std::chrono::system_clock::now();
   std::chrono::duration<double> elapsed_seconds = end-start;
   total_time+=elapsed_seconds.count();

-//  cout << "elapsed time: " << elapsed_seconds.count() << "s\n";
+  cout << "elapsed time: " << elapsed_seconds.count() << " "<<toto<<"       ";

 
 //  display(matC,t,t);
 
 
 //  display(matC,t,t);
 


@@ -631,10 +636,10 @@ int main(int argc, char **argv)
 
 //  sleep(2);
   start = std::chrono::system_clock::now();
 
 //  sleep(2);
   start = std::chrono::system_clock::now();

-  float toto=0.001;
-  for(int i=0;i<1000;i++) {
+   toto=0.001;
+  for(int i=0;i<nb_iter;i++) {

 
 

-    matS2=matrix_multiply(&gf, matInvGs, matCs, t, t, t, len, w, toto);
+    matS2=matrix_multiply(&gf, matInvGs, matCs, t, t, t, len, w, &toto);

 
   }
   end = std::chrono::system_clock::now();
 
   }
   end = std::chrono::system_clock::now();