X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=check%2Fexam_archive.cpp;h=d72a144c3dbff4b88449fa6a4cd6221d91aa719a;hp=6b787c05c66077e3cb5b326a8b1c6198a49549ae;hb=d41f7533018d9f9444c98466432e4d84deedaa04;hpb=1f5afe37b4c079821de9810435fa9fa11e4ea17b

diff --git a/check/exam_archive.cpp b/check/exam_archive.cpp
index 6b787c05..d72a144c 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-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2010 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;
@@ -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");
 
-	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();
+}