X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Frelational.cpp;h=479522cf0ce8d301aea4f8eaca13ecab6fab1334;hp=247b75f09105add531a7824a72046243cd8daf0f;hb=ae6c004bd31e02dda37357d74b641c101b116c73;hpb=22abfbe8c78e339188096a5bf749a7c2d4f0a368

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index 247b75f0..479522cf 100644
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -3,7 +3,7 @@
  *  Implementation of relations between expressions */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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,14 +20,15 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <iostream>
-#include <stdexcept>
-
 #include "relational.h"
 #include "operators.h"
 #include "numeric.h"
 #include "archive.h"
 #include "utils.h"
+#include "hash_seed.h"
+
+#include <iostream>
+#include <stdexcept>
 
 namespace GiNaC {
 
@@ -40,7 +41,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(relational, basic,
 // default constructor
 //////////
 
-relational::relational() : basic(TINFO_relational) {}
+relational::relational() { }
 
 //////////
 // other constructors
@@ -48,14 +49,16 @@ relational::relational() : basic(TINFO_relational) {}
 
 // public
 
-relational::relational(const ex & lhs, const ex & rhs, operators oper) : basic(TINFO_relational), lh(lhs), rh(rhs), o(oper) {}
+relational::relational(const ex & lhs, const ex & rhs, operators oper) :
+	lh(lhs), rh(rhs), o(oper) { }
 
 //////////
 // archiving
 //////////
 
-relational::relational(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
+void relational::read_archive(const archive_node& n, lst& sym_lst)
 {
+	inherited::read_archive(n, sym_lst);
 	unsigned int opi;
 	if (!(n.find_unsigned("op", opi)))
 		throw (std::runtime_error("unknown relational operator in archive"));
@@ -63,6 +66,7 @@ relational::relational(const archive_node &n, lst &sym_lst) : inherited(n, sym_l
 	n.find_ex("lh", lh, sym_lst);
 	n.find_ex("rh", rh, sym_lst);
 }
+GINAC_BIND_UNARCHIVER(relational);
 
 void relational::archive(archive_node &n) const
 {
@@ -72,8 +76,6 @@ void relational::archive(archive_node &n) const
 	n.add_unsigned("op", o);
 }
 
-DEFAULT_UNARCHIVE(relational)
-
 //////////
 // functions overriding virtual functions from base classes
 //////////
@@ -169,7 +171,7 @@ ex relational::map(map_function & f) const
 
 	if (!are_ex_trivially_equal(lh, mapped_lh)
 	 || !are_ex_trivially_equal(rh, mapped_rh))
-		return (new relational(mapped_lh, mapped_rh, o))->setflag(status_flags::dynallocated);
+		return dynallocate<relational>(mapped_lh, mapped_rh, o);
 	else
 		return *this;
 }
@@ -182,7 +184,7 @@ ex relational::eval(int level) const
 	if (level == -max_recursion_level)
 		throw(std::runtime_error("max recursion level reached"));
 	
-	return (new relational(lh.eval(level-1),rh.eval(level-1),o))->setflag(status_flags::dynallocated | status_flags::evaluated);
+	return dynallocate<relational>(lh.eval(level-1), rh.eval(level-1), o).setflag(status_flags::evaluated);
 }
 
 ex relational::subs(const exmap & m, unsigned options) const
@@ -249,8 +251,8 @@ unsigned relational::return_type() const
 	GINAC_ASSERT(lh.return_type()==rh.return_type());
 	return lh.return_type();
 }
-   
-unsigned relational::return_type_tinfo() const
+
+return_type_t relational::return_type_tinfo() const
 {
 	GINAC_ASSERT(lh.return_type_tinfo()==rh.return_type_tinfo());
 	return lh.return_type_tinfo();
@@ -258,7 +260,7 @@ unsigned relational::return_type_tinfo() const
 
 unsigned relational::calchash() const
 {
-	unsigned v = golden_ratio_hash(tinfo());
+	unsigned v = make_hash_seed(typeid(*this));
 	unsigned lhash = lh.gethash();
 	unsigned rhash = rh.gethash();
 
@@ -279,7 +281,7 @@ unsigned relational::calchash() const
 			break;
 		case greater:
 		case greater_or_equal:
-	   		v ^= lhash;
+			v ^= lhash;
 			lhash = rhash;
 			break;
 	}
@@ -320,7 +322,7 @@ relational::safe_bool relational::make_safe_bool(bool cond) const
 	return cond? &safe_bool_helper::nonnull : 0;
 }
 
-/** Cast the relational into a boolean, mainly for evaluation within an
+/** Cast the relational into a Boolean, mainly for evaluation within an
  *  if-statement.  Note that (a<b) == false does not imply (a>=b) == true in
  *  the general symbolic case.  A false result means the comparison is either
  *  false or undecidable (except of course for !=, where true means either