print_tree: only print the "nops=" line when nops() > 0

[ginac.git] / check / time_dennyfliegner.cpp

diff --git a/check/time_dennyfliegner.cpp b/check/time_dennyfliegner.cpp
index 4f6b7dc35e522918494266a79eb73b183fae9c83..5920b4336ffd4639b3ddc9c96d5c990706a4b99c 100644 (file)
--- a/check/time_dennyfliegner.cpp
+++ b/check/time_dennyfliegner.cpp
@@ -7,7 +7,7 @@
  *  after which e should be just a1^2. */
 
 /*
  *  after which e should be just a1^2. */
 
 /*

- *  GiNaC Copyright (C) 1999-2001 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
  *
  *  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


@@ -33,22 +33,16 @@ static unsigned expand_subs(unsigned size)
        vector<symbol> a;
        ex e;
        for (unsigned i=0; i<size; ++i) {
        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()));
                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 += 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 "
        
        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;
 }
 
        return result;
 }
 

-unsigned time_dennyfliegner(void)
+unsigned time_dennyfliegner()

 {
        unsigned result = 0;
        
 {
        unsigned result = 0;
        


@@ -70,10 +64,10 @@ unsigned time_dennyfliegner(void)
        vector<double> times;
        timer breitling;
        
        vector<double> times;
        timer breitling;
        

-       sizes.push_back(25);

        sizes.push_back(50);
        sizes.push_back(100);
        sizes.push_back(200);
        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();
        
        for (vector<unsigned>::iterator i=sizes.begin(); i!=sizes.end(); ++i) {
                breitling.start();