Changeset 789 in Sophya

Timestamp:

Mar 20, 2000, 7:24:31 PM (26 years ago)

Author:

ansari

Message:

Amelioration, correction prg tests array Reza 20/3/2000

Location:

trunk/SophyaProg/Tests

Files:

• arrt.cc (modified) (3 diffs)
• lpk.cc (modified) (1 diff)

trunk/SophyaProg/Tests/arrt.cc

@@ -7 +7 @@
 #include "tarrinit.h"
 #include "tarray.h"
+#include "matharr.h"
 #include "timing.h"
 
@@ -25 +26 @@
   try {
   cout << "\n -----> Testing TArray <---- " << endl;  
+  // We create a integer array SizeX=7, SizeY=5
   TArray<int_4> ia(7,5); 
+  // We fill it with a sequence of numbers starting at 10., with step = 2.
   ia = Sequence(10., 2.);
   cout << " ----- matrix IA = \n " << ia << endl;
-// Extraction de sous tableau 
+  // sub array extraction, Range(2,3) : starting position=2 , size=3
   TArray<int_4> ic = ia(Range(2,3),Range(1,2));
   cout << " ----- matrix IC IA(Range(2,3),Range(1,2)) = \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
   ic = 0;
   cout << " ----- matrix IC Apres (=0) = \n " << ic << endl;
@@ -37 +42 @@
   cout << "  :::: 3 Dim arrays ::::: " << endl;
   TArray<int_4>::SetMaxPrint(1000);
+  // Creating 3-dim array (X=8 x Y=7 x Z=2) , filling it with 5
   TArray<int_4> ib(8,7,2);
   ib = 5;
   cout << " ----- matrix IB = \n " << ib << endl;
+  // Sub array extraction  X from 1 , size 4 - Y from 2 , size 3 , in Z default, from 0, size 1
+  // we multiply this sub-array elements by 3
   ib(Range(1,4),Range(2,3)) *= 3;
   cout << " -- matrix IB , Apres ib(Range(1,3),Range(2,1))*=3 : " << endl;
   cout << ib;
+
+  // Creating a double array X=5 x Y=2
+  TArray<r_4> fa(5,2);
+  // fill it up with a sequence of 0. to 1.
+  fa = Sequence(0.,1./(5*2));
+  cout << " ------ TArray<r_4> fa(5,2) = \n" << fa << endl;
+  // Create a new array from the original array , multiplying it by 2*Pi
+  TArray<r_4> fa2 = fa*(float)(2.*M_PI); 
+  cout << " ------ TArray<r_4> fa2=fa*2*Pi = \n" << fa2 << endl;
+  // Compute sin(fa2) cos(fa2)
+  cout << " ------ sin(fa2=fa*2*Pi) = \n" << sin(fa2) << endl;
+  cout << " ------ cos(fa2=fa*2*Pi) = \n" << cos(fa2) << endl;
   }
   catch (PThrowable exc) {

trunk/SophyaProg/Tests/lpk.cc

@@ -29 +29 @@
     for(j=0; j<n; j++)  a(i,j,0) = GauRnd(0., 1.);
   
-  TArray<r_4> x(1,n), b(n,n);
+  TArray<r_4> x(n,1), b(n,1);
   r_4 sum ;
-  for(i=0; i<n; i++) x(0,i,0) = GauRnd(2., 1.5);
+  for(i=0; i<n; i++) x(i,0,0) = GauRnd(2., 1.5);
   for(i=0; i<n; i++) {
     sum = 0.;
-    for(j=0; j<n; j++) sum +=  a(j,i,0)*x(0,j,0);
-    b(0,i,0) = sum;
+    for(j=0; j<n; j++) sum +=  a(i,j,0)*x(j,0,0);
+    b(i,0,0) = sum;
   }