X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftimes.cpp;h=b825543b8da9ea475330900ad0a2a0435dd51c68;hp=8f4200b7bcd8c395aec6875654e65141e1d0b7e0;hb=8ba901b532b844d49ffbd11f906f9124f357db1f;hpb=383d5eb3b0f0506810d9105a268f939125bfc347

diff --git a/check/times.cpp b/check/times.cpp
index 8f4200b7..b825543b 100644
--- a/check/times.cpp
+++ b/check/times.cpp
@@ -3,7 +3,7 @@
  *  Main program that calls the individual timings. */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 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
@@ -17,150 +17,77 @@
  *
  *  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 <stdexcept>
-#include <iostream>
-
 #include "times.h"
 
+/** Generate a random amount of symbols and destroy them again immediatly.
+ *  This operation effectively makes the serial numbers of all subsequent
+ *  symbols unpredictable.  If the serials are unpredictable, then so are
+ *  their hash values.  If the hash values are unpredictable, then so are
+ *  the canonical orderings.  If the canonical orderings are unpredictable,
+ *  all subsequent times are subject to some variation.  This variation,
+ *  however is natural and desireable for two reasons: First, we cannot know
+ *  how many symbols have been generated before in real world computations.
+ *  Second, the following timings are subject to some semi-random variation
+ *  anyways because short timings need to be repeated until enough time has
+ *  gone by for the measurement to be reliable.  During this process the serial
+ *  numbers will be shifted anyways in a semi-random way.  It is better not
+ *  to lull the user in a false sense of reproducibility and instead confront
+ *  her with the normal variation to be expected.
+ */
+void randomify_symbol_serials()
+{
+	srand(time(NULL));
+	const int m = rand() % 666;
+	for (int s=0; s<m; ++s ) {
+		symbol("dummy");
+	}
+}
+
 int main()
 {
+	randomify_symbol_serials();
+
 	unsigned result = 0;
-	
-	try {
-		result += time_dennyfliegner();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_gammaseries();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_vandermonde();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_toeplitz();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_A();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_B();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_C();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_D();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_E();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_F();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_G();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_H();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_IJKL();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_M1();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_O();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_P();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_Pprime();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_Q();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
-	
-	try {
-		result += time_lw_Qprime();
-	} catch (const exception &e) {
-		cout << "Error: caught exception " << e.what() << endl;
-		++result;
-	}
+
+	// For all timings:
+	cout << setprecision(2) << showpoint;
+	
+#define TIME(which) \
+try { \
+	result += time_ ## which (); \
+} catch (const exception &e) { \
+	cout << "Error: caught exception " << e.what() << endl; \
+	++result; \
+}
+
+	TIME(dennyfliegner)
+	TIME(gammaseries)
+	TIME(vandermonde)
+	TIME(toeplitz)
+	TIME(hashmap)
+	TIME(lw_A)
+	TIME(lw_B)
+	TIME(lw_C)
+	TIME(lw_D)
+	TIME(lw_E)
+	TIME(lw_F)
+	TIME(lw_G)
+	TIME(lw_H)
+	TIME(lw_IJKL)
+	TIME(lw_M1)
+	TIME(lw_M2)
+	TIME(lw_N)
+	TIME(lw_O)
+	TIME(lw_P)
+	TIME(lw_Pprime)
+	TIME(lw_Q)
+	TIME(lw_Qprime)
+	TIME(antipode)
+	TIME(fateman_expand)
 	
 	if (result) {
 		cout << "Error: something went wrong. ";