Changeset 1102 in Sophya for trunk/SophyaProg


Ignore:
Timestamp:
Jul 27, 2000, 1:58:46 AM (25 years ago)
Author:
ansari
Message:

modifs/adaptation test TArray - Reza 27/7/2000

Location:
trunk/SophyaProg/Tests
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaProg/Tests/arrt.cc

    r1100 r1102  
    4343      if (n<5) n = 5;
    4444      TMatrix<r_8> tza(n,n+3);
    45       tza = Sequence(2.,1.5);
     45      tza = RegularSequence(2.,1.5);
    4646      _ZZ_TestTMatrixRC_YY_(tza);
    4747      TMatrix<r_8> tza2 = tza(Range(1,3), Range(2,5));
    … …  
    6464{
    6565  TMatrix<r_4> ma(4,7);
    66   ma = Sequence(10., 2.);
     66  ma = RegularSequence(10., 2.);
    6767  cout << "\n ::::::  Testing TMatrix - TVector ::::::  " << endl; 
    6868  TMatrix<r_4> sma1 = ma(Range(1,2), Range(2,4));
    … …  
    7979
    8080  TMatrix<int_4> ima(3,10);
    81   ima = Sequence(0.01,1.);
    82   cout << " ----- Matrix ima(3,10) = Sequence(0.01,1.) = " << ima << endl;
     81  ima = RegularSequence(0.01,1.);
     82  cout << " ----- Matrix ima(3,10) = RegularSequence(0.01,1.) = " << ima << endl;
    8383  cout << " ----- Matrix  ima.Column(3) = \n" << ima.Column(3) << endl;
    8484  TVector<int_4> vcol = ima.Column(7);
    … …  
    9090
    9191  TMatrix<int_4> imb(3,10);
    92   imb = Sequence(100.01,10.);
    93   cout << " ----- Matrix imb(3,10) = Sequence(100.01,10.) = " << imb << endl;
     92  imb = RegularSequence(100.01,10.);
     93  cout << " ----- Matrix imb(3,10) = RegularSequence(100.01,10.) = " << imb << endl;
    9494  TMatrix<int_4> imc = ima+imb;
    9595  cout << " ----- Matrix imc=ima+imb = " << imc << endl;
    … …  
    106106       << (imc-imb)-ima << endl;
    107107  TVector<r_4> va(16, BaseArray::RowVector);
    108   va = Sequence(0.,1.);
    109   cout << " ----- Vector va = Sequence(0.,1.) = " << va << endl;
     108  va = RegularSequence(0.,1.);
     109  cout << " ----- Vector va = RegularSequence(0.,1.) = " << va << endl;
    110110  va(Range(2,0,6,2)) *= 10.;
    111111  cout << " ----- Vector va apres va(Range(2,0,6,2)) *= 10. " << va << endl;
    … …  
    115115  cout << "\n :::::: Testing Matrix operations :::::: " << endl;
    116116  TMatrix<r_4> ra(2,2), ira(2,2);
    117   ra(0,0) = 2.;   ra(0,1) = 1.;
     117  /*  ra(0,0) = 2.;   ra(0,1) = 1.;
    118118  ra(1,0) = 4.;   ra(1,1) = 3.;
     119  */
    119120  ira(0,0) = 1.5;   ira(0,1) = -0.5;
    120121  ira(1,0) = -2.;    ira(1,1) = 1.;
     122  EnumeratedSequence es;
     123  es, 2 , 1 , 4 , 3 ;
     124  ra = es ;
     125 
     126 
    121127  cout << " ----- Matrix ra = \n " << ra << endl;
    122128  cout << " ----- Matrix ira = \n " << ira << endl;
    … …  
    135141  //  for(int i=0; i<n; i++)
    136142  //    for(int j=0; j<n; j++)  a(j,i) = GauRnd(0., 1.);
    137   a = Sequence(RandomSequence(RandomSequence::Gaussian, 0., 2.5));
    138   cout << " ----- Matrix a=Sequence(RandomSequence(RandomSequence::Gaussian, 0., 2.5)) = \n " << a << endl;
     143  a = RandomSequence(RandomSequence::Gaussian, 0., 2.5);
     144  cout << " ----- Matrix a=RandomSequence(RandomSequence::Gaussian, 0., 2.5) = \n " << a << endl;
    139145  Vector x(n);
    140   x = Sequence(1.,3.);
     146  x = RegularSequence(1.,3.);
    141147  Vector b = a*x;
    142148  cout << " ----- Vector x = \n " << x << endl;
    … …  
    156162  TArray<int_4> ia(7,5);
    157163  // We fill it with a sequence of numbers starting at 10., with step = 2.
    158   ia = Sequence(10., 2.);
     164  ia = RegularSequence(10., 2.);
    159165  cout << " ----- Array IA = \n " << ia << endl;
    160166  // sub array extraction, Range(2,4) : starting position=2 , End=4
    … …  
    184190  TArray<r_4> fa(5,2);
    185191  // fill it up with a sequence of 0. to 1.
    186   fa = Sequence(0.,1./(5*2));
     192  fa = RegularSequence(0.,1./(5*2));
    187193  cout << " ------ TArray<r_4> fa(5,2) = \n" << fa << endl;
    188194  // Create a new array from the original array , multiplying it by 2*Pi

  • trunk/SophyaProg/Tests/carrt.cc

    r1100 r1102  
    141141  cout << "   A CMemoryMapping  - B FortranMemoryMapping " << endl;
    142142
    143   r_4 rc = 0;
     143  int rc = 0;
    144144  r_4 min,max;
    145145
Note: See TracChangeset for help on using the changeset viewer.