X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Ftime_lw_A.cpp;h=ea1787f6af724bd9c6a04bc6fbfea431c4c61039;hb=33a92d56aeaadfe8dad246ae17b091e14b220e82;hp=c21bcede0f31252e0b14fef747f8233bd5ccffc0;hpb=a54293fb33b252ca926cd1aba18faacb0f16688a;p=ginac.git

diff --git a/check/time_lw_A.cpp b/check/time_lw_A.cpp
index c21bcede..ea1787f6 100644
--- a/check/time_lw_A.cpp
+++ b/check/time_lw_A.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2016 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,49 +18,56 @@
  *
  *  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>
+#include <vector>
+using namespace std;
+
+static unsigned test()
 {
-    for (int i=1; i<=99; ++i)
-        factorial(1000+i)/factorial(900+i);
-    ex rat(factorial(1100)/factorial(1000));
-    
-    if (abs(evalf(rat)-numeric(".13280014101512E303"))>numeric("1.0E289")) {
-        clog << "1100!/1000! erroneously returned " << rat << endl;
-        return 1;
-    }
-    return 0;
+	for (int i=1; i<=99; ++i)
+		factorial(1000+i)/factorial(900+i);
+	ex rat(factorial(1100)/factorial(1000));
+	
+	if (abs(evalf(rat)-numeric(".13280014101512E303"))>numeric("1.0E289")) {
+		clog << "1100!/1000! erroneously returned " << rat << endl;
+		return 1;
+	}
+	return 0;
 }
 
-unsigned time_lw_A(void)
+unsigned time_lw_A()
+{
+	unsigned result = 0;
+	unsigned count = 0;
+	timer rolex;
+	double time = .0;
+	
+	cout << "timing Lewis-Wester test A (divide factorials)" << 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 A (divide factorials)" << flush;
-    clog << "-------Lewis-Wester test A (divide factorials)" << 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_A();
 }