Changeset 1112 in Sophya

Timestamp:

Jul 28, 2000, 6:34:00 PM (25 years ago)

Author:

ansari

Message:

adaptation aux nouvelles Sequences et pb de int/uint cmv 28/7/00

Location:

trunk/SophyaProg/Tests

Files:

• tsttmat.cc (modified) (3 diffs)
• tsttminv.cc (modified) (2 diffs)

trunk/SophyaProg/Tests/tsttmat.cc

@@ -112 +112 @@
 TMatrix<r_8> a(A,false);
 cout<<endl<<"Matrices AAA*=C"<<endl;
-{for(int i=0;i<AAA.NRows();i++) for(int j=0;j<C.NCols();j++)
-  {a(i,j) = 0; for(int k=0;k<AAA.NCols();k++) a(i,j) += AAA(i,k)*C(k,j);}}
+{for(uint_4 i=0;i<AAA.NRows();i++) for(uint_4 j=0;j<C.NCols();j++)
+  {a(i,j) = 0; for(uint_4 k=0;k<AAA.NCols();k++) a(i,j) += AAA(i,k)*C(k,j);}}
 AAA *= C;
 cout<<"AAA:"<<endl<<AAA;
@@ -119 +119 @@
 TMatrix<r_8> b(B,false);
 cout<<"Matrices BBB*=D"<<endl;
-{for(int i=0;i<BBB.NRows();i++) for(int j=0;j<D.NCols();j++)
-  {b(i,j) = 0; for(int k=0;k<BBB.NCols();k++) b(i,j) += BBB(i,k)*D(k,j);}}
+{for(uint_4 i=0;i<BBB.NRows();i++) for(uint_4 j=0;j<D.NCols();j++)
+  {b(i,j) = 0; for(uint_4 k=0;k<BBB.NCols();k++) b(i,j) += BBB(i,k)*D(k,j);}}
 BBB *= D;
 cout<<"B:"<<endl<<BBB;
@@ -158 +158 @@
 //-----------------------------------------------
 TMatrix<r_8> RR(2,4);
-{for(int i=0;i<A.NRows();i++) for(int j=0;j<E.NCols();j++)
-  {RR(i,j) = 0; for(int k=0;k<A.NCols();k++) RR(i,j) += A(i,k)*E(k,j);}}
+{for(uint_4 i=0;i<A.NRows();i++) for(uint_4 j=0;j<E.NCols();j++)
+  {RR(i,j) = 0; for(uint_4 k=0;k<A.NCols();k++) RR(i,j) += A(i,k)*E(k,j);}}
 cout<<endl<<"Matrices R = A * E"<<endl;
 R = A * E;

trunk/SophyaProg/Tests/tsttminv.cc

@@ -138 +138 @@
 Vind = 0;
 if(nalea>0) for(i=0;i<nalea;i++) drand01();
-A = Sequence(RandomSequence(RandomSequence::Flat,0.,1.));
+A = RandomSequence(RandomSequence::Flat,0.,1.);
 if(nbig>0) for(i=0;i<nbig;i++) {
   k=(uint_8)(drand01()*N*N); if(k>=N*N) k--;
@@ -147 +147 @@
 #if defined(COMPLEX)
 Vind = 0;
-B = Sequence(RandomSequence(RandomSequence::Flat,0.,1.));
+B = RandomSequence(RandomSequence::Flat,0.,1.);
 if(nbig>0) for(i=0;i<nbig;i++) {
   k=(uint_8)(drand01()*N*N); if(k>=N*N) k--;