X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_archive.cpp;h=198df414c032a258d6e0b6ad3cd674ca8b5499f3;hp=f51bb46ea5f3178471c85869a602135badbec2ec;hb=f7884835d397de85e648d1957c058b7d4c0948ba;hpb=86403ac639de455166ea58d5c561db7de477fcd8

diff --git a/check/exam_archive.cpp b/check/exam_archive.cpp
index f51bb46e..198df414 100644
--- 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-2002 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
@@ -17,19 +17,21 @@
  *
  *  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 "exams.h"
+#include "ginac.h"
+using namespace GiNaC;
 
 #include <fstream>
+#include <iostream>
+using namespace std;
 
-unsigned exam_archive(void)
+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(void)
 	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
 	    )
@@ -54,30 +56,27 @@ unsigned exam_archive(void)
 	archive ar;
 	ar.archive_ex(e, "expr 1");
 	{
-		std::ofstream fout("exam.gar");
+		std::ofstream fout("exam.gar", std::ios_base::binary);
 		fout << ar;
 	}
 	ar.clear();
 	{
-		std::ifstream fin("exam.gar");
+		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();
+}