Changeset 1008 in Sophya

Timestamp:

May 16, 2000, 7:55:21 PM (25 years ago)

Author:

ansari

Message:

more options... cmv 16/5/00

File:

• trunk/SophyaProg/Tests/tsttminv.cc (modified) (10 diffs)

trunk/SophyaProg/Tests/tsttminv.cc

@@ -16 +16 @@
 #include <math.h>
 #include <unistd.h>
+#include "timing.h"
 #include "ntoolsinit.h"
 #include "pexceptions.h"
@@ -55 +56 @@
 uint_4 nprline = 10;
 // Initialisation du pauvre de l'aleatoire
- uint_4 nalea = 0;
+uint_4 nalea = 0;
+// data scaling for gauss pivoting and determinant
+int tscal = 1;
+bool detok=false;
+bool timok = false;
 //--------------------------------------------------------
 
 //-- Decodage arguments
 char c;
-while((c = getopt(narg,arg,"hv:l:a:")) != -1) {
+while((c = getopt(narg,arg,"hdtv:l:a:n:")) != -1) {
   switch (c) {
   case 'v' :
@@ -71 +76 @@
     sscanf(optarg,"%d",&nalea);
     break;
+  case 'n' :
+    sscanf(optarg,"%d",&tscal);
+    break;
+  case 'd' :
+    detok = true;
+    break;
+  case 't' :
+    timok = true;
+    break;
   case 'h' :
-    cout<<"tsttminv [-h] [-v N,scale,nbig,vbig] [-l nprline] [-a nalea]"<<endl;
-    cout<<"matrix filled with : {[-1,1] +/- vbig(nbig time)}*scale"<<endl;
+    cout<<"tsttminv [-h] [-v N,scale,nbig,vbig] [-l nprline] [-a nalea]"<<endl
+        <<"         [-n typs] [-d] [-t]"<<endl
+        <<"matrix filled with : {[-1,1] +/- vbig(nbig time)}*scale"<<endl
+        <<"-n 0/1/2 : data scaling 0=no, 1=global (def), 2=row-by-row"<<endl
+        <<"-d : also compute determinant"<<endl
+        <<"-t : do timing"<<endl;
     exit(-1);
   }
@@ -84 +102 @@
 cout<<"Nombre de lignes de matrice a imprimer "<<nprline<<endl;
 cout<<"Initialisation de l aleatoire par "<<nalea<<" tirages"<<endl;
+ cout<<"Data scaling "<<tscal<<" determinant="<<detok<<" timing="<<timok<<endl;
 cout<<endl;
 
 //-- Initialization arrays
 SophyaInit();
+if(timok) InitTim();
 #ifdef ALSO_LAPACK
   BaseArray::SetDefaultMemoryMapping(BaseArray::FortranMemoryMapping);
@@ -101 +121 @@
 A.Show();
 
+SimpleMatrixOperation< TYPE >::SetGausPivScal(tscal);
+
 //-- Mise a zero
 A    = (TYPE) 0;
@@ -110 +132 @@
 
 //-- Fill matrices
+double vmax=-1.;
 uint_8 k;
 uint_4 i,j; double s;
@@ -143 +166 @@
 cout<<"------------ Inversion"<<endl;
 //InvA = Inverse(A);
-InvA = IdentityMatrix(1.,N); TYPE det = GausPiv(A,InvA); cout<<"Det = "<<det<<endl;
+InvA = IdentityMatrix(1.,N);
+if(timok) PrtTim("--- End of filling ---");
+TYPE det = GausPiv(A,InvA,detok);
+if(timok) PrtTim("--- End of GausPiv ---");
+cout<<"Det = "<<det<<endl;
 cout<<"------------ TMatrix InvA = A^(-1):"<<endl;
 if(nprline>0) {cout<<InvA; cout<<endl<<endl;}
@@ -154 +181 @@
 
 //-- Check
-double vmax=-1.;
+vmax=-1.;
 for(i=0;i<N;i++) {
   double absv = ABS_VAL( 1. - AiA(i,i) );
@@ -175 +202 @@
 cout<<endl<<"LAPACK Cross-Check"<<endl;
 InvA = IdentityMatrix(1.,N);
+if(timok) PrtTim("--- End of check ---");
 LapackLinSolve(Adum,InvA);
+if(timok) PrtTim("--- End of LapackLinSolve ---");
 AiA = A * InvA;
 vmax=-1.;
@@ -193 +222 @@
 #endif
 
+if(timok) PrtTim("--- End of Job ---");
 exit(0);
 }