Changeset 2580 in Sophya for trunk/SophyaProg

Timestamp:

Jul 29, 2004, 5:10:44 PM (21 years ago)

Author:

cmv

Message:

plus de *= pour multipl matrice inplace rz+cmv 29/07/04

Location:

trunk/SophyaProg/Tests

Files:

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

trunk/SophyaProg/Tests/tsttmat.cc

@@ -111 +111 @@
 //---------------------------------------------
 TMatrix<r_8> a(A,false);
-cout<<endl<<"Matrices AAA*=C"<<endl;
+cout<<endl<<"Matrices AAA = AAA * C"<<endl;
 {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;
+AAA = AAA * C;
 cout<<"AAA:"<<endl<<AAA;
 cout<<"a:"<<endl<<a;
 TMatrix<r_8> b(B,false);
-cout<<"Matrices BBB*=D"<<endl;
+cout<<"Matrices BBB = BBB * D"<<endl;
 {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;
+BBB = BBB * D;
 cout<<"B:"<<endl<<BBB;
 cout<<"b:"<<endl<<b;
@@ -183 +183 @@
 Matrix M(X); cout<<"Matrix M"<<endl<<M<<endl;
 Matrix MI = Inverse(M); cout<<"MI"<<endl<<MI;
-MI *= M; cout<<"MI*M"<<endl<<MI;
+MI = MI * M; cout<<"MI*M"<<endl<<MI;
 r_8 xmin=-1.;
 for(int i=0;i<10;i++) for(int j=0;j<10;j++)
@@ -198 +198 @@
 Xinv = Inverse(X);
 cout<<"TMatrix Xinv"<<endl<<Xinv;
-Xinv *= X;
-cout<<"Xinv *= X"<<endl<<Xinv;
+Xinv = Xinv * X;
+cout<<"Xinv = Xinv * X"<<endl<<Xinv;
 r_8 xmin=-1.;
 for(int i=0;i<10;i++) for(int j=0;j<10;j++)

trunk/SophyaProg/Tests/tsttminv.cc

@@ -470 +470 @@
 TMatrix< TYPE > AmUSVt(N,N); AmUSVt = U;
 for(int i=0;i<N;i++) for(int j=0;j<N;j++) AmUSVt(i,j) *= S(j);
-AmUSVt *= VT; AmUSVt -= Ainput;
+AmUSVt = AmUSVt * VT; AmUSVt -= Ainput;
 if(nprline>0) {cout<<AmUSVt; cout<<endl;} 
 //-- Check
@@ -502 +502 @@
 TMatrix< TYPE > AmUSVt(N,N); AmUSVt = U;
 for(int i=0;i<N;i++) for(int j=0;j<N;j++) AmUSVt(i,j) *= (TYPE) S(j);
-AmUSVt *= VT; AmUSVt -= Ainput;
+AmUSVt = AmUSVt * VT; AmUSVt -= Ainput;
 if(nprline>0) {cout<<AmUSVt; cout<<endl;} 
 //-- Check