From: Richard Kreckel <Richard.Kreckel@uni-mainz.de>
Date: Mon, 29 Jan 2001 18:52:35 +0000 (+0000)
Subject: - Lewis-Wester tests D and E now benchmark the time to expand the
X-Git-Tag: release_0-7-1~14
X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=74d3d2ce6bb6dbe073642ec77b23f2a16f8c65aa;hp=003197fb7b25e822db436a77b70ce9d5ccb82714

- Lewis-Wester tests D and E now benchmark the time to expand the
  rational function.  Just assembling it is boring...
---

diff --git a/check/time_lw_D.cpp b/check/time_lw_D.cpp
index 8581e3fa..759f2496 100644
--- a/check/time_lw_D.cpp
+++ b/check/time_lw_D.cpp
@@ -32,7 +32,9 @@ 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;
 	}
@@ -46,8 +48,8 @@ unsigned time_lw_D(void)
 	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;
+	clog << "-------Lewis-Wester test D (normalized sum of rational fcns)" << endl;
 	
 	rolex.start();
 	// correct for very small times:
@@ -63,7 +65,7 @@ unsigned time_lw_D(void)
 	} else {
 		cout << " failed ";
 	}
-	cout << int(100000*(time/count))*0.00001 << 's' << endl;
+	cout << int(1000*(time/count))*0.001 << 's' << endl;
 	
 	return result;
 }
diff --git a/check/time_lw_E.cpp b/check/time_lw_E.cpp
index 4d85d1c1..6cfcd672 100644
--- a/check/time_lw_E.cpp
+++ b/check/time_lw_E.cpp
@@ -32,7 +32,9 @@ 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;
 	}
@@ -46,8 +48,8 @@ unsigned time_lw_E(void)
 	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;
 }
diff --git a/check/times.ref b/check/times.ref
index 6fa65da8..1e77419b 100644
--- a/check/times.ref
+++ b/check/times.ref
@@ -12,9 +12,9 @@
 (no output)
 -------Lewis-Wester test C (gcd of big integers)
 (no output)
--------Lewis-Wester test D (sum of rational fcns)
+-------Lewis-Wester test D (normalized sum of rational fcns)
 (no output)
--------Lewis-Wester test E (sum of rational fcns)
+-------Lewis-Wester test E (normalized sum of rational fcns)
 (no output)
 -------Lewis-Wester test F (gcd of 2-var polys)
 (no output)