G_numeric: put convergence/acceleration transofrmations into helper functions.

[ginac.git] / check / time_dennyfliegner.cpp

diff --git a/check/time_dennyfliegner.cpp b/check/time_dennyfliegner.cpp
index 3f6d6def19219000215f946698b1cd7fd69819f5..07a8938ca2389a54bc3317f59ce58595b5bad9ec 100644 (file)
--- a/check/time_dennyfliegner.cpp
+++ b/check/time_dennyfliegner.cpp
@@ -7,7 +7,7 @@
  *  after which e should be just a1^2. */
 
 /*
- *  GiNaC Copyright (C) 1999-2007 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
@@ -24,7 +24,13 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "times.h"
+#include <iostream>
+#include <sstream>
+#include <vector>
+#include "ginac.h"
+#include "timer.h"
+using namespace std;
+using namespace GiNaC;
 
 static unsigned expand_subs(unsigned size)
 {
@@ -58,7 +64,6 @@ unsigned time_dennyfliegner()
        unsigned result = 0;
        
        cout << "timing commutative expansion and substitution" << flush;
-       clog << "-------commutative expansion and substitution:" << endl;
        
        vector<unsigned> sizes;
        vector<double> times;
@@ -76,12 +81,6 @@ unsigned time_dennyfliegner()
                cout << '.' << flush;
        }
        
-       if (!result) {
-               cout << " passed ";
-               clog << "(no output)" << endl;
-       } else {
-               cout << " failed ";
-       }
        // print the report:
        cout << endl << "       size:  ";
        for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i)
@@ -93,3 +92,12 @@ unsigned time_dennyfliegner()
        
        return result;
 }
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+       randomify_symbol_serials();
+       cout << setprecision(2) << showpoint;
+       return time_dennyfliegner();
+}