Rename array of precomputed data in test suite.

[ginac.git] / check / time_antipode.cpp

diff --git a/check/time_antipode.cpp b/check/time_antipode.cpp
index 787dea2552faebdade02c50584f80cb0712feaf9..9c64fbc219ce40c11a9b0cf92c7d1ce250266c43 100644 (file)
--- a/check/time_antipode.cpp
+++ b/check/time_antipode.cpp
@@ -16,7 +16,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2007 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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
@@ -33,19 +33,20 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <utility>
-#include <vector>
-#include <set>
+#include "ginac.h"
+#include "timer.h"
+using namespace GiNaC;
+
 #include <map>
-#include <typeinfo>
+#include <set>
 #include <stdexcept>
-#include "timer.h"
-#include "ginac.h"
+#include <typeinfo>
+#include <utility>
+#include <vector>
 using namespace std;
-using namespace GiNaC;
 
 // whether to run this beast or not:
-static const bool do_test = true;
+constexpr bool do_test = true;
 
 // regularization parameter:
 static const symbol x("x");
@@ -71,6 +72,7 @@ static ex div_part(const ex &exarg, const symbol &x, unsigned grad)
 /* F_ab(a, i, b, j, "x") is a common pattern in all vertex evaluators. */
 static ex F_ab(int a, int i, int b, int j, const symbol &x)
 {
+       using GiNaC::tgamma;
        if ((i==0 && a<=0) || (j==0 && b<=0))
                return 0;
        else
@@ -103,9 +105,9 @@ protected:
 class Sigma : public vertex {
 public:
        Sigma(ijpair ij = ijpair(0,0)) : vertex(ij) { }
-       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;
+       vertex* copy() const override { return new Sigma(*this); }
+       ijpair get_increment() const override { return ijpair(indices.first+indices.second+1, 0); }
+       const ex evaluate(const symbol &x, const unsigned grad) const override;
 private:
 };
 
@@ -135,9 +137,9 @@ 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() 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); }
+       vertex* copy() const override { return new Sigma_flipped(*this); }
+       ijpair get_increment() const override { return ijpair(0, indices.first+indices.second+1); }
+       const ex evaluate(const symbol &x, const unsigned grad) const override { return Sigma::evaluate(x, grad); }
 private:
 };
 
@@ -148,9 +150,9 @@ private:
 class Gamma : public vertex {
 public:
        Gamma(ijpair ij = ijpair(0,0)) : vertex(ij) { }
-       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;
+       vertex* copy() const override { return new Gamma(*this); }
+       ijpair get_increment() const override { return ijpair(indices.first+indices.second+1, 0); }
+       const ex evaluate(const symbol &x, const unsigned grad) const override;
 private:
 };
 
@@ -182,9 +184,9 @@ 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() 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;
+       vertex* copy() const override { return new Vacuum(*this); }
+       ijpair get_increment() const override { return ijpair(0, indices.first+indices.second+1); }
+       const ex evaluate(const symbol &x, const unsigned grad) const override;
 private:
 };
 
@@ -448,7 +450,7 @@ static const node tree6(unsigned cuts=0)
 static unsigned test_tree(const node tree_generator(unsigned))
 {
        const int edges = tree_generator(0).total_edges();
-       const int vertices = edges+1;
+       const int vertices = edges+1;
        
        // fill a vector of all possible 2^edges combinations of cuts...
        vector<node> counter;