X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_lw_E.cpp;h=c50cc297cb919b897e045efcb3d8b4d8a9f45824;hp=dfeac7d622a7a02c57e9d519dab0aeda66fa434b;hb=619d77d2676f7f1a562fb9fefc0ba6754fe2d750;hpb=a54293fb33b252ca926cd1aba18faacb0f16688a

diff --git a/check/time_lw_E.cpp b/check/time_lw_E.cpp
index dfeac7d6..c50cc297 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-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2007 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,52 +18,54 @@
  *
  *  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"
 
-static unsigned test(void)
+static unsigned test()
 {
-    ex s;
-    symbol y("y");
-    symbol t("t");
-    
-    for (int i=1; i<=10; ++i)
-        s += i*y*pow(t,i)/pow(y + abs(5-i)*t,i);
-    
-    if (s.nops()!=10) {
-        clog << "something very strange happened" << endl;
-        return 1;
-    }
-    return 0;
+	ex s;
+	symbol y("y");
+	symbol t("t");
+	
+	for (int i=1; i<=10; ++i)
+		s += i*y*pow(t,i)/pow(y + abs(5-i)*t,i);
+	
+	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 = 1;
-    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;
-    
-    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;
+	unsigned result = 0;
+	unsigned count = 0;
+	timer rolex;
+	double time = .0;
+	
+	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:
+	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 << time/count << 's' << endl;
+	
+	return result;
 }