X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_E.cpp;h=4a2abcee0098abc0f7892f9c081983d816608293;hp=4d85d1c1008bf61802e7cad60c4e15d7826697f3;hb=fdbcd40f23fc36b110b715d189125c77f77a8d8d;hpb=383d5eb3b0f0506810d9105a268f939125bfc347

diff --git a/check/time_lw_E.cpp b/check/time_lw_E.cpp
index 4d85d1c1..4a2abcee 100644
--- a/check/time_lw_E.cpp
+++ b/check/time_lw_E.cpp
@@ -4,7 +4,7 @@
  *  Lewis and Michael Wester. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2003 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
@@ -23,7 +23,7 @@
 
 #include "times.h"
 
-static unsigned test(void)
+static unsigned test()
 {
 	ex s;
 	symbol y("y");
@@ -32,22 +32,24 @@ static unsigned test(void)
 	for (int i=1; i<=10; ++i)
 		s += i*y*pow(t,i)/pow(y + abs(5-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_E(void)
+unsigned time_lw_E()
 {
 	unsigned result = 0;
 	unsigned count = 0;
 	timer rolex;
 	double time = .0;
 	
-	cout << "timing Lewis-Wester test E (sum of rational fcns)" << flush;
-	clog << "-------Lewis-Wester test E (sum of rational fcns)" << endl;
+	cout << "timing Lewis-Wester test E (normalized sum of rational fcns)" << flush;
+	clog << "-------Lewis-Wester test E (normalized sum of rational fcns):" << endl;
 	
 	rolex.start();
 	// correct for very small times:
@@ -63,7 +65,7 @@ unsigned time_lw_E(void)
 	} else {
 		cout << " failed ";
 	}
-	cout << int(100000*(time/count))*0.00001 << 's' << endl;
+	cout << int(1000*(time/count))*0.001 << 's' << endl;
 	
 	return result;
 }