Changeset 1107 in Sophya for trunk/SophyaProg

Timestamp:

Jul 27, 2000, 7:33:55 PM (25 years ago)

Author:

ansari

Message:

correction/modifs prog de test de TArray Reza+CMV 27/7/2000

Location:

trunk/SophyaProg/Tests

Files:

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

trunk/SophyaProg/Tests/arrt.cc

@@ -113 +113 @@
   cout << " ----- Vector va apres va(Range(0,6)) += 100. " << va << endl;
 
+  TMatrix<r_4> esm(3,5);
+  esm = (EnumeratedSequence(),
+         11 , 12 , 13, 14, 15,  
+         21 , 22 , 23, 24, 25 
+         ); 
+  //         31 , 32 , 33, 34, 35 ) ;  
+
+  cout << "\n TMatrix<r_4> esm(3,5) = EnumeratedSequence(), 11 , 12 , 13, 14, 15 ... " 
+       << esm << endl;
+
   cout << "\n :::::: Testing Matrix operations :::::: " << endl;
   TMatrix<r_4> ra(2,2), ira(2,2);
@@ -123 +133 @@
   es, 2 , 1 , 4 , 3 ;
   ra = es ;
-  
   
   cout << " ----- Matrix ra = \n " << ra << endl; 

trunk/SophyaProg/Tests/carrt.cc

@@ -13 +13 @@
 
 static int prtlev = 0;
-static int nprt = 0;
+static int nprt = 100;
 
 template <class T>
@@ -72 +72 @@
     cout << "\n -----> Testing TArray Conversion <---- " << endl;
      TArray<int_4> ia(7,5);   
-     ia = Sequence(10., 2.);
+     ia = RegularSequence(10., 2.);
      TArray<r_4> ra(7,5);   
      ra = ia;
-     cout << " ra = ia(= Sequence(10., 2.)) = \n " << ra << endl;
+     cout << " ra = ia(= RegularSequence(10., 2.)) = \n " << ra << endl;
      cout << ra << endl;  
      TArray<r_4> rb(5,3);
-     rb =  Sequence(20., .5);  
+     rb =  RegularSequence(20., .5);  
      TMatrix<int_4> mx(3,5);
-     cout << " TArray<r_4> rb(5,3); rb =  Sequence(20., .5); rb : " << endl;
+     cout << " TArray<r_4> rb(5,3); rb =  RegularSequence(20., .5); rb : " << endl;
      cout << rb << endl;
      mx = rb;
@@ -132 +132 @@
   else cout << " OK   Test C = (A*4+1)/B  OK " << endl; 
   
+  a = RegularSequence(1, 1);
+  b = RegularSequence(nr*nc, -1);
+  c = (a*2)+(b*2);
+  if (prtlev > 0) {
+    cout << " A = \n " << a << endl;
+    cout << " B = \n " << b << endl;
+    cout << " C = 2A-2*B= \n " << c << endl;
+  }
+  c /= (nr*nc+1);
+  getMinMax(c, min, max);
+  if ((min != 2) || (max != 2)) {
+    cout << "!!! ERROR Test3 C=2A+2*B  Min=" << min << " Max=" << max << endl;
+    rc += 1;
+  }
+  else cout << " OK   Test3 C=2A+2*B  OK " << endl; 
+  
   return(rc);
 }
@@ -172 +188 @@
   }
   else cout << " OK   Test C = (A*4+12)/B  OK " << endl; 
+
+  a = RegularSequence(1, 1);
+  b = RegularSequence(nr*nc, -1);
+  c = (a*2.f)+(b*2.f);
+  if (prtlev > 0) {
+    cout << " A = \n " << a << endl;
+    cout << " B = \n " << b << endl;
+    cout << " C = 2A-2*B= \n " << c << endl;
+  }
+  c /= (nr*nc+1);
+  getMinMax(c, min, max);
+  if ((fabs(min-2.) > 0.0001) || (fabs(max-2.) > 0.0001)) {
+    cout << "!!! ERROR Test3 C=2A+2*B  Min=" << min << " Max=" << max << endl;
+    rc += 1;
+  }
+  else cout << " OK   Test3 C=2A+2*B  OK " << endl; 
+
   return(rc);