X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_Qprime.cpp;h=b20b7b1fbd22498a0ccf642b65a14f9915606d32;hp=6bbf6d11026e3124c59fe59d16d96839c7e6ca5b;hb=67467d256b44f5e08498ca81c946d9ffaa25d1e2;hpb=383d5eb3b0f0506810d9105a268f939125bfc347

diff --git a/check/time_lw_Qprime.cpp b/check/time_lw_Qprime.cpp
index 6bbf6d11..b20b7b1f 100644
--- a/check/time_lw_Qprime.cpp
+++ b/check/time_lw_Qprime.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 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,12 +18,19 @@
  *
  *  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 const bool do_test = true;  // set to true in order to run this beast
+
+static unsigned test()
 {
 	// same matrix as in test P':
 	const unsigned n = 10;
@@ -64,7 +71,7 @@ static unsigned test(void)
 	return 0;
 }
 
-unsigned time_lw_Qprime(void)
+unsigned time_lw_Qprime()
 {
 	unsigned result = 0;
 	unsigned count = 0;
@@ -72,23 +79,28 @@ unsigned time_lw_Qprime(void)
 	double time = .0;
 	
 	cout << "timing Lewis-Wester test Q' (charpoly(P'))" << flush;
-	clog << "-------Lewis-Wester test Q' (charpoly(P'))" << 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;
+	if (do_test) {
+		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;
 	} else {
-		cout << " failed ";
+		cout << " disabled" << endl;
 	}
-	cout << int(1000*(time/count))*0.001 << '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_Qprime();
+}