X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_archive.cpp;h=de9cadd56c00ce91f7d70e4803486c4b752c1617;hp=7385727c8b0b997aebde17b65bf3e385006c460c;hb=a74dc4ea339457bef06d47a1ebca21d614bda279;hpb=4dc267ddbec7fcc1ba15bf0d60d72a346c9efb26

diff --git a/check/exam_archive.cpp b/check/exam_archive.cpp
index 7385727c..de9cadd5 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-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2018 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,42 +41,42 @@ 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()
-	        * metric_tensor(spinidx(0, 5, false, true), varidx(2, 4)), zeta(3)),
-	      varidx(diag_matrix(lst(-1, Euler, atan(x/y==-15*I/17)))
-	        * delta_tensor(idx(x, 2), idx(y, 3)), log(cos(128.0/(x*y))), true),
+	      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({-1, Euler, atan(x/y==-15*I/17)})
+	        * delta_tensor(idx(x, 2), idx(wild(7), 3)), zeta(3), true),
 	      true
 	    )
 	  + dirac_gamma(varidx(mu, dim)) * dirac_gamma(varidx(mu, 4-dim, true))
 	    * color_T(idx(x, 8), 1) * color_h(idx(x, 8), idx(y, 8), idx(2, 8))
-	    * indexed(x, indexed::antisymmetric, idx(2*y+1, x), varidx(-mu, 5))
-	  + 0.775;
+	    * indexed(x, sy_anti(), idx(2*y+1, x), varidx(-mu, 5))
+	  - 2.4275 * spinor_metric(spinidx(0, 2, false, true), spinidx(y))
+	  + abs(x).series(x == y, 4);
 
 	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;
 	}
-	
-	if (!result) {
-		cout << " passed " << endl;
-		clog << "(no output)" << endl;
-	} else {
-		cout << " failed " << endl;
-	}
-	
+
 	return result;
 }
+
+int main(int argc, char** argv)
+{
+	return exam_archive();
+}