updated the autogen.sh script

[ginac.git] / check / time_lw_Pprime.cpp

diff --git a/check/time_lw_Pprime.cpp b/check/time_lw_Pprime.cpp
index 88854b29ff552d3d4222e12bc27aad44306dc86c..3d9579538948428ab2a981f50f8ac1bf529464df 100644 (file)
--- a/check/time_lw_Pprime.cpp
+++ b/check/time_lw_Pprime.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -22,67 +22,73 @@
  */
 
 #include "times.h"
-#include "time_lw_w101n.h"
 
 static unsigned test(void)
 {
-    matrix m(101,101);
-    for (unsigned r=0; r<101; ++r) {
-        for (unsigned c=0; c<10; ++c) {
-            m.set(r,
-                  unsigned(ex_to_numeric(w101_numeric[r][2*c+1]).to_int()-1),
-                  w101_numeric[r][2*c+2]);
-        }
-    }
-    matrix m2(m);
-    ex a;
-    for (unsigned r=0; r<101; ++r) {
-        a = m2(r,0);
-        for (unsigned c=0; c<100; ++c) {
-            m2.set(r,c,m2(r,c+1));
-        }
-        m2.set(r,100,a);
-    }
-    for (unsigned r=0; r<101; ++r) {
-        for (unsigned c=0; c<101; ++c) {
-            if (!m(r,c).is_zero())
-                m2.set(r,c,m(r,c));
-        }
-    }
-    ex det = m2.determinant();
-    
-    if (det!=numeric("140816284877507872414776")) {
-        clog << "det of less sparse rank 101 matrix erroneously returned " << det << endl;
-        return 1;
-    }
-    return 0;
+       // create the matrix from test P...
+       const unsigned n = 10;
+       matrix m(n*n+1,n*n+1);
+       for (unsigned i=1; i<=n*n; ++i)
+               m.set(i-1,i-1,1);
+       for (unsigned i=1; i<=n*n; ++i)
+               if (!(i%n))
+                       m.set(i-1,n*n,1);
+       for (unsigned i=1; i<=n*n; ++i)
+               if (!((i-1)%n))
+                       m.set(n*n,i-1,n-(i-1)/n);
+       for(unsigned i=1; i<=n; ++i)
+               for (unsigned j=1; j<=n; ++j)
+                       if (i-j)
+                               for (unsigned k=1; k<n; ++k)
+                                       m.set((i-1)*n+k-1,(j-1)*n+k,n+1-j);
+       // ...and then another, more dense one:
+       matrix m2(m);
+       ex a;
+       for (unsigned r=0; r<=n*n; ++r) {
+               a = m2(r,0);
+               for (unsigned c=0; c<n*n; ++c)
+                       m2.set(r,c,m2(r,c+1));
+               m2.set(r,100,a);
+       }
+       for (unsigned r=0; r<=n*n; ++r)
+               for (unsigned c=0; c<=n*n; ++c)
+                       if (!m(r,c).is_zero())
+                               m2.set(r,c,m(r,c));
+       
+       ex det = m2.determinant();
+       
+       if (det!=numeric("140816284877507872414776")) {
+               clog << "det of less sparse rank 101 matrix erroneously returned " << det << endl;
+               return 1;
+       }
+       return 0;
 }
 
 unsigned time_lw_Pprime(void)
 {
-    unsigned result = 0;
-    unsigned count = 1;
-    timer rolex;
-    double time = .0;
-    
-    cout << "timing Lewis-Wester test P' (det of less sparse rank 101)" << flush;
-    clog << "-------Lewis-Wester test P' (det of less sparse rank 101)" << endl;
-    
-    rolex.start();
-    // correct for very small times:
-    do {
-        result = test();
-        ++count;
-    } while ((time=rolex.read())<0.1 && !result);
-    cout << '.' << flush;
-    
-    if (!result) {
-        cout << " passed ";
-        clog << "(no output)" << endl;
-    } else {
-        cout << " failed ";
-    }
-    cout << int(1000*(time/count))*0.001 << 's' << endl;
-    
-    return result;
+       unsigned result = 0;
+       unsigned count = 0;
+       timer rolex;
+       double time = .0;
+       
+       cout << "timing Lewis-Wester test P' (det of less sparse rank 101)" << flush;
+       clog << "-------Lewis-Wester test P' (det of less sparse rank 101):" << endl;
+       
+       rolex.start();
+       // correct for very small times:
+       do {
+               result = test();
+               ++count;
+       } while ((time=rolex.read())<0.1 && !result);
+       cout << '.' << flush;
+       
+       if (!result) {
+               cout << " passed ";
+               clog << "(no output)" << endl;
+       } else {
+               cout << " failed ";
+       }
+       cout << int(1000*(time/count))*0.001 << 's' << endl;
+       
+       return result;
 }