X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_fateman_expand.cpp;h=6b08ca45ede57181acd60c99ebe2ecc2085e3c74;hp=54f2ddf4bbcd78b951aad5579342eccccf7e1967;hb=8cffcdf13d817a47f217f1a1043317d95969e070;hpb=e3a85b82783389ef7d96a8d6d75c5ab64157e24b

diff --git a/check/time_fateman_expand.cpp b/check/time_fateman_expand.cpp
index 54f2ddf4..6b08ca45 100644
--- a/check/time_fateman_expand.cpp
+++ b/check/time_fateman_expand.cpp
@@ -6,7 +6,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 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
@@ -20,12 +20,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 "ginac.h"
+#include "timer.h"
+using namespace GiNaC;
 
-static unsigned test(void)
+#include <iostream>
+using namespace std;
+
+static unsigned test()
 {
 	unsigned result = 0;
 	const symbol x("x"), y("y"), z("z");
@@ -42,7 +47,7 @@ static unsigned test(void)
 	return result;
 }
 
-unsigned time_fateman_expand(void)
+unsigned time_fateman_expand()
 {
 	unsigned result = 0;
 	unsigned count = 0;
@@ -50,7 +55,6 @@ unsigned time_fateman_expand(void)
 	double time = .0;
 
 	cout << "timing Fateman's polynomial expand benchmark" << flush;
-	clog << "-------Fateman's polynomial expand benchmark:" << endl;
 
 	concord.start();
 	// correct for very small times:
@@ -60,13 +64,16 @@ unsigned time_fateman_expand(void)
 	} while ((time=concord.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_fateman_expand();
+}