Changeset 26 for tests

Timestamp:

07/06/07 18:58:19 (2 years ago)

Author:

pernet

Message:

New row echelon form and reduced row echelon form

Location:

tests

Files:

• test-colechelon.C (added)
• test-fgemm.C (modified) (2 diffs)
• test-lqup.C (modified) (8 diffs)
• test-redcolechelon.C (added)
• test-redechelon.C (modified) (1 diff)
• test-redrowechelon.C (added)
• test-rowechelon.C (added)
• testeur_lqup.C (modified) (5 diffs)

tests/test-fgemm.C

@@ -7 +7 @@
 //-------------------------------------------------------------------------
 
-#define DEBUG 0
+#define DEBUG 1
 #define NEWWINO
 #define TIME 1
@@ -15 +15 @@
 using namespace std;
 
-#include "fflas-ffpack/modular-positive.h"
+#include "fflas-ffpack/modular-balanced.h"
 #include "timer.h"
 #include "Matio.h"

tests/test-lqup.C

@@ -20 +20 @@
 #include "Matio.h"
 #include "timer.h"
-#include "fflas-ffpack/modular-balanced.h"
+//#include "fflas-ffpack/modular-balanced.h"
 #include "fflas-ffpack/modular-positive.h"
 #include "fflas-ffpack/ffpack.h"
@@ -68 +68 @@
                         A = read_field(F,argv[2],&m,&n);
                 }
-                for (j=0;j<n;j++)
+                for (j=0;j<maxP;j++)
                         P[j]=0;
-                for (j=0;j<m;j++)
+                for (j=0;j<maxQ;j++)
                         Q[j]=0;
                 tim.clear();      
@@ -79 +79 @@
                 timc+=tim;
         }
-        write_field (F,cerr<<"Result = "<<endl, A, m,n,n);
+        //write_field (F,cerr<<"Result = "<<endl, A, m,n,n);
 
         cerr<<"P = [";
@@ -116 +116 @@
                 }
                 
-                write_field(F,cerr<<"L = "<<endl,L,m,m,m);
-                write_field(F,cerr<<"U = "<<endl,U,m,n,n);
+                // write_field(F,cerr<<"L = "<<endl,L,m,m,m);
+//              write_field(F,cerr<<"U = "<<endl,U,m,n,n);
                 FFPACK::applyP( F, FFLAS::FflasRight, FFLAS::FflasNoTrans, m,0,R, L, m, Q);
                 for ( int i=0; i<m; ++i )
                         F.assign(*(L+i*(m+1)), one);
 
-                write_field(F,cerr<<"L = "<<endl,L,m,m,m);
-                write_field(F,cerr<<"U = "<<endl,U,m,n,n);
+//              write_field(F,cerr<<"L = "<<endl,L,m,m,m);
+//              write_field(F,cerr<<"U = "<<endl,U,m,n,n);
                 if (diag == FFLAS::FflasNonUnit)
                         for ( int i=0; i<R; ++i )
@@ -134 +134 @@
                         }
                 }
-                write_field(F,cerr<<"L = "<<endl,L,m,m,m);
-                write_field(F,cerr<<"U = "<<endl,U,m,n,n);
+//              write_field(F,cerr<<"L = "<<endl,L,m,m,m);
+//              write_field(F,cerr<<"U = "<<endl,U,m,n,n);
 
                 FFPACK::applyP (F, FFLAS::FflasRight, FFLAS::FflasNoTrans, m,0,R, U, n, P);
@@ -167 +167 @@
                                 F.assign( *(U+i+j*n), zero);
                 }
-                write_field(F,cerr<<"L = "<<endl,L,m,n,n);
-                write_field(F,cerr<<"U = "<<endl,U,n,n,n);
+//              write_field(F,cerr<<"L = "<<endl,L,m,n,n);
+//              write_field(F,cerr<<"U = "<<endl,U,n,n,n);
 
                 FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasTrans, n,0,R, U, n, Q);
@@ -185 +185 @@
                         }
                 }
-                write_field(F,cerr<<"L = "<<endl,L,m,n,n);
-                write_field(F,cerr<<"U = "<<endl,U,n,n,n);
+//              write_field(F,cerr<<"L = "<<endl,L,m,n,n);
+//              write_field(F,cerr<<"U = "<<endl,U,n,n,n);
 
                 FFPACK::applyP (F, FFLAS::FflasLeft, FFLAS::FflasTrans, n,0,R, L, n, P);
@@ -199 +199 @@
                                 fail=true;
         
-        write_field(F,cerr<<"X = "<<endl,X,m,n,n);
-        write_field(F,cerr<<"B = "<<endl,B,m,n,n);
+//      write_field(F,cerr<<"X = "<<endl,X,m,n,n);
+//      write_field(F,cerr<<"B = "<<endl,B,m,n,n);
         delete[] B;
         if (fail)

tests/test-redechelon.C

@@ -8 +8 @@
 
 //-------------------------------------------------------------------------
-#define DEBUG 0
+#define DEBUG 1
 // Debug option  0: no debug
 //               1: check A = LQUP 

tests/testeur_lqup.C

@@ -12 +12 @@
 using namespace std;
 //#include "fflas-ffpack/modular-int.h"
-#include "fflas-ffpack/modular-positive.h"
-//#include "fflas-ffpack/modular-balanced.h"
+//#include "fflas-ffpack/modular-positive.h"
+#include "fflas-ffpack/modular-balanced.h"
 #include "timer.h"
 #include "Matio.h"
@@ -82 +82 @@
                         P = new size_t[M];
                         Q = new size_t[N];
-
+                        for (size_t i=0; i<M; ++i) P[i] = 0;
+                        for (size_t i=0; i<N; ++i) Q[i] = 0;
                 }
                 else{
@@ -90 +91 @@
                         P = new size_t[N];
                         Q = new size_t[M];
-
+                        for (size_t i=0; i<N; ++i) P[i] = 0;
+                        for (size_t i=0; i<M; ++i) Q[i] = 0;
                 }
                 
@@ -209 +211 @@
                         FFPACK::applyP( F, FFLAS::FflasLeft, FFLAS::FflasTrans, N,0,R, U, N, Q);
                         for (size_t i=0; i<N; ++i)
-                        F.assign (*(U+i*(N+1)),one);
+                                F.assign (*(U+i*(N+1)),one);
                         if (diag == FFLAS::FflasNonUnit)
                                 for ( size_t i=0; i<R; ++i )
@@ -263 +265 @@
         for (size_t i=0; i<M; ++i)
                 for (size_t j=0; j<N; ++j)
-                        cerr<<i+1<<" "<<j+1<<" "<<((size_t) *(Abis+i*lda+j) )<<endl;
+                        if (!(*(Abis+i*lda+j)))
+                                cerr<<i+1<<" "<<j+1<<" "<<((size_t) *(Abis+i*lda+j) )<<endl;
         cerr<<"0 0 0"<<endl<<endl;