X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=check%2Ftime_antipode.cpp;h=f9783c3cd3bc2fb0799c73e505184991741c5c3a;hb=695f6ae955ec530cded8f21efd5569df39447f76;hp=09870db838d8d2bb2c3a61d7f035bf0e85b64ef8;hpb=1f5afe37b4c079821de9810435fa9fa11e4ea17b;p=ginac.git diff --git a/check/time_antipode.cpp b/check/time_antipode.cpp index 09870db8..f9783c3c 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-2005 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 @@ -84,8 +84,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 (indicesevaluate(x,grad)); } -unsigned node::total_edges(void) const +unsigned node::total_edges() const { unsigned accu = 0; for (multiset::const_iterator i=children.begin(); i!=children.end(); ++i) { @@ -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::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,7 +473,7 @@ 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;