X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_dennyfliegner.cpp;h=3f6d6def19219000215f946698b1cd7fd69819f5;hp=4f6b7dc35e522918494266a79eb73b183fae9c83;hb=0ad11afda76f83eb74b5868af6efd550bdfe52a1;hpb=c69d2c6f95cd62f1bbf2ff665551b1d1b693466c

diff --git a/check/time_dennyfliegner.cpp b/check/time_dennyfliegner.cpp
index 4f6b7dc3..3f6d6def 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-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
@@ -21,7 +21,7 @@
  *
  *  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"
@@ -33,22 +33,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[5];  // 'a' + 3 decimal digits + '\n'
-		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,7 +53,7 @@ static unsigned expand_subs(unsigned size)
 	return result;
 }
 
-unsigned time_dennyfliegner(void)
+unsigned time_dennyfliegner()
 {
 	unsigned result = 0;
 	
@@ -70,10 +64,10 @@ unsigned time_dennyfliegner(void)
 	vector<double> times;
 	timer breitling;
 	
-	sizes.push_back(25);
-	sizes.push_back(50);
 	sizes.push_back(100);
 	sizes.push_back(200);
+	sizes.push_back(400);
+	sizes.push_back(800);
 	
 	for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i) {
 		breitling.start();
@@ -91,10 +85,10 @@ unsigned time_dennyfliegner(void)
 	// 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;