Rewritten heuristic and PRS GCD for univariate polynomials, added benchmark.

[ginac.git] / check / time_lw_P.cpp

diff --git a/check/time_lw_P.cpp b/check/time_lw_P.cpp
index e0270d29d4ca20f4b52fbf16d306fc6536fb3056..75e5bc5081b39df87c170d059d30fdd9055507df 100644 (file)
--- a/check/time_lw_P.cpp
+++ b/check/time_lw_P.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 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
@@ -21,7 +21,12 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "times.h"
+#include <iostream>
+#include <vector>
+#include "ginac.h"
+#include "timer.h"
+using namespace std;
+using namespace GiNaC;
 
 static unsigned test()
 {
@@ -59,7 +64,6 @@ unsigned time_lw_P()
        double time = .0;
        
        cout << "timing Lewis-Wester test P (det of sparse rank 101)" << flush;
-       clog << "-------Lewis-Wester test P (det of sparse rank 101):" << endl;
        
        rolex.start();
        // correct for very small times:
@@ -67,15 +71,16 @@ unsigned time_lw_P()
                result = test();
                ++count;
        } while ((time=rolex.read())<0.1 && !result);
-       cout << '.' << flush;
-       
-       if (!result) {
-               cout << " passed ";
-               clog << "(no output)" << endl;
-       } else {
-               cout << " failed ";
-       }
        cout << time/count << 's' << endl;
        
        return result;
 }
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+       randomify_symbol_serials();
+       cout << setprecision(2) << showpoint;
+       return time_lw_P();
+}