X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_D.cpp;h=ffb338c83941b20ab504e528f59c7f7359cc045d;hp=f226f51a43b8b2ab95bfcf4c50e378ffc29a6d5e;hb=1c65b3c7d04ab7123bbc7fc9e420c8bd484927a1;hpb=af922d5eb36ed70e4a9e3ffaf4c24492cf89a1a6

diff --git a/check/time_lw_D.cpp b/check/time_lw_D.cpp
index f226f51a..ffb338c8 100644
--- a/check/time_lw_D.cpp
+++ b/check/time_lw_D.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,12 +18,18 @@
  *
  *  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()
 {
 	ex s;
 	symbol y("y");
@@ -32,22 +38,23 @@ static unsigned test(void)
 	for (int i=1; i<=10; ++i)
 		s += i*y*pow(t,i)/pow(y + i*t,i);
 	
-	if (s.nops()!=10) {
+	s = s.normal();
+	
+	if (s.subs(t==0)!=0) {
 		clog << "something very strange happened" << endl;
 		return 1;
 	}
 	return 0;
 }
 
-unsigned time_lw_D(void)
+unsigned time_lw_D()
 {
 	unsigned result = 0;
 	unsigned count = 0;
 	timer rolex;
 	double time = .0;
 	
-	cout << "timing Lewis-Wester test D (sum of rational fcns)" << flush;
-	clog << "-------Lewis-Wester test D (sum of rational fcns)" << endl;
+	cout << "timing Lewis-Wester test D (normalized sum of rational fcns)" << flush;
 	
 	rolex.start();
 	// correct for very small times:
@@ -56,14 +63,16 @@ unsigned time_lw_D(void)
 		++count;
 	} while ((time=rolex.read())<0.1 && !result);
 	cout << '.' << flush;
-	
-	if (!result) {
-		cout << " passed ";
-		clog << "(no output)" << endl;
-	} else {
-		cout << " failed ";
-	}
-	cout << int(100000*(time/count))*0.00001 << '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_D();
+}