*/
/*
- * GiNaC Copyright (C) 1999-2002 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
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); }
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:
};
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:
};
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:
};
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:
~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:
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) {
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...
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;
+ clog << "-------computation of antipodes in Yukawa theory:" << endl;
if (do_test) {
jaeger_le_coultre.start();