*/
/*
- * 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
*
* 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"
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...
// ...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)) {