X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_O.cpp;h=715d5019ef66114861287970a063126e26942d0c;hp=a9259088ff03f99512816ef09f2039c9d5e91c59;hb=34f23dc638fba5905a1edb3ebcaf99d6eedabf3c;hpb=695f6ae955ec530cded8f21efd5569df39447f76

diff --git a/check/time_lw_O.cpp b/check/time_lw_O.cpp
index a9259088..715d5019 100644
--- a/check/time_lw_O.cpp
+++ b/check/time_lw_O.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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,18 @@
  *
  *  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_test2 = false;  // set to true in order to run this beast
+#include <iostream>
+#include <vector>
+using namespace std;
+
+constexpr bool do_test2 = false;  // set to true in order to run this beast
 
 static const symbol a1("a1"), a2("a2"), a3("a3"), a4("a4"), a5("a5"), a6("a6");
 static const symbol b1("b1"), b2("b2"), b3("b3"), b4("b4"), b5("b5"), b6("b6");
@@ -133,7 +139,6 @@ unsigned time_lw_O()
 	double time = .0;
 
 	cout << "timing Lewis-Wester test O1 (three 15x15 dets)" << flush;
-	clog << "-------Lewis-Wester test O1 (three 15x15 dets):" << endl;
 
 	rolex.start();
 	// correct for very small times:
@@ -142,32 +147,30 @@ unsigned time_lw_O()
 		++count;
 	} while ((time=rolex.read())<0.1 && !result);
 
-	if (!result) {
-		cout << " passed ";
-		clog << "(no output)" << endl;
-	} else {
-		cout << " failed ";
-	}
-	cout << int(1000*(time/(3*count)))*0.001 << "s (average)" << endl;
+	if (result)
+		return result;
+	
+	cout << time/(3*count) << "s (average)" << endl;
 
 	cout << "timing Lewis-Wester test O2 (Resultant)" << flush;
-	clog << "-------Lewis-Wester test O2 (Resultant):" << endl;
 
 	if (do_test2) {
 		rolex.reset();
 		result += test_O2();
 
-		if (!result) {
-			cout << " passed ";
-			clog << "(no output)" << endl;
-		} else {
-			cout << " failed ";
-		}
-		cout << int(1000*rolex.read())*0.001 << "s (combined)" << endl;
+		cout << rolex.read() << "s (combined)" << 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_O();
+}