X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_N.cpp;h=88453f84e4f50fbd9de9d83fda90afc62eb9413f;hp=81d32b0496ddc52c1f9c9ef663331a6f7b46c3ae;hb=4f596b14ac1cdb03163c74e210cab493358ababf;hpb=1f5afe37b4c079821de9810435fa9fa11e4ea17b

diff --git a/check/time_lw_N.cpp b/check/time_lw_N.cpp
index 81d32b04..88453f84 100644
--- a/check/time_lw_N.cpp
+++ b/check/time_lw_N.cpp
@@ -5,7 +5,7 @@
  *  Fermat-test). */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2008 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
@@ -19,14 +19,19 @@
  *
  *  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 <iostream>
+#include <vector>
+#include "ginac.h"
+#include "timer.h"
+using namespace std;
+using namespace GiNaC;
 
 static const bool do_test = false;  // set to true in order to run this beast
 
-static unsigned test(void)
+static unsigned test()
 {
 	symbol p11("p11"), p12("p12"), p21("p21"), p22("p22");
 	symbol a12("a12"), a21("a21"), a22("a22");
@@ -52,7 +57,7 @@ static unsigned test(void)
 	return 0;
 }
 
-unsigned time_lw_N(void)
+unsigned time_lw_N()
 {
 	unsigned result = 0;
 	unsigned count = 0;
@@ -60,7 +65,6 @@ unsigned time_lw_N(void)
 	double time = .0;
 	
 	cout << "timing Lewis-Wester test N (poly at rational fcns)" << flush;
-	clog << "-------Lewis-Wester test N (poly at rational fcns):" << endl;
 	
 	if (do_test) {
 		tag_heuer.start();
@@ -70,18 +74,19 @@ unsigned time_lw_N(void)
 			++count;
 		} while ((time=tag_heuer.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;
 	} else {
 		cout << " disabled" << endl;
-		clog << "(no output)" << endl;
 	}
 	
 	return result;
 }
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+	randomify_symbol_serials();
+	cout << setprecision(2) << showpoint;
+	return time_lw_N();
+}