X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Ftime_antipode.cpp;h=67f410c7fa47e29f647815cfdcbc3c87b296d8ac;hb=2d882d41141ad1df1ac654f8baafb97f3f001d83;hp=e88bd735cf4a54223bb528bc626a3856a6fc81c1;hpb=68fdf425abf14d016d5f95ee7b9d06a19a3c5926;p=ginac.git

diff --git a/check/time_antipode.cpp b/check/time_antipode.cpp
index e88bd735..67f410c7 100644
--- a/check/time_antipode.cpp
+++ b/check/time_antipode.cpp
@@ -16,7 +16,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 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
@@ -30,7 +30,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"
@@ -442,9 +442,9 @@ static const node tree6(unsigned cuts=0)
 	                bool(cuts & 16)));
 }
 
-static unsigned test_tree(const node (*tree_generator)(unsigned=0))
+static unsigned test_tree(const node tree_generator(unsigned))
 {
-	const int edges = tree_generator().total_edges();
+	const int edges = tree_generator(0).total_edges();
    	const int vertices = edges+1;
 	
 	// fill a vector of all possible 2^edges combinations of cuts...
@@ -455,7 +455,7 @@ static unsigned test_tree(const node (*tree_generator)(unsigned=0))
 	// ...the sum, when evaluated and reexpanded, is the antipode...
 	ex result = 0;
 	for (vector<node>::iterator i=counter.begin(); i!=counter.end(); ++i)
-		result = (result+i->evaluate(x,vertices)).series(x==0,vertices).expand();
+		result = (result+i->evaluate(x,vertices-1)).series(x==0,vertices-1).expand();
 	
 	// ...and has the nice property that in each term all the Eulers cancel:
 	if (result.has(Euler)) {
@@ -496,7 +496,7 @@ unsigned time_antipode()
 		} else {
 			cout << " failed ";
 		}
-		cout << int(1000*jaeger_le_coultre.read())*0.001 << "s (total)" << endl;
+		cout << jaeger_le_coultre.read() << "s (total)" << endl;
 	} else {
 		cout << " disabled" << endl;
 		clog << "(no output)" << endl;