match() (find()): use exmap (exset) to store matched subexpressions.

[ginac.git] / check / time_lw_Q.cpp

diff --git a/check/time_lw_Q.cpp b/check/time_lw_Q.cpp
index 0c29dfb0546bb753b94e961e90381e9a06bfc377..b42f5a2446883b393449de386aa679fdc1ac38e3 100644 (file)
--- a/check/time_lw_Q.cpp
+++ b/check/time_lw_Q.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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
@@ -18,57 +18,77 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "times.h"
-#include "time_lw_w101n.h"
+#include <iostream>
+#include <vector>
+#include "ginac.h"
+#include "timer.h"
+using namespace std;
+using namespace GiNaC;
 
-static unsigned test(void)
+static const bool do_test = true;  // set to true in order to run this beast
+
+static unsigned test()
 {
-    matrix m(101,101);
-    symbol lambda("lambda");
-    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]);
-        }
-    }
-    ex cp = m.charpoly(lambda);
-    
-    if (cp.coeff(lambda,96) != numeric("75287520")) {
-        clog << "characteristic polynomial miscalculated as " << cp << endl;
-        return 1;
-    }
-    return 0;
+       // same matrix as in 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);
+       
+       symbol lambda("lambda");
+       ex cp = m.charpoly(lambda);
+       
+       if (cp.coeff(lambda,96) != numeric("75287520")) {
+               clog << "characteristic polynomial miscalculated as " << cp << endl;
+               return 1;
+       }
+       return 0;
 }
 
-unsigned time_lw_Q(void)
+unsigned time_lw_Q()
+{
+       unsigned result = 0;
+       unsigned count = 0;
+       timer rolex;
+       double time = .0;
+       
+       cout << "timing Lewis-Wester test Q (charpoly(P))" << flush;
+       
+       if (do_test) {
+               rolex.start();
+               // correct for very small times:
+               do {
+                       result = test();
+                       ++count;
+               } while ((time=rolex.read())<0.1 && !result);
+               cout << '.' << flush;
+               cout << time/count << 's' << endl;
+       } else {
+               cout << " disabled" << endl;
+       }
+       
+       return result;
+}
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
 {
-    unsigned result = 0;
-    unsigned count = 0;
-    timer rolex;
-    double time = .0;
-    
-    cout << "timing Lewis-Wester test Q (charpoly(P))" << flush;
-    clog << "-------Lewis-Wester test Q (charpoly(P))" << 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;
+       randomify_symbol_serials();
+       cout << setprecision(2) << showpoint;
+       return time_lw_Q();
 }