X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Ftime_antipode.cpp;h=171385ea3b4709c4c39dd7f497ca3e1666f34ebf;hp=8896da27152449402f1295e9736fcbd9d079d890;hb=4f596b14ac1cdb03163c74e210cab493358ababf;hpb=e7cc6a764ff67b5885d6633385fac23ccc1dc9a7

diff --git a/check/time_antipode.cpp b/check/time_antipode.cpp
index 8896da27..171385ea 100644
--- a/check/time_antipode.cpp
+++ b/check/time_antipode.cpp
@@ -16,7 +16,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2002 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
@@ -30,16 +30,19 @@
  *
  *  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"
 #include <utility>
 #include <vector>
 #include <set>
 #include <map>
 #include <typeinfo>
 #include <stdexcept>
+#include "timer.h"
+#include "ginac.h"
+using namespace std;
+using namespace GiNaC;
 
 // whether to run this beast or not:
 static const bool do_test = true;
@@ -84,8 +87,8 @@ public:
 	vertex(ijpair ij = ijpair(0,0)) : indices(ij) { }
 	void increment_indices(const ijpair &ind) { indices.first += ind.first; indices.second += ind.second; }
 	virtual ~vertex() { }
-	virtual vertex* copy(void) const = 0;
-	virtual ijpair get_increment(void) const { return indices; }
+	virtual vertex* copy() const = 0;
+	virtual ijpair get_increment() const { return indices; }
 	virtual const ex evaluate(const symbol &x, const unsigned grad) const = 0;
 	bool operator==(const vertex &v) const { return (indices==v.indices); }
 	bool operator<(const vertex &v) const { return (indices<v.indices); }
@@ -100,8 +103,8 @@ protected:
 class Sigma : public vertex {
 public:
 	Sigma(ijpair ij = ijpair(0,0)) : vertex(ij) { }
-	vertex* copy(void) const { return new Sigma(*this); }
-	ijpair get_increment(void) const { return ijpair(indices.first+indices.second+1, 0); }
+	vertex* copy() const { return new Sigma(*this); }
+	ijpair get_increment() const { return ijpair(indices.first+indices.second+1, 0); }
 	const ex evaluate(const symbol &x, const unsigned grad) const;
 private:
 };
@@ -132,8 +135,8 @@ const ex Sigma::evaluate(const symbol &x, const unsigned grad) const
 class Sigma_flipped : public Sigma {
 public:
 	Sigma_flipped(ijpair ij = ijpair(0,0)) : Sigma(ij) { }
-	vertex* copy(void) const { return new Sigma_flipped(*this); }
-	ijpair get_increment(void) const { return ijpair(0, indices.first+indices.second+1); }
+	vertex* copy() const { return new Sigma_flipped(*this); }
+	ijpair get_increment() const { return ijpair(0, indices.first+indices.second+1); }
 	const ex evaluate(const symbol &x, const unsigned grad) const { return Sigma::evaluate(x, grad); }
 private:
 };
@@ -145,8 +148,8 @@ private:
 class Gamma : public vertex {
 public:
 	Gamma(ijpair ij = ijpair(0,0)) : vertex(ij) { }
-	vertex* copy(void) const { return new Gamma(*this); }
-  	ijpair get_increment(void) const { return ijpair(indices.first+indices.second+1, 0); }
+	vertex* copy() const { return new Gamma(*this); }
+  	ijpair get_increment() const { return ijpair(indices.first+indices.second+1, 0); }
 	const ex evaluate(const symbol &x, const unsigned grad) const;
 private:
 };
@@ -179,7 +182,7 @@ const ex Gamma::evaluate(const symbol &x, const unsigned grad) const
 class Vacuum : public vertex {
 public:
 	Vacuum(ijpair ij = ijpair(0,0)) : vertex(ij) { }
-	vertex* copy(void) const { return new Vacuum(*this); }
+	vertex* copy() const { return new Vacuum(*this); }
 	ijpair get_increment() const { return ijpair(0, indices.first+indices.second+1); }
 	const ex evaluate(const symbol &x, const unsigned grad) const;
 private:
@@ -218,7 +221,7 @@ public:
 	~node() { delete vert; }
 	void add_child(const node &, bool = false);
 	const ex evaluate(const symbol &x, unsigned grad) const;
-	unsigned total_edges(void) const;
+	unsigned total_edges() const;
 	bool operator==(const node &) const;
 	bool operator<(const node &) const;
 private:
@@ -274,7 +277,7 @@ const ex node::evaluate(const symbol &x, unsigned grad) const
 	return (product * vert->evaluate(x,grad));
 }
 
-unsigned node::total_edges(void) const
+unsigned node::total_edges() const
 {
 	unsigned accu = 0;
 	for (multiset<child>::const_iterator i=children.begin(); i!=children.end(); ++i) {
@@ -442,9 +445,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 +458,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)) {
@@ -473,13 +476,12 @@ static unsigned test_tree(const node (*tree_generator)(unsigned=0))
 	return 0;
 }
 
-unsigned time_antipode(void)
+unsigned time_antipode()
 {
 	unsigned result = 0;
 	timer jaeger_le_coultre;
 	
 	cout << "timing computation of antipodes in Yukawa theory" << flush;
-	clog << "-------computation of antipodes in Yukawa theory" << endl;
 	
 	if (do_test) {
 		jaeger_le_coultre.start();
@@ -490,17 +492,18 @@ unsigned time_antipode(void)
 		result += test_tree(tree5);  cout << '.' << flush;
 		result += test_tree(tree6);  cout << '.' << flush;
 		
-		if (!result) {
-			cout << " passed ";
-			clog << "(no output)" << endl;
-		} 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;
 	}
-	
 	return result;
 }
+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+	randomify_symbol_serials();
+	cout << setprecision(2) << showpoint;
+	return time_antipode();
+}