X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Ftime_lw_IJKL.cpp;h=8390f6d05b47145214593e218e5733836bfde378;hb=e22d2ed95925d870876c4fcd922ea2a9cfdbdab1;hp=62f69b662ba98a2d93c5775174e3c2b7c21488da;hpb=8b0c2741cf5b9b17025302f96ee7d1a451bbfbb0;p=ginac.git

diff --git a/check/time_lw_IJKL.cpp b/check/time_lw_IJKL.cpp
index 62f69b66..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-2000 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
@@ -18,75 +18,80 @@
  *
  *  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)
 {
-    unsigned result = 0;
-    timer cartier;
-    char name = (n==40?'I':(n==70?'K':'?'));
-    
-    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);
-    for (unsigned r=0; r<n; ++r)
-        for (unsigned c=0; c<n; ++c)
-            H.set(r,c,numeric(1,r+c+1));
-    // invert it:
-    cartier.start();
-    matrix Hinv(n,n);
-    Hinv = H.inverse();
-    cout << ". passed ";
-    clog << "(no output)" << endl;
-    cout << int(1000*cartier.read())*0.001 << 's' << endl;
-    
-    // check result:
-    name = (n==40?'J':(n==70?'L':'?'));
-    
-    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);
-    bool correct = true;
-    for (unsigned r=0; r<n; ++r)
-        for (unsigned c=0; c<n; ++c) {
-            if (r==c) {
-                if (identity(r,c)!=1)
-                    correct = false;
-            } else {
-                if (identity(r,c)!=0)
-                    correct = false;
-            }
-        }
-    if (correct) {
-        cout << ". passed ";
-        clog << "(no output)" << endl;
-    } else {
-        cout << ". failed ";
-        ++result;
-    }
-    cout << int(1000*cartier.read())*0.001 << 's' << endl;
-    return result;
+	unsigned result = 0;
+	timer cartier;
+	char name = (n==40?'I':(n==70?'K':'?'));
+	
+	cout << "timing Lewis-Wester test " << name
+	     << " (invert rank " << n << " Hilbert)" << flush;
+	
+	// Create a rank n Hilbert matrix:
+	matrix H(n,n);
+	for (unsigned r=0; r<n; ++r)
+		for (unsigned c=0; c<n; ++c)
+			H.set(r,c,numeric(1,r+c+1));
+	// invert it:
+	cartier.start();
+	matrix Hinv(n,n);
+	Hinv = H.inverse();
+	cout << ". passed ";
+	cout << cartier.read() << 's' << endl;
+	
+	// check result:
+	name = (n==40?'J':(n==70?'L':'?'));
+	
+	cout << "timing Lewis-Wester test " << name
+	     << " (check rank " << n << " Hilbert)" << flush;
+	
+	cartier.reset();
+	matrix identity = H.mul(Hinv);
+	bool correct = true;
+	for (unsigned r=0; r<n; ++r)
+		for (unsigned c=0; c<n; ++c) {
+			if (r==c) {
+				if (identity(r,c)!=1)
+					correct = false;
+			} else {
+				if (identity(r,c)!=0)
+					correct = false;
+			}
+		}
+	if (!correct)
+		++result;
+	cout << cartier.read() << 's' << endl;
+	return result;
 }
 
-unsigned time_lw_IJKL(void)
+unsigned time_lw_IJKL()
+{
+	unsigned result = 0;
+	
+	// Tests I and J:
+	result += test(40);
+	// Tests K and L:
+	result += test(70);
+	
+	return result;
+}
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
 {
-    unsigned result = 0;
-    
-    // Tests I and J:
-    result += test(40);
-    // Tests K and L:
-    result += test(70);
-    
-    return result;
+	randomify_symbol_serials();
+	cout << setprecision(2) << showpoint;
+	return time_lw_IJKL();
 }