Changeset 857 in Sophya for trunk/SophyaProg/Tests/tsttmat.cc

Timestamp:

Apr 10, 2000, 3:04:05 PM (25 years ago)

Author:

ansari

Message:

Adapatation a SphereHEALPix, correction tsttmatrix.cc tsttvector.cc - Reza 10/4/2000

File:

• trunk/SophyaProg/Tests/tsttmat.cc (modified) (5 diffs)

trunk/SophyaProg/Tests/tsttmat.cc

@@ -7 +7 @@
 #include "ntoolsinit.h"
 #include "pexceptions.h"
-#include "tmatrix.h"
-#include "nbrandom.h"
+#include "array.h"
+#include "srandgen.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////
@@ -24 +24 @@
 {
 cout << " Test ecriture PPersist TMatrix " << endl; 
-FIO_TMatrix<r_8> ftm(A);
+FIO_TArray<r_8> ftm(A);
 ftm.Write("tmtx.ppf");
 }
 {
 cout << " Test lecture PPersist TMatrix " << endl; 
-FIO_TMatrix<r_8> ftm("tmtx.ppf");
+FIO_TArray<r_8> ftm("tmtx.ppf");
 cout<<"Alue:"<<(TMatrix<r_8>)ftm<<endl;
 }
@@ -182 +182 @@
 {
 Matrix M(X); cout<<"Matrix M"<<endl<<M<<endl;
-Matrix MI = M.Inverse(); cout<<"MI"<<endl<<MI;
+Matrix MI = Inverse(M); cout<<"MI"<<endl<<MI;
 MI *= M; cout<<"MI*M"<<endl<<MI;
 r_8 xmin=-1.;
@@ -196 +196 @@
 cout<<"TMatrix X"<<endl<<X;
 TMatrix<r_8> Xinv;
-Xinv = X.Inverse();
+Xinv = Inverse(X);
 cout<<"TMatrix Xinv"<<endl<<Xinv;
 Xinv *= X;
@@ -213 +213 @@
 cout<<"MI"<<endl<<MI;
 {
-TMatrix<r_8> L(MI.NRows(),MI.NCol(),MI.Data(),new Bridge);
-cout<<"L"<<endl<<L;
-L *= 100.; cout<<"L*=100."<<endl<<L;
+  uint_4 siz[5];
+  siz[0] = MI.NCols();
+  siz[1] = MI.NRows();
+  TArray<r_8> A(2, siz, MI.Data(), 1, 0, new Bridge);
+  TMatrix<r_8> L(A);
+  cout<<"L"<<endl<<L;
+  L *= 100.; cout<<"L*=100."<<endl<<L;
 } // destruction de L
 cout<<"MI(4,4)="<<MI(4,4)<<endl;