Update copyright statements.

[ginac.git] / check / time_lw_N.cpp

diff --git a/check/time_lw_N.cpp b/check/time_lw_N.cpp
index d5539fe4da0ad92a586f356e7298c2c1706e8ab0..ea56fd2a6ca6f7bb70431c46d3edb7b41a9b997f 100644 (file)
--- a/check/time_lw_N.cpp
+++ b/check/time_lw_N.cpp
@@ -5,7 +5,7 @@
  *  Fermat-test). */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2014 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
@@ -19,14 +19,20 @@
  *
  *  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 "ginac.h"
+#include "timer.h"
+using namespace GiNaC;
+
+#include <iostream>
+#include <vector>
+using namespace std;
 
 static const bool do_test = false;  // set to true in order to run this beast
 
-static unsigned test(void)
+static unsigned test()
 {
        symbol p11("p11"), p12("p12"), p21("p21"), p22("p22");
        symbol a12("a12"), a21("a21"), a22("a22");
@@ -52,7 +58,7 @@ static unsigned test(void)
        return 0;
 }
 
-unsigned time_lw_N(void)
+unsigned time_lw_N()
 {
        unsigned result = 0;
        unsigned count = 0;
@@ -60,7 +66,6 @@ unsigned time_lw_N(void)
        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 +75,19 @@ unsigned time_lw_N(void)
                        ++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();
+}