X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Ftime_lw_H.cpp;h=730228a828d6609abaf02f209fc47303b7af3eb5;hb=c814fb2991fc9d44c7466da5bbf20e58c0f4238f;hp=274351a8aa0f883827c6561e2ab98bdc276545a6;hpb=e7cc6a764ff67b5885d6633385fac23ccc1dc9a7;p=ginac.git

diff --git a/check/time_lw_H.cpp b/check/time_lw_H.cpp
index 274351a8..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-2002 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,37 +18,40 @@
  *
  *  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)
 {
 	matrix hilbert(n,n);
-	
+
 	for (unsigned r=0; r<n; ++r)
 		for (unsigned c=0; c<n; ++c)
 			hilbert.set(r,c,numeric(1,r+c+1));
 	ex det = hilbert.determinant();
-	
+
 	/*
 	   The closed form of the determinant of n x n Hilbert matrices is:
 	
-	     n-1   /                      n-1                 \
-	    ----- |                      -----                 |
-	     | |  | pow(factorial(r),2)   | |    hilbert(r,c)  |
-	     | |  |                       | |                  |   
-	    r = 0  \                     c = 0                /
+             n-1   /                   \
+            ----- | pow(factorial(r),3) |
+             | |  | ------------------- |
+             | |  |    factorial(r+n)   |
+            r = 0  \                   /
 	*/
-	
+
 	ex hilbdet = 1;
-	for (unsigned r=0; r<n; ++r) {
-		hilbdet *= pow(factorial(numeric(r)),2);
-		for (unsigned c=0; c<n; ++c)
-			hilbdet *= hilbert(r,c);
-	}
-	
+	for (unsigned r=0; r<n; ++r)
+		hilbdet *= pow(factorial(r),3)/(factorial(r+n));
+
 	if (det != hilbdet) {
 		clog << "determinant of " << n << "x" << n << " erroneously returned " << det << endl;
 		return 1;
@@ -56,16 +59,15 @@ static unsigned test(unsigned n)
 	return 0;
 }
 
-unsigned time_lw_H(void)
+unsigned time_lw_H()
 {
 	unsigned result = 0;
 	unsigned count = 0;
 	timer rolex;
 	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:
 	do {
@@ -73,14 +75,16 @@ unsigned time_lw_H(void)
 		++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();
+}