Finalize 1.7.6 release.

[ginac.git] / check / exam_archive.cpp

diff --git a/check/exam_archive.cpp b/check/exam_archive.cpp
index e2e62615f662a3227a65eb850b86e8e3ffbcf236..198df414c032a258d6e0b6ad3cd674ca8b5499f3 100644 (file)
--- a/check/exam_archive.cpp
+++ b/check/exam_archive.cpp
@@ -3,7 +3,7 @@
  *  Here we test GiNaC's archiving system. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
@@ -20,16 +20,18 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "exams.h"
+#include "ginac.h"
+using namespace GiNaC;
 
 #include <fstream>
+#include <iostream>
+using namespace std;
 
 unsigned exam_archive()
 {
        unsigned result = 0;
        
        cout << "examining archiving system" << flush;
-       clog << "----------archiving system:" << endl;
 
        symbol x("x"), y("y"), mu("mu"), dim("dim", "\\Delta");
        ex e, f;
@@ -39,9 +41,9 @@ unsigned exam_archive()
        e = -42 * x * pow(y, sin(y*Catalan)) * dirac_ONE()
            * epsilon_tensor(idx(fail(), 3), idx(0, 3), idx(y/2, 3))
          + lorentz_g(
-             varidx(lst(x, -11*y, acos(2*x).series(x==3-5*I, 3)) * color_ONE()
+             varidx(lst{x, -11*y, acos(2*x).series(x==3-5*I, 3)} * color_ONE()
                * metric_tensor(varidx(log(cos(128.0/(x*y))), 5), varidx(2, 5)), zeta(3)),
-             varidx(diag_matrix(lst(-1, Euler, atan(x/y==-15*I/17)))
+             varidx(diag_matrix({-1, Euler, atan(x/y==-15*I/17)})
                * delta_tensor(idx(x, 2), idx(wild(7), 3)), zeta(3), true),
              true
            )
@@ -62,22 +64,19 @@ unsigned exam_archive()
                std::ifstream fin("exam.gar", std::ios_base::binary);
                fin >> ar;
        }
-       f = ar.unarchive_ex(lst(x, y, mu, dim), "expr 1");
+       f = ar.unarchive_ex(lst{x, y, mu, dim}, "expr 1");
 
-       if (!f.is_equal(e)) {
+       ex difference = (f - e).expand();
+       if (!difference.is_zero()) {
                clog << "archiving/unarchiving " << e << endl
                     << "erroneously returned " << f << endl;
                ++result;
        }
 
-       cout << '.' << flush;
-       
-       if (!result) {
-               cout << " passed " << endl;
-               clog << "(no output)" << endl;
-       } else {
-               cout << " failed " << endl;
-       }
-       
        return result;
 }
+
+int main(int argc, char** argv)
+{
+       return exam_archive();
+}