X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_dennyfliegner.cpp;h=15f11bd2a4060d045f68d149a1171e5f351f8c30;hp=cbae278bf82ff28d5d903e411b45d67853cb6af1;hb=9f3e78a13c72ca73ade4d0829186edcdc1c1b2a0;hpb=ae3044935ddf13dd325f6e11770357b99bbe6095

diff --git a/check/time_dennyfliegner.cpp b/check/time_dennyfliegner.cpp
index cbae278b..15f11bd2 100644
--- a/check/time_dennyfliegner.cpp
+++ b/check/time_dennyfliegner.cpp
@@ -7,7 +7,7 @@
  *  after which e should be just a1^2. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
@@ -21,10 +21,17 @@
  *
  *  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;
+
+#include <iostream>
+#include <sstream>
+#include <vector>
+using namespace std;
 
 static unsigned expand_subs(unsigned size)
 {
@@ -33,22 +40,16 @@ static unsigned expand_subs(unsigned size)
 	vector<symbol> a;
 	ex e;
 	for (unsigned i=0; i<size; ++i) {
-#if defined(HAVE_SSTREAM)
 		ostringstream buf;
 		buf << "a" << i << ends;
 		a.push_back(symbol(buf.str()));
-#else
-		char buf[4];
-		ostrstream(buf,sizeof(buf)) << "a" << i << ends;
-		a.push_back(symbol(buf));
-#endif
 		e += a[i];
 	}
 	ex aux;
 	
 	// prepare aux so it will swallow anything but a1^2:
 	aux = -e + a[0] + a[1];
-	e = pow(e,2).expand().subs(a[0]==aux).expand();
+	e = pow(e,2).expand().subs(a[0]==aux, subs_options::no_pattern).expand();
 	
 	if (e != pow(a[1],2)) {
 		clog << "Denny Fliegner's quick consistency check erroneously returned "
@@ -59,22 +60,16 @@ static unsigned expand_subs(unsigned size)
 	return result;
 }
 
-unsigned time_dennyfliegner(void)
+unsigned time_dennyfliegner()
 {
 	unsigned result = 0;
 	
 	cout << "timing commutative expansion and substitution" << flush;
-	clog << "-------commutative expansion and substitution:" << endl;
 	
-	vector<unsigned> sizes;
+	vector<unsigned> sizes = {100, 200, 400, 800};
 	vector<double> times;
 	timer breitling;
 	
-	sizes.push_back(25);
-	sizes.push_back(50);
-	sizes.push_back(100);
-	sizes.push_back(200);
-	
 	for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i) {
 		breitling.start();
 		result += expand_subs(*i);
@@ -82,20 +77,23 @@ unsigned time_dennyfliegner(void)
 		cout << '.' << flush;
 	}
 	
-	if (!result) {
-		cout << " passed ";
-		clog << "(no output)" << endl;
-	} else {
-		cout << " failed ";
-	}
 	// print the report:
 	cout << endl << "	size:  ";
 	for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i)
-		cout << '\t' << (*i);
+		cout << '\t' << *i;
 	cout << endl << "	time/s:";
 	for (vector<double>::iterator i=times.begin(); i!=times.end(); ++i)
-		cout << '\t' << int(1000*(*i))*0.001;
+		cout << '\t' << *i;
 	cout << endl;
 	
 	return result;
 }
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+	randomify_symbol_serials();
+	cout << setprecision(2) << showpoint;
+	return time_dennyfliegner();
+}