Changeset 2828 in Sophya

Timestamp:

Nov 2, 2005, 10:00:15 AM (20 years ago)

Author:

ansari

Message:

1/ include values.h commente ds tstboloread.cc tstcolread.cc (compil OSX)
2/ amelioration prog test TimeStamp (TimeStamp::ToDays() et TimeStamp(double days) en particulier)
3/ amelioration prog test tnt.cc : test MuTyV/DVList avec type TimeStamp et test DataTable , SwPPFDataTable avec champs ComplexField et DoubleComplexField

Reza , 2 Nov 2005

Location:

trunk/SophyaProg/Tests

Files:

• tnt.cc (modified) (7 diffs)
• tstboloread.cc (modified) (1 diff)
• tstcolread.cc (modified) (1 diff)
• ttimestamp.cc (modified) (1 diff)

trunk/SophyaProg/Tests/tnt.cc

@@ -113 +113 @@
      << " (complex<double>)zvs= " << zzd << endl;
 cout << "String->double: dvs = " << dvs 
-     << " (double)zvs= " << (double)dvs << endl;
+     << " (double)dvs= " << (double)dvs << endl;
+TimeStamp ts;
+MuTyV tv = ts;
+cout << "MuTyV=TimeStamp->String: tv = " << tv 
+     << " ->double= " << (double)tv << " ->TimeStamp:" 
+     << TimeStamp((double)tv).ToString() << endl;
 
 
@@ -138 +143 @@
 
 dvl["Sinf"] = "inf 0985";
+dvl["ToDay"] = ts;
 dvl.Print();
 
@@ -184 +190 @@
   dt.AddDoubleColumn("f_sinxcos");
   dt.AddDoubleColumn("f_x2");
+  dt.AddComplexColumn("cmplx_cos_sin");
+  dt.AddDoubleComplexColumn("dcmplx_cos_sin");
   MuTyV rec[10];
   cout << " 1/ First 1000 lines .... " << endl;
@@ -193 +201 @@
     double x = M_PI*k/100.;
     double fx = sin(x)*cos(x);
+    double sx = sin(x);
+    double cx = cos(x);
     rec[2] = x;
-    rec[3] = sin(x);
-    rec[4] = cos(x);
+    rec[3] = sx;
+    rec[4] = cx;
     rec[5] = fx;
     rec[6] = x*x;
+    rec[7] = complex<r_4>(cx, sx);
+    rec[8] = complex<r_8>(cx, sx);
     dt.AddLine(rec);
   }
@@ -213 +225 @@
     double x = M_PI*k/100.;
     double fx = sin(x)*cos(x);
+    double sx = sin(x);
+    double cx = cos(x);
     rec[2] = x;
-    rec[3] = sin(x);
-    rec[4] = cos(x);
+    rec[3] = sx;
+    rec[4] = cx;
     rec[5] = fx;
     rec[6] = x*x;
+    rec[7] = complex<r_4>(cx, sx);
+    rec[8] = complex<r_8>(cx, sx);
     dt.AddLine(rec);
   }
@@ -262 +278 @@
     dt.AddDoubleColumn("f_sinxcos");
     dt.AddDoubleColumn("f_x2");
+    dt.AddComplexColumn("cmplx_cos_sin");
+    dt.AddDoubleComplexColumn("dcmplx_cos_sin");
     MuTyV rec[10];
     cout << " 1/ First 1000 lines .... " << endl;
@@ -268 +286 @@
       double x = M_PI*k/100.;
       double fx = sin(x)*cos(x);
+      double sx = sin(x);
+      double cx = cos(x);
       rec[1] = x;
-      rec[2] = sin(x);
-      rec[3] = cos(x);
+      rec[2] = sx;
+      rec[3] = cx;
       rec[4] = fx;
       rec[5] = x*x;
+      rec[6] = complex<r_4>(cx, sx);
+      rec[7] = complex<r_8>(cx, sx);
       dt.AddLine(rec);
     }

trunk/SophyaProg/Tests/tstboloread.cc

@@ -14 +14 @@
 #include <stdlib.h>
 #include <iostream>
-#include <values.h>
+// #include <values.h>
 #include <string.h>
 #include <string>

trunk/SophyaProg/Tests/tstcolread.cc

@@ -6 +6 @@
 #include <stdlib.h>
 #include <iostream>
-#include <values.h>
+// #include <values.h>
 #include <string.h>
 #include <string>

trunk/SophyaProg/Tests/ttimestamp.cc

@@ -26 +26 @@
     
     InitTim(); 
+    cout << " Sizeof(TimeStamp=) " << sizeof(TimeStamp) << endl;
     TimeStamp ts; 
-    cout << "ts: Now : " << ts << endl; 
-    TimeStamp ts2("30/01/1962","14:22:35.65"); 
-    cout << "ts2: 30/01/1962 14:22:35.65 : " << ts2 << endl; 
+    cout << "ts: Now : " << ts << "(->double: " << (double)ts << " )" << endl; 
+    TimeStamp ts2("26/8/1974","14:22:35.65"); 
+    cout << "ts2: 26/8/1974 14:22:35.65 : " << ts2  
+         << " double->TimeStamp: " << TimeStamp(ts2.ToDays()) << endl; 
     TimeStamp ts3("01/01/1905","00:00:00"); 
-    cout << "ts3: 01/01/1905 , 00:00:00 : " << ts3 << " (double): " << (double)ts3 << endl; 
+    cout << "ts3: 01/01/1905 , 00:00:00 : " << ts3 << " (double): " 
+         << (double)ts3 << " double->TimeStamp: " << TimeStamp(ts3.ToDays()) << endl; 
     TimeStamp ts4("01/01/1901","03:00:20"); 
-    cout << "ts3: 01/01/1901 , 02:00:20 : " << ts4 << " (double): " << (double)ts4 << endl; 
+    cout << "ts3: 01/01/1901 , 03:00:20 : " << ts4 << " (double): " 
+         << (double)ts4 << " double->TimeStamp: " << TimeStamp(ts4.ToDays()) << endl; 
 
+    TimeStamp ts5("01/12/1899","00:00:00"); 
+    cout << "ts5: 01/12/1899 , 00:00:00 : " << ts5 << " (double): " 
+         << (double)ts5 << " double->TimeStamp: " << TimeStamp(ts5.ToDays()) << endl; 
+    TimeStamp ts6("01/12/1899","15:30:00"); 
+    cout << "ts6: 01/12/1899 , 15:30:00 : " << ts6 << " (double): " 
+         << (double)ts6 << " double->TimeStamp: " << TimeStamp(ts6.ToDays()) << endl; 
+    cout << " ts.ToString(bool, bool) test : " << endl;
+    cout << " ts.ToString()= " << ts.ToString() << endl;
+    cout << " ts.ToString(fgd=true, fgh=false)= " << ts.ToString(true, false) << endl;
+    cout << " ts.ToString(fgd=false, fgh=true)= " << ts.ToString(false, true) << endl;
 
   }