X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_M1.cpp;h=2b3864af478022887c5069a7a6dda278fa152d4d;hp=961fe2a5b2fd3c3639d88d8f84fb7267684a7012;hb=acae7ab5a4dc94d1f54ba794f32f5764cdb4d704;hpb=383d5eb3b0f0506810d9105a268f939125bfc347

diff --git a/check/time_lw_M1.cpp b/check/time_lw_M1.cpp
index 961fe2a5..2b3864af 100644
--- a/check/time_lw_M1.cpp
+++ b/check/time_lw_M1.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 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,16 +18,21 @@
  *
  *  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;
 
-static unsigned test(void)
+#include <iostream>
+using namespace std;
+
+static unsigned test()
 {
 	// Determinant of a sparse matrix that comes up in graph theory:
 	symbol x1("x1"), x2("x2"), x3("x3"), x4("x4"), x5("x5");
-	static ex w[26][11] = {
+	ex w[26][11] = {
 		{ 1,  1,  1,  7, x4, 12, x3, 17, x2, 22, x1},
 		{ 2,  2,  1,  8, x4, 13, x3, 18, x2, 23, x1},
 		{ 3,  3,  1,  9, x4, 14, x3, 19, x2, 24, x1},
@@ -59,7 +64,7 @@ static unsigned test(void)
 	for (unsigned r=0; r<26; ++r) {
 		for (unsigned c=0; c<5; ++c) {
 			m.set(r,
-			      unsigned(ex_to_numeric(w[r][2*c+1]).to_int()-1),
+			      unsigned(ex_to<numeric>(w[r][2*c+1]).to_int()-1),
 			      w[r][2*c+2]);
 		}
 	}
@@ -73,7 +78,7 @@ static unsigned test(void)
 	return 0;
 }
 
-unsigned time_lw_M1(void)
+unsigned time_lw_M1()
 {
 	unsigned result = 0;
 	unsigned count = 0;
@@ -81,7 +86,6 @@ unsigned time_lw_M1(void)
 	double time = .0;
 	
 	cout << "timing Lewis-Wester test M1 (26x26 sparse, det)" << flush;
-	clog << "-------Lewis-Wester test M1 (26x26 sparse, det)" << endl;
 	
 	rolex.start();
 	// correct for very small times:
@@ -90,14 +94,16 @@ unsigned time_lw_M1(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_M1();
+}