Happy New Year!

[ginac.git] / check / time_lw_M2.cpp

diff --git a/check/time_lw_M2.cpp b/check/time_lw_M2.cpp
index 7d5451b4e6ead6d8a1e1acd290b34d5b01c8b9b0..68e9ca6f8e02364e0a1f94b4276aaf498d5ff274 100644 (file)
--- a/check/time_lw_M2.cpp
+++ b/check/time_lw_M2.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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,12 +18,17 @@
  *
  *  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;
 
-static const bool do_test = false;  // set to true in order to run this beast
+#include <iostream>
+using namespace std;
+
+constexpr bool do_test = false;  // set to true in order to run this beast
 
 static unsigned test()
 {
@@ -157,7 +162,6 @@ unsigned time_lw_M2()
        double time = .0;
        
        cout << "timing Lewis-Wester test M2 (101x101 sparse, det)" << flush;
-       clog << "-------Lewis-Wester test M2 (101x101 sparse, det):" << endl;
        
        if (do_test) {
                piaget.start();
@@ -167,18 +171,19 @@ unsigned time_lw_M2()
                        ++count;
                } while ((time=piaget.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_M2();
+}