X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_dennyfliegner.cpp;h=07a8938ca2389a54bc3317f59ce58595b5bad9ec;hp=db9ff80ce6e9527e81827bc027df21904fa9b115;hb=a12c1d88131c5a301d35767f0c4c947064703418;hpb=db5765dc91202851739e196ba11bfccb0b3fe7bc

diff --git a/check/time_dennyfliegner.cpp b/check/time_dennyfliegner.cpp
index db9ff80c..07a8938c 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-2008 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,78 +21,83 @@
  *
  *  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"
-
-#define VECSIZE 200
+#include <iostream>
+#include <sstream>
+#include <vector>
+#include "ginac.h"
+#include "timer.h"
+using namespace std;
+using namespace GiNaC;
 
 static unsigned expand_subs(unsigned size)
 {
-    unsigned result = 0;
-    // create a vector of size symbols named "a0", "a1", ...
-    vector<symbol> a;
-    for (unsigned i=0; i<size; ++i) {
-        char buf[4];
-        ostrstream(buf,sizeof(buf)) << i << ends;
-        a.push_back(symbol(string("a")+buf));
-    }
-    ex e, aux;
-    
-    for (unsigned i=0; i<size; ++i)
-        e = e + a[i];
-    
-    // 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();
-    
-    if (e != pow(a[1],2)) {
-        clog << "Denny Fliegner's quick consistency check erroneously returned "
-             << e << "." << endl;
-        ++result;
-    }
-    
-    return result;
+	unsigned result = 0;
+	// create a vector of size symbols named "a0", "a1", ...
+	vector<symbol> a;
+	ex e;
+	for (unsigned i=0; i<size; ++i) {
+		ostringstream buf;
+		buf << "a" << i << ends;
+		a.push_back(symbol(buf.str()));
+		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, subs_options::no_pattern).expand();
+	
+	if (e != pow(a[1],2)) {
+		clog << "Denny Fliegner's quick consistency check erroneously returned "
+		     << e << "." << endl;
+		++result;
+	}
+	
+	return result;
 }
 
-unsigned time_dennyfliegner(void)
+unsigned time_dennyfliegner()
+{
+	unsigned result = 0;
+	
+	cout << "timing commutative expansion and substitution" << flush;
+	
+	vector<unsigned> sizes;
+	vector<double> times;
+	timer breitling;
+	
+	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();
+		result += expand_subs(*i);
+		times.push_back(breitling.read());
+		cout << '.' << flush;
+	}
+	
+	// print the report:
+	cout << endl << "	size:  ";
+	for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i)
+		cout << '\t' << *i;
+	cout << endl << "	time/s:";
+	for (vector<double>::iterator i=times.begin(); i!=times.end(); ++i)
+		cout << '\t' << *i;
+	cout << endl;
+	
+	return result;
+}
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
 {
-    unsigned result = 0;
-    
-    cout << "timing commutative expansion and substitution" << flush;
-    clog << "-------commutative expansion and substitution:" << endl;
-    
-    vector<unsigned> sizes;
-    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);
-        times.push_back(breitling.read());
-        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 << endl << "    time/s:";
-    for (vector<double>::iterator i=times.begin(); i!=times.end(); ++i)
-        cout << '\t' << int(1000*(*i))*0.001;
-    cout << endl;
-    
-    return result;
+	randomify_symbol_serials();
+	cout << setprecision(2) << showpoint;
+	return time_dennyfliegner();
 }