Changeset 2365 in Sophya for trunk/Eval/JET

Timestamp:

Apr 17, 2003, 11:44:13 PM (22 years ago)

Author:

ansari

Message:

Ajout comparaison avec TArray/TMatrix ds tjet.cc - Reza 17/4/03

File:

• trunk/Eval/JET/tjet.cc (modified) (6 diffs)

trunk/Eval/JET/tjet.cc

@@ -70 +70 @@
     cout << mx2 << endl << mx3 << endl << mx4 << endl;
 
+    cout << ">> Test with SimpleMatrix<T>/JET " << endl;
+    PrtTim(" (0) -- ");
+
     int i,j,k;
+    {
     SimpleMatrix<r_8> m1(nrow, ncol);
     SimpleMatrix<r_8> m2(nrow, ncol);
@@ -86 +90 @@
         }
     }
-    PrtTim(" (1) Element access done ---");
+    cout << " (1) Element access done ---" << endl;
+    PrtTim(" (1) -- ");
     // Calcul m1*c1 + m2*c2 + m3*c3;
     for(k=0; k<N; k++) {
@@ -98 +103 @@
       m5.AddElt(m4);
     }
-    PrtTim(" (2) Add/MulElt/Cst m1*c1 + m2*c2 + m3*c3 done ---");
+    cout << " (2) Add/MulElt/Cst m1*c1 + m2*c2 + m3*c3 done ---" << endl;
+    PrtTim(" (2) -- ");
 
     for(k=0; k<N; k++) {
@@ -106 +112 @@
       m5 = m1*c1+m2*c2+m3*c3;
     }
-    PrtTim(" (3) JET: m1*c1 + m2*c2 + m3*c3 done ---");
+    cout << " (3) JET: m1*c1 + m2*c2 + m3*c3 done ---" << endl;
+    PrtTim(" (3) -- ");
     // Calcul m1*c1 + m1*(m2+c2) + m2*c3; 
     for(k=0; k<N; k++) {
@@ -117 +124 @@
       m5.AddElt(m3); m5.AddElt(m4);
     }
-    PrtTim(" (4) Add/MulElt/Cst m1*c1 + m1*(m2+c2) + m2*c3 done ---");
+    cout << " (4) Add/MulElt/Cst m1*c1 + m1*(m2+c2) + m2*c3 done ---" << endl;
+    PrtTim(" (4) --");
 
     for(k=0; k<N; k++) {
@@ -127 +135 @@
       m5 = m1*c1 + m1*(m2+c2) + m2*c3;
     }
-    PrtTim(" (5) JET: m5 = m1*c1 + m1*(m2+c2) + m2*c3 ---");
+    cout << " (5) JET: m5 = m1*c1 + m1*(m2+c2) + m2*c3 ---" << endl;
+    PrtTim(" (5) -- ");
+    }
+    // Test avec les TArray / TMatrix
+    {
+    cout << " >>>>> test with SOPHYA::TArray / TMatrix " << endl;
+    TMatrix<r_8> m1(nrow, ncol);
+    TMatrix<r_8> m2(nrow, ncol);
+    TMatrix<r_8> m3(nrow, ncol);
+    TMatrix<r_8> m4(nrow, ncol);
+    TMatrix<r_8> m5(nrow, ncol);
+    for(k=0; k<N; k++) {
+      double xxr = frand01();
+      double yyr = 2.*frand01();
+      for(i=0; i<nrow; i++)
+        for(j=0; j<ncol; j++) {
+          m1(i,j) = k*300+10.*i+j+xxr;  
+          m2(i,j) = k*550+20.*i+2.*j+yyr;
+          m3(i,j) = k*860.+40.*i+7.*j+yyr*3.14;
+        }
+    }
+    cout << " (6) Element access done ---" << endl;
+    PrtTim(" (6) -- ");
+    // Calcul m1*c1 + m2*c2 + m3*c3;
+    for(k=0; k<N; k++) {
+      double c1 = frand01() + 1.2;
+      double c2 = frand01() + 3.5;
+      double c3 = frand01() + 6.7;
+      m5 = m1;  m5.Mul(c1); 
+      m4 = m2;  m4.Mul(c2);
+      m5.AddElt(m4);
+      m4 = m3;  m3.Mul(c2);
+      m5.AddElt(m4);
+    }
+    cout << " (7) Add/MulElt/Cst m1*c1 + m2*c2 + m3*c3 done ---" << endl;
+    PrtTim(" (7) -- ");
+
+    for(k=0; k<N; k++) {
+      double c1 = frand01() + 1.2;
+      double c2 = frand01() + 3.5;
+      double c3 = frand01() + 6.7;
+      m5 = m1*c1+m2*c2+m3*c3;
+    }
+    cout << " (8) m1*c1 + m2*c2 + m3*c3 done ---" << endl;
+    PrtTim(" (8) -- ");
+    }
   }
   catch (PThrowable exc) {