Prettified source code.

[ginac.git] / check / time_antipode.cpp

diff --git a/check/time_antipode.cpp b/check/time_antipode.cpp
index e88bd735cf4a54223bb528bc626a3856a6fc81c1..074ca3722accc61e3623ca40d3a07859adf03975 100644 (file)
--- 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-2009 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
  *
  *  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


@@ -30,16 +30,20 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *
  *  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"
-#include <utility>
-#include <vector>
-#include <set>
+#include "ginac.h"
+#include "timer.h"
+using namespace GiNaC;
+

 #include <map>
 #include <map>

-#include <typeinfo>
+#include <set>

 #include <stdexcept>
 #include <stdexcept>

+#include <typeinfo>
+#include <utility>
+#include <vector>
+using namespace std;

 
 // whether to run this beast or not:
 static const bool do_test = true;
 
 // whether to run this beast or not:
 static const bool do_test = true;


@@ -442,9 +446,9 @@ static const node tree6(unsigned cuts=0)
                        bool(cuts & 16)));
 }
 
                        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...
        const int vertices = edges+1;
        
        // fill a vector of all possible 2^edges combinations of cuts...


@@ -455,7 +459,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)
        // ...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)) {
        
        // ...and has the nice property that in each term all the Eulers cancel:
        if (result.has(Euler)) {


@@ -479,7 +483,6 @@ unsigned time_antipode()
        timer jaeger_le_coultre;
        
        cout << "timing computation of antipodes in Yukawa theory" << flush;
        timer jaeger_le_coultre;
        
        cout << "timing computation of antipodes in Yukawa theory" << flush;

-       clog << "-------computation of antipodes in Yukawa theory:" << endl;

        
        if (do_test) {
                jaeger_le_coultre.start();
        
        if (do_test) {
                jaeger_le_coultre.start();


@@ -490,17 +493,18 @@ unsigned time_antipode()
                result += test_tree(tree5);  cout << '.' << flush;
                result += test_tree(tree6);  cout << '.' << flush;
                
                result += test_tree(tree5);  cout << '.' << flush;
                result += test_tree(tree6);  cout << '.' << flush;
                

-               if (!result) {
-                       cout << " passed ";
-                       clog << "(no output)" << endl;
-               } else {
-                       cout << " failed ";
-               }
-               cout << int(1000*jaeger_le_coultre.read())*0.001 << "s (total)" << endl;
+               cout << jaeger_le_coultre.read() << "s (total)" << endl;

        } else {
                cout << " disabled" << endl;
        } else {
                cout << " disabled" << endl;

-               clog << "(no output)" << endl;

        }
        }

-       

        return result;
 }
        return result;
 }

+
+extern void randomify_symbol_serials();
+
+int main(int argc, char** argv)
+{
+       randomify_symbol_serials();
+       cout << setprecision(2) << showpoint;
+       return time_antipode();
+}