X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Frelational.h;h=325ce45cc0b7ce5e58eb383b39ed98ba076bbdfa;hb=052d2da5b41ac82855d3578050125aa21caf1003;hp=fd1c955204eccf3beb0f661ed5f32b36c4c9ad9b;hpb=29b420743599f001b8bfc8b63fb6ac81aa3dfba7;p=ginac.git

diff --git a/ginac/relational.h b/ginac/relational.h
index fd1c9552..325ce45c 100644
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -3,7 +3,7 @@
  *  Interface to relations between expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2022 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,11 +20,12 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_RELATIONAL_H__
-#define __GINAC_RELATIONAL_H__
+#ifndef GINAC_RELATIONAL_H
+#define GINAC_RELATIONAL_H
 
 #include "basic.h"
 #include "ex.h"
+#include "archive.h"
 
 namespace GiNaC {
 
@@ -51,20 +52,25 @@ public:
 	
 	// functions overriding virtual functions from base classes
 public:
-	unsigned precedence() const {return 20;}
-	bool info(unsigned inf) const;
-	size_t nops() const;
-	ex op(size_t i) const;
-	ex map(map_function & f) const;
-	ex subs(const exmap & m, unsigned options = 0) const;
-	ex eval(int level=0) const;
+	unsigned precedence() const override {return 20;}
+	bool info(unsigned inf) const override;
+	size_t nops() const override;
+	ex op(size_t i) const override;
+	ex map(map_function & f) const override;
+	ex subs(const exmap & m, unsigned options = 0) const override;
+
+	/** Save (a.k.a. serialize) object into archive. */
+	void archive(archive_node& n) const override;
+	/** Read (a.k.a. deserialize) object from archive. */
+	void read_archive(const archive_node& n, lst& syms) override;
+	ex canonical() const;
 
 protected:
-	ex eval_ncmul(const exvector & v) const;
-	bool match_same_type(const basic & other) const;
-	unsigned return_type() const;
-	tinfo_t return_type_tinfo() const;
-	unsigned calchash() const;
+	ex eval_ncmul(const exvector & v) const override;
+	bool match_same_type(const basic & other) const override;
+	unsigned return_type() const override;
+	return_type_t return_type_tinfo() const override;
+	unsigned calchash() const override;
 
 	// new virtual functions which can be overridden by derived classes
 protected:
@@ -72,12 +78,12 @@ protected:
 	void do_print_python_repr(const print_python_repr & c, unsigned level) const;
 
 public:
-	virtual ex lhs() const;
-	virtual ex rhs() const;
+	ex lhs() const { return lh; }
+	ex rhs() const { return rh; }
 
 	// non-virtual functions in this class
 private:
-	// For conversions to boolean, as would be used in an if conditional,
+	// For conversions to Boolean, as would be used in an if conditional,
 	// implicit conversions from bool to int have a large number of
 	// undesirable side effects.  The following safe_bool type enables
 	// use of relational objects in conditionals without those side effects
@@ -100,6 +106,7 @@ protected:
 	ex rh;
 	operators o;
 };
+GINAC_DECLARE_UNARCHIVER(relational); 
 
 // utility functions
 
@@ -111,4 +118,4 @@ inline relational::safe_bool relational::operator!() const
 
 } // namespace GiNaC
 
-#endif // ndef __GINAC_RELATIONAL_H__
+#endif // ndef GINAC_RELATIONAL_H