X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Ftime_dennyfliegner.cpp;h=5920b4336ffd4639b3ddc9c96d5c990706a4b99c;hb=e448ebb4a6e9422b168ac4288cb65cb3a633698d;hp=e20fdded252f9c1d917f7c8bec1ca219fbbf5578;hpb=af922d5eb36ed70e4a9e3ffaf4c24492cf89a1a6;p=ginac.git

diff --git a/check/time_dennyfliegner.cpp b/check/time_dennyfliegner.cpp
index e20fdded..5920b433 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-2003 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
@@ -31,30 +31,29 @@ static unsigned expand_subs(unsigned size)
 	unsigned result = 0;
 	// create a vector of size symbols named "a0", "a1", ...
 	vector<symbol> a;
+	ex e;
 	for (unsigned i=0; i<size; ++i) {
-		char buf[4];
-		ostrstream(buf,sizeof(buf)) << i << ends;
-		a.push_back(symbol(string("a")+buf));
+		ostringstream buf;
+		buf << "a" << i << ends;
+		a.push_back(symbol(buf.str()));
+		e += a[i];
 	}
-	ex e, aux;
-	
-	for (unsigned i=0; i<size; ++i)
-		e = 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 "
-			 << e << "." << endl;
+		     << e << "." << endl;
 		++result;
 	}
 	
 	return result;
 }
 
-unsigned time_dennyfliegner(void)
+unsigned time_dennyfliegner()
 {
 	unsigned result = 0;
 	
@@ -65,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(500);
 	
 	for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i) {
 		breitling.start();