X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Ftime_lw_H.cpp;h=730228a828d6609abaf02f209fc47303b7af3eb5;hb=cd0f12f5ce6023812f76d0f6eb40ee83078c2775;hp=83fdf80975c5d123824cef11173e3963480c85c8;hpb=60cd45539ae8a25adf8966975895afa8d8c084fd;p=ginac.git

diff --git a/check/time_lw_H.cpp b/check/time_lw_H.cpp
index 83fdf809..730228a8 100644
--- a/check/time_lw_H.cpp
+++ b/check/time_lw_H.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 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,10 +18,16 @@
  *
  *  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 unsigned test(unsigned n)
 {
@@ -44,7 +50,7 @@ static unsigned test(unsigned n)
 
 	ex hilbdet = 1;
 	for (unsigned r=0; r<n; ++r)
-	    hilbdet *= pow(factorial(r),3)/(factorial(r+n));
+		hilbdet *= pow(factorial(r),3)/(factorial(r+n));
 
 	if (det != hilbdet) {
 		clog << "determinant of " << n << "x" << n << " erroneously returned " << det << endl;
@@ -61,7 +67,6 @@ unsigned time_lw_H()
 	double time = .0;
 
 	cout << "timing Lewis-Wester test H (det of 80x80 Hilbert)" << flush;
-	clog << "-------Lewis-Wester test H (det of 80x80 Hilbert):" << endl;
 
 	rolex.start();
 	// correct for very small times:
@@ -70,14 +75,16 @@ unsigned time_lw_H()
 		++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;
+	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_H();
+}