Changeset 16

Timestamp:

04/27/07 13:28:46 (2 years ago)

Author:

pernet

Message:

Minor changes to the tests

Location:

tests

Files:

• Matio.h (modified) (1 diff)
• test-fgemm.C (modified) (2 diffs)
• test-invert.C (modified) (1 diff)
• test-lqup.C (modified) (6 diffs)

tests/Matio.h

@@ -111 +111 @@
                      int n, int m, int id){
   
-  double tmp;
+  typename Field::Element tmp;
   //#if DEBUG
   for (int i = 0; i<n;++i){

tests/test-fgemm.C

@@ -7 +7 @@
 //-------------------------------------------------------------------------
 
-#define DEBUG 0
+#define DEBUG 1
 #define TIME 1
 
@@ -43 +43 @@
         Field F(atoi(argv[1]));
 
-        F.init( alpha, double(atoi(argv[6])));
-        F.init( beta, double(atoi(argv[7])));
+        F.init( alpha, Field::Element(atoi(argv[6])));
+        F.init( beta, Field::Element(atoi(argv[7])));
 
         Field::Element * A;

tests/test-invert.C

@@ -21 +21 @@
 using namespace std;
 
-typedef Modular<double> Field;
+typedef Modular<float> Field;
 
 int main(int argc, char** argv){

tests/test-lqup.C

@@ -20 +20 @@
 #include "Matio.h"
 #include "timer.h"
-#include "fflas-ffpack/modular-positive.h"
+#include "fflas-ffpack/modular-balanced.h"
 #include "fflas-ffpack/ffpack.h"
 
@@ -28 +28 @@
         cerr<<setprecision(20);
         int i,j,nbf,m,n;
-        size_t R=0;
+        int R=0;
 
         if (argc!=5){
@@ -44 +44 @@
         size_t *Q = new size_t[m];
                 
-        size_t cutoff = atoi(argv[3]);
+        //      size_t cutoff = atoi(argv[3]);
         nbf = atoi(argv[4]);
         
@@ -63 +63 @@
                 tim.clear();      
                 tim.start();    
-                R = FFPACK::LUdivine_gauss (F, diag, m, n, A, n, P, Q,
+                R = FFPACK::LUdivine (F, diag, m, n, A, n, P, Q,
                                             FFPACK::FfpackLQUP);
                 tim.stop();
@@ -86 +86 @@
         F.init(zero,0.0);
         F.init(one,1.0);
-        for (size_t i=0; i<R; ++i){
-                for (size_t j=0; j<i; ++j)
+        for (int i=0; i<R; ++i){
+                for (int j=0; j<i; ++j)
                         F.assign ( *(U + i*n + j), zero);
                 for (int j=i; j<n; ++j)
                         F.assign (*(U + i*n + j), *(A+ i*n+j));
         }
-        for (size_t i=R;i<m; ++i)
-                for (size_t j=0; j<n; ++j)
+        for (int i=R;i<m; ++i)
+                for (int j=0; j<n; ++j)
                         F.assign(*(U+i*n+j), zero);
         for ( int i=0; i<m; ++i ){
@@ -110 +110 @@
                         F.assign (*(L+i*(m+1)),one);
         else{
-                size_t i=0;
-                while (Q[i]==i){*(L+i*(m+1)) = * (U+i*(n+1)); ++i;}
-                for ( size_t i=0; i<R; ++i )
+                int i=0;
+                while (Q[i]==size_t(i)){*(L+i*(m+1)) = * (U+i*(n+1)); ++i;}
+                for ( int i=0; i<R; ++i )
                         F.assign (*(U+i*(n+1)),one);
         }