X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_C.cpp;h=8bc77db4b1441946178f32e3ffe800cf8a73fc57;hp=ce2921c85fc754aa5cf832feaecad63b95461a13;hb=3324b2f0f035490940b1a9d7cf5dc210776f6d87;hpb=af922d5eb36ed70e4a9e3ffaf4c24492cf89a1a6

diff --git a/check/time_lw_C.cpp b/check/time_lw_C.cpp
index ce2921c8..8bc77db4 100644
--- a/check/time_lw_C.cpp
+++ b/check/time_lw_C.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 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
@@ -18,12 +18,17 @@
  *
  *  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 unsigned test(void)
+static unsigned test()
 {
 	numeric x(13*17*31);
 	numeric y(13*19*29);
@@ -34,14 +39,14 @@ static unsigned test(void)
 	ex lastgcd = gcd(pow(x,300+(200%181)),pow(y,200+(200%183)));
 	if (lastgcd != numeric("53174994123961114423610399251974962981084780166115806651505844915220196792416194060680805428433601792982500430324916963290494659936522782673704312949880308677990050199363768068005367578752699785180694630122629259539608472261461289805919741933")) {
 		clog << "gcd(" << x << "^" << 300+(200%181) << ","
-			 << y << "^" << 200+(200%183) << ") erroneously returned "
-			 << lastgcd << endl;
+		     << y << "^" << 200+(200%183) << ") erroneously returned "
+		     << lastgcd << endl;
 		return 1;
 	}
 	return 0;
 }
 
-unsigned time_lw_C(void)
+unsigned time_lw_C()
 {
 	unsigned result = 0;
 	unsigned count = 0;
@@ -49,7 +54,6 @@ unsigned time_lw_C(void)
 	double time = .0;
 	
 	cout << "timing Lewis-Wester test C (gcd of big integers)" << flush;
-	clog << "-------Lewis-Wester test C (gcd of big integers)" << endl;
 	
 	rolex.start();
 	// correct for very small times:
@@ -58,14 +62,16 @@ unsigned time_lw_C(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_C();
+}