X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_Pprime.cpp;h=241877b769b9e6b6761977908e7ae824bf306161;hp=88854b29ff552d3d4222e12bc27aad44306dc86c;hb=8cffcdf13d817a47f217f1a1043317d95969e070;hpb=b6415364be14b7f3129ffe3d54e7c3c8bc74ed3c

diff --git a/check/time_lw_Pprime.cpp b/check/time_lw_Pprime.cpp
index 88854b29..241877b7 100644
--- a/check/time_lw_Pprime.cpp
+++ b/check/time_lw_Pprime.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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,71 +18,84 @@
  *
  *  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 "time_lw_w101n.h"
+#include "ginac.h"
+#include "timer.h"
+using namespace GiNaC;
 
-static unsigned test(void)
+#include <iostream>
+#include <vector>
+using namespace std;
+
+static unsigned test()
 {
-    matrix m(101,101);
-    for (unsigned r=0; r<101; ++r) {
-        for (unsigned c=0; c<10; ++c) {
-            m.set(r,
-                  unsigned(ex_to_numeric(w101_numeric[r][2*c+1]).to_int()-1),
-                  w101_numeric[r][2*c+2]);
-        }
-    }
-    matrix m2(m);
-    ex a;
-    for (unsigned r=0; r<101; ++r) {
-        a = m2(r,0);
-        for (unsigned c=0; c<100; ++c) {
-            m2.set(r,c,m2(r,c+1));
-        }
-        m2.set(r,100,a);
-    }
-    for (unsigned r=0; r<101; ++r) {
-        for (unsigned c=0; c<101; ++c) {
-            if (!m(r,c).is_zero())
-                m2.set(r,c,m(r,c));
-        }
-    }
-    ex det = m2.determinant();
-    
-    if (det!=numeric("140816284877507872414776")) {
-        clog << "det of less sparse rank 101 matrix erroneously returned " << det << endl;
-        return 1;
-    }
-    return 0;
+	// create the matrix from test P...
+	const unsigned n = 10;
+	matrix m(n*n+1,n*n+1);
+	for (unsigned i=1; i<=n*n; ++i)
+		m.set(i-1,i-1,1);
+	for (unsigned i=1; i<=n*n; ++i)
+		if (!(i%n))
+			m.set(i-1,n*n,1);
+	for (unsigned i=1; i<=n*n; ++i)
+		if (!((i-1)%n))
+			m.set(n*n,i-1,n-(i-1)/n);
+	for(unsigned i=1; i<=n; ++i)
+		for (unsigned j=1; j<=n; ++j)
+			if (i-j)
+				for (unsigned k=1; k<n; ++k)
+					m.set((i-1)*n+k-1,(j-1)*n+k,n+1-j);
+	// ...and then another, more dense one:
+	matrix m2(m);
+	ex a;
+	for (unsigned r=0; r<=n*n; ++r) {
+		a = m2(r,0);
+		for (unsigned c=0; c<n*n; ++c)
+			m2.set(r,c,m2(r,c+1));
+		m2.set(r,100,a);
+	}
+	for (unsigned r=0; r<=n*n; ++r)
+		for (unsigned c=0; c<=n*n; ++c)
+			if (!m(r,c).is_zero())
+				m2.set(r,c,m(r,c));
+	
+	ex det = m2.determinant();
+	
+	if (det!=numeric("140816284877507872414776")) {
+		clog << "det of less sparse rank 101 matrix erroneously returned " << det << endl;
+		return 1;
+	}
+	return 0;
 }
 
-unsigned time_lw_Pprime(void)
+unsigned time_lw_Pprime()
+{
+	unsigned result = 0;
+	unsigned count = 0;
+	timer rolex;
+	double time = .0;
+	
+	cout << "timing Lewis-Wester test P' (det of less sparse rank 101)" << flush;
+	
+	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;
+	
+	return result;
+}
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
 {
-    unsigned result = 0;
-    unsigned count = 1;
-    timer rolex;
-    double time = .0;
-    
-    cout << "timing Lewis-Wester test P' (det of less sparse rank 101)" << flush;
-    clog << "-------Lewis-Wester test P' (det of less sparse rank 101)" << 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;
-    } else {
-        cout << " failed ";
-    }
-    cout << int(1000*(time/count))*0.001 << 's' << endl;
-    
-    return result;
+	randomify_symbol_serials();
+	cout << setprecision(2) << showpoint;
+	return time_lw_Pprime();
 }