X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_IJKL.cpp;h=8390f6d05b47145214593e218e5733836bfde378;hp=4d62fedfcc4d0771995636786864683c18ac6ee5;hb=b134e8fa1b93b24c0f5916c96090f016d8a7c9d7;hpb=5b44febe31956b36b62cd3650f7c5249bbe8100c

diff --git a/check/time_lw_IJKL.cpp b/check/time_lw_IJKL.cpp
index 4d62fedf..8390f6d0 100644
--- a/check/time_lw_IJKL.cpp
+++ b/check/time_lw_IJKL.cpp
@@ -4,7 +4,7 @@
  *  by Robert H. Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2010 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
@@ -21,7 +21,13 @@
  *  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)
 {
@@ -31,8 +37,6 @@ static unsigned test(unsigned n)
 	
 	cout << "timing Lewis-Wester test " << name
 	     << " (invert rank " << n << " Hilbert)" << flush;
-	clog << "-------Lewis-Wester test " << name
-	     << " (invert rank " << n << " Hilbert):" << endl;
 	
 	// Create a rank n Hilbert matrix:
 	matrix H(n,n);
@@ -44,7 +48,6 @@ static unsigned test(unsigned n)
 	matrix Hinv(n,n);
 	Hinv = H.inverse();
 	cout << ". passed ";
-	clog << "(no output)" << endl;
 	cout << cartier.read() << 's' << endl;
 	
 	// check result:
@@ -52,8 +55,6 @@ static unsigned test(unsigned n)
 	
 	cout << "timing Lewis-Wester test " << name
 	     << " (check rank " << n << " Hilbert)" << flush;
-	clog << "-------Lewis-Wester test " << name
-	     << " (check rank " << n << " Hilbert):" << endl;
 	
 	cartier.reset();
 	matrix identity = H.mul(Hinv);
@@ -68,13 +69,8 @@ static unsigned test(unsigned n)
 					correct = false;
 			}
 		}
-	if (correct) {
-		cout << ". passed ";
-		clog << "(no output)" << endl;
-	} else {
-		cout << ". failed ";
+	if (!correct)
 		++result;
-	}
 	cout << cartier.read() << 's' << endl;
 	return result;
 }
@@ -90,3 +86,12 @@ unsigned time_lw_IJKL()
 	
 	return result;
 }
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+	randomify_symbol_serials();
+	cout << setprecision(2) << showpoint;
+	return time_lw_IJKL();
+}