Changeset 1100 in Sophya

Timestamp:

Jul 26, 2000, 6:31:34 PM (25 years ago)

Author:

ansari

Message:

Amelioration programmes test de tableaux - Reza 26/7/2000

Location:

trunk/SophyaProg/Tests

Files:

• arrt.cc (modified) (2 diffs)
• carrt.cc (modified) (4 diffs)
• lpk.cc (modified) (2 diffs)

trunk/SophyaProg/Tests/arrt.cc

@@ -21 +21 @@
 
   if (narg < 2) {
-    cout << " arrt - TArray<T> Test - Usage arrt a/p/m/z [size=5] [prtlev=1] [nprt=50]\n" 
+    cout << " arrt - TArray<T> Test - Usage arrt a/w/m/z [size=5] [prtlev=1] [nprt=50]\n" 
          << " a: Simple Array Test  w: a+ PPersist Test (FIO_TArray<T>) \n" 
          << " m: Matrix and Vector Test \n" 
@@ -160 +160 @@
   // sub array extraction, Range(2,4) : starting position=2 , End=4
   TArray<int_4> ic = ia(Range(2,3),Range(1,3),Range(0));
-  cout << " ----- Array IC IA(Range(2,4),Range(1,2)) = \n " << ic << endl;
+  cout << " ----- Array IC IA(Range(2,3),Range(1,3)) = \n " << ic << endl;
   // we set the sub-array to zero, this should reflect in the original array
   // sub-arrays share their data with parent array

trunk/SophyaProg/Tests/carrt.cc

@@ -8 +8 @@
 #include "timing.h"
 
+static int test_ac();
+static int test_oso(int r, int c);
+static int test_odo(int r, int c);
+
+static int prtlev = 0;
+static int nprt = 0;
+
+template <class T>
+void getMinMax(TArray<T>& a, T& min, T& max)
+{
+  min = a[0];
+  max = a[0];
+  for(uint_8 k=1; k<a.Size(); k++) {
+    if (a[k]<min)  min = a[k];
+    else if (a[k]>max)  max = a[k];
+  }
+}
+
 int main(int narg, char* arg[])
 {
@@ -13 +31 @@
   SophyaInit();
   InitTim();   // Initializing the CPU timer
+
+  if (narg < 2) {
+    cout << " carrt ac/oso/odo [NRow=5] [NCols=10] [prtlev=0] [nprtmax=100] \n"
+         << "   ac : array conversion test   \n" 
+         << "   oso : operation same memory organisation \n" 
+         << "   odo : operation different memory organisation \n" << endl;
+    exit(0);
+  }
+
+  string opt = arg[1];
+  int nr = 5;
+  int nc = 10;
+  if (narg > 2) nr = atoi(arg[2]);
+  if (narg > 3) nc = atoi(arg[3]);
+  if (narg > 4) prtlev = atoi(arg[4]);
+  if (narg > 5) nprt = atoi(arg[5]);
+
+  BaseArray::SetMaxPrint(nprt, prtlev);
+  
+  PrtTim(" Start of Test ");
   try {
+    if (opt == "ac") test_ac();
+    else if (opt == "oso") test_oso(nr, nc);
+    else if (opt == "odo") test_odo(nr, nc);
+  }
+  catch (PThrowable & exc) {
+    cerr << " catched Exception " << exc.Msg() << endl;
+  }  
+  catch (...) {
+    cerr << " catched unknown (...) exception " << endl; 
+  }  
+
+  PrtTim(" End of Test ");
+
+}
+
+
+int test_ac()
+{
     cout << "\n -----> Testing TArray Conversion <---- " << endl;
      TArray<int_4> ia(7,5);   
@@ -19 +75 @@
      TArray<r_4> ra(7,5);   
      ra = ia;
+     cout << " ra = ia(= Sequence(10., 2.)) = \n " << ra << endl;
      cout << ra << endl;  
      TArray<r_4> rb(5,3);
@@ -36 +93 @@
      cout << " Trying      TMatrix<int_4> mx3(3,5);  mx3 = rc; ?? " << endl;
      mx3 = rc;
+     return(0);
+}
+
+int test_oso(int nr, int nc)
+{
+  cout << "\n -----> Testing TArray operation TArray<int_4>(nx=" << nr << ",ny=" 
+       << nc << " )" << endl;
+
+  int rc = 0;
+  int min,max;
+
+  TArray<int_4> a(nr,nc);
+  a = 20;
+  TArray<int_4> b(nr,nc);
+  b = 9;
+  TArray<int_4> c = a-2*b;
+
+  if (prtlev > 0) {
+    cout << " A = \n " << a << endl;
+    cout << " B = \n " << b << endl;
+    cout << " C = A-2*B= \n " << c << endl;
   }
-  catch (PThrowable & exc) {
-    cerr << " catched Exception " << exc.Msg() << endl;
-  }  
-  catch (...) {
-    cerr << " catched unknown (...) exception " << endl; 
-  }  
+
+  getMinMax(c, min, max);
+  if ((min != 2) || (max != 2)) {
+    cout << "!!! ERROR Test C=A+2*B  Min=" << min << " Max=" << max << endl;
+    rc += 1;
+  }
+  else cout << " OK   Test C=A+2*B  OK " << endl; 
+
+  c = (a*4+1).DivElt(b);
+  if (prtlev > 0) cout << " C = (A*4+1)/B = \n" << c << endl;
+  getMinMax(c, min, max);
+  if ((min != 9) || (max != 9)) {
+    cout << "!!! ERROR Test C = (A*4+1)/B  Min=" << min << " Max=" << max << endl;
+    rc += 2;
+  }
+  else cout << " OK   Test C = (A*4+1)/B  OK " << endl; 
+  
+  return(rc);
+}
+
+int test_odo(int nr, int nc)
+{
+  cout << "\n -----> Testing TMatrix operation TMatrix<r_4>(nr=" << nr << ",nc=" 
+       << nc << " )" << endl;
+  cout << "   A CMemoryMapping  - B FortranMemoryMapping " << endl;
+
+  r_4 rc = 0;
+  r_4 min,max;
+
+  TMatrix<r_4> a(nr,nc,BaseArray::CMemoryMapping);
+  a = 20;
+  TMatrix<r_4> b(nr,nc,BaseArray::FortranMemoryMapping);
+  b = 9;
+  TMatrix<r_4> c(nr,nc,BaseArray::CMemoryMapping);
+
+  if (prtlev > 0) {
+    cout << " A = \n " << a << endl;
+    cout << " B = \n " << b << endl;
+  }
+  c = a-(b*2.0f);
+  if (prtlev > 0) cout << " C = A-2*B= \n " << c << endl;
+
+  getMinMax(c, min, max);
+  if ((fabs(min-2.) > 0.0001) || (fabs(max-2.) > 0.0001)) {
+    cout << "!!! ERROR Test C=A+2*B  Min=" << min << " Max=" << max << endl;
+    rc += 1;
+  }
+  else cout << " OK   Test C=A+2*B  OK " << endl; 
+
+  c = (a*4.0f+5.5f).DivElt(b);
+  if (prtlev > 0) cout << " C = (A*4+12)/B = \n" << c << endl;
+  getMinMax(c, min, max);
+  if ((fabs(min-9.5) > 0.0001) || (fabs(max-9.5) > 0.0001)) {
+    cout << "!!! ERROR Test C = (A*4+12)/B  Min=" << min << " Max=" << max << endl;
+    rc += 2;
+  }
+  else cout << " OK   Test C = (A*4+12)/B  OK " << endl; 
+  return(rc);
 
 }

trunk/SophyaProg/Tests/lpk.cc

@@ -13 +13 @@
 void lpk_tarr(int n);
 void lpk_tmtx(int n);
+
 
 int main(int narg, char* arg[])
@@ -76 +77 @@
 
   cout << "\n   Calling LapackLinSolve(a,b) .... " << endl;
+  PrtTim(" Calling LapackLinSolve(a,b) ");
   LapackLinSolve(a,b);
+  PrtTim(" End LapackLinSolve(a,b) ");
 
   cout << " ------------ Result B(=X ?) = \n " << b << "\n" << endl;