lexer: when switching to another output stream, clean last read character.

[ginac.git] / check / time_lw_G.cpp

diff --git a/check/time_lw_G.cpp b/check/time_lw_G.cpp
index efbf335d2085f46c9d30d355c6e3f2bee12ce00c..5c748ba43c374080d0aa2d0164d18b8fbae76899 100644 (file)
--- a/check/time_lw_G.cpp
+++ b/check/time_lw_G.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,17 +18,22 @@
  *
  *  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 <iostream>
+#include <vector>
+#include "ginac.h"
+#include "timer.h"
+using namespace std;
+using namespace GiNaC;
 
-static unsigned test(void)
+static unsigned test()
 {
        symbol x("x");
        symbol y("y");
        symbol z("z");
-
+       
        ex p = expand(pow(7*y*pow(x*z,2)-3*x*y*z+11*(x+1)*pow(y,2)+5*z+1,4)
                      *pow(3*x-7*y+2*z-3,5));
        ex q = expand(pow(7*y*pow(x*z,2)-3*x*y*z+11*(x+1)*pow(y,2)+5*z+1,3)
@@ -41,7 +46,7 @@ static unsigned test(void)
        return 0;
 }
 
-unsigned time_lw_G(void)
+unsigned time_lw_G()
 {
        unsigned result = 0;
        unsigned count = 0;
@@ -49,7 +54,6 @@ unsigned time_lw_G(void)
        double time = .0;
        
        cout << "timing Lewis-Wester test G (gcd of 3-var polys)" << flush;
-       clog << "-------Lewis-Wester test G (gcd of 3-var polys)" << endl;
        
        rolex.start();
        // correct for very small times:
@@ -58,14 +62,16 @@ unsigned time_lw_G(void)
                ++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;
+       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_G();
+}