Changeset 2366 in Sophya for trunk/Eval/JET/tjet.cc

Timestamp:

Apr 18, 2003, 5:48:16 PM (22 years ago)

Author:

ansari

Message:

Ajout fonctions Sin/Cos/... ds jet.h + prog en f90 - Reza 18/4/2003

File:

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

trunk/Eval/JET/tjet.cc

@@ -90 +90 @@
         }
     }
+
     cout << " (1) Element access done ---" << endl;
     PrtTim(" (1) -- ");
@@ -137 +138 @@
     cout << " (5) JET: m5 = m1*c1 + m1*(m2+c2) + m2*c3 ---" << endl;
     PrtTim(" (5) -- ");
-    }
+
+    for(k=0; k<N; k++) {
+      double c1 = frand01() + 1.2;
+      double c2 = frand01() + 3.5;
+      double c3 = frand01() + 6.7;
+    // Calcul m1*c1 + m1*(m2+c2) + m2*c3; 
+      m5 = m1*c1 + m2 + c2*Sin(c3*m3+m1);
+    }
+    cout << " (6) JET: m5 = m1*c1 + m2 + c2*Sin(c3*m3+m1) ---" << endl;
+    PrtTim(" (6) -- ");
+
+    }
+
+    
     // Test avec les TArray / TMatrix
     {
@@ -156 +170 @@
         }
     }
-    cout << " (6) Element access done ---" << endl;
-    PrtTim(" (6) -- ");
+    cout << " (21) Element access done ---" << endl;
+    PrtTim(" (21) -- ");
     // Calcul m1*c1 + m2*c2 + m3*c3;
     for(k=0; k<N; k++) {
@@ -169 +183 @@
       m5.AddElt(m4);
     }
-    cout << " (7) Add/MulElt/Cst m1*c1 + m2*c2 + m3*c3 done ---" << endl;
-    PrtTim(" (7) -- ");
+    cout << " (22) Add/MulElt/Cst m1*c1 + m2*c2 + m3*c3 done ---" << endl;
+    PrtTim(" (22) -- ");
 
     for(k=0; k<N; k++) {
@@ -178 +192 @@
       m5 = m1*c1+m2*c2+m3*c3;
     }
-    cout << " (8) m1*c1 + m2*c2 + m3*c3 done ---" << endl;
-    PrtTim(" (8) -- ");
+    cout << " (23) m1*c1 + m2*c2 + m3*c3 done ---" << endl;
+    PrtTim(" (23) -- ");
+
+    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*Sin(c3*m3+m1);
+    }
+    cout << " (26) m5 = m1*c1 + m2 + c2*Sin(c3*m3+m1) ---" << endl;
+    PrtTim(" (26) -- ");
+
     }
   }