added CVS instructions

[ginac.git] / check / time_antipode.cpp

diff --git a/check/time_antipode.cpp b/check/time_antipode.cpp
index 712b90be7beda16fce368809bbba0a7d3d749bdb..d618fabed94b1da3634ef2df1b4dc48e7c583f2f 100644 (file)
--- a/check/time_antipode.cpp
+++ b/check/time_antipode.cpp
@@ -12,11 +12,11 @@
  *  This program is based on work by
  *      Isabella Bierenbaum <bierenbaum@thep.physik.uni-mainz.de> and
  *      Dirk Kreimer <dkreimer@bu.edu>.
- *  For details, please ask for the diploma theses of Isabella Bierenbaum.
+ *  For details, please see <http://www.arXiv.org/abs/hep-th/0111192>.
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2004 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 (indices<v.indices); }
@@ -100,8 +100,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 +132,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 +145,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 +179,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 +218,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 +274,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 +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)) {
@@ -464,20 +464,22 @@ static unsigned test_tree(const node (*tree_generator)(unsigned=0))
                return 1;
        } else if (result.ldegree(x)!=-vertices || result.degree(x)!=0) {
                clog << "The antipode was miscalculated\nAntipode==" << result
-                    << "\nshould run from x^(" << -vertices << ") to x^(0) but it runs from x^("
-                    << result.ldegree(x) << ") to x^(" << result.degree(x) << ")" << endl;
+                    << "\nshould run from " << x << "^(" << -vertices << ") to "
+                    << x << "^(0)" << "but it runs from " << x << "^("
+                    << result.ldegree(x) << ")" << "to " << x << "^("
+                    << result.degree(x) << ")" << endl;
                return 1;
        }
        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();