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

[ginac.git] / check / time_lw_B.cpp

diff --git a/check/time_lw_B.cpp b/check/time_lw_B.cpp
index 3431203d6ee47f2c36e6fd27acd56611e036cfd1..2bd497c7e4d9dc110dde799d38aa4e8383033774 100644 (file)
--- a/check/time_lw_B.cpp
+++ b/check/time_lw_B.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,50 +18,55 @@
  *
  *  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()
 {
-    numeric s;
-    
-    for (int i=1; i<=1000; ++i)
-        s += numeric(i).inverse();
-    
-    if (abs(s.evalf()-numeric("7.4854708605503449"))>numeric("2.0E-16")) {
-        clog << "sum(1/i,i=1..1000) erroneously returned " << s << endl;
-        return 1;
-    }
-    return 0;
+       numeric s;
+       
+       for (int i=1; i<=1000; ++i)
+               s += numeric(i).inverse();
+       
+       if (abs(s.evalf()-numeric("7.4854708605503449"))>numeric("2.0E-16")) {
+               clog << "sum(1/i,i=1..1000) erroneously returned " << s << endl;
+               return 1;
+       }
+       return 0;
 }
 
-unsigned time_lw_B(void)
+unsigned time_lw_B()
 {
-    unsigned result = 0;
-    unsigned count = 0;
-    timer rolex;
-    double time = .0;
-    
-    cout << "timing Lewis-Wester test B (sum of rational numbers)" << flush;
-    clog << "-------Lewis-Wester test B (sum of rational numbers)" << 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;
+       unsigned result = 0;
+       unsigned count = 0;
+       timer rolex;
+       double time = .0;
+       
+       cout << "timing Lewis-Wester test B (sum of rational numbers)" << flush;
+       
+       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;
+       
+       return result;
+}
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+       randomify_symbol_serials();
+       cout << setprecision(2) << showpoint;
+       return time_lw_B();
 }