G_numeric: put convergence/acceleration transofrmations into helper functions.

[ginac.git] / check / time_lw_N.cpp

diff --git a/check/time_lw_N.cpp b/check/time_lw_N.cpp
index 77e91a72283321c605b6e463f69587e2b056ecca..88453f84e4f50fbd9de9d83fda90afc62eb9413f 100644 (file)
--- a/check/time_lw_N.cpp
+++ b/check/time_lw_N.cpp
@@ -5,7 +5,7 @@
  *  Fermat-test). */
 
 /*
- *  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
@@ -22,7 +22,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 const bool do_test = false;  // set to true in order to run this beast
 
@@ -60,7 +65,6 @@ unsigned time_lw_N()
        double time = .0;
        
        cout << "timing Lewis-Wester test N (poly at rational fcns)" << flush;
-       clog << "-------Lewis-Wester test N (poly at rational fcns):" << endl;
        
        if (do_test) {
                tag_heuer.start();
@@ -70,18 +74,19 @@ unsigned time_lw_N()
                        ++count;
                } while ((time=tag_heuer.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;
+               cout << time/count << 's' << endl;
        } else {
                cout << " disabled" << endl;
-               clog << "(no output)" << endl;
        }
        
        return result;
 }
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+       randomify_symbol_serials();
+       cout << setprecision(2) << showpoint;
+       return time_lw_N();
+}