X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Frelational.h;h=6c7ebbae12bfe39ab8235d27a3e6145a9ea9ee42;hp=fd3460a4734446e7d5e6ca7b28bcaab41e6637f2;hb=0b985d5336debdd396f0fbeca8df850af5f569f4;hpb=6d225ee55693c0617d254e6fa283c00c71bd2919 diff --git a/ginac/relational.h b/ginac/relational.h index fd3460a4..6c7ebbae 100644 --- a/ginac/relational.h +++ b/ginac/relational.h @@ -3,7 +3,7 @@ * Interface to relations between expressions. */ /* - * GiNaC Copyright (C) 1999-2004 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 @@ -17,14 +17,15 @@ * * 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 */ -#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 { @@ -59,11 +60,15 @@ public: ex subs(const exmap & m, unsigned options = 0) const; ex eval(int level=0) const; + /** Save (a.k.a. serialize) object into archive. */ + void archive(archive_node& n) const; + /** Read (a.k.a. deserialize) object from archive. */ + void read_archive(const archive_node& n, lst& syms); protected: ex eval_ncmul(const exvector & v) const; bool match_same_type(const basic & other) const; unsigned return_type() const; - unsigned return_type_tinfo() const; + return_type_t return_type_tinfo() const; unsigned calchash() const; // new virtual functions which can be overridden by derived classes @@ -100,15 +105,10 @@ protected: ex rh; operators o; }; +GINAC_DECLARE_UNARCHIVER(relational); // utility functions -/** Specialization of is_exactly_a(obj) for relational objects. */ -template<> inline bool is_exactly_a(const basic & obj) -{ - return obj.tinfo()==TINFO_relational; -} - // inlined functions for efficiency inline relational::safe_bool relational::operator!() const { @@ -117,4 +117,4 @@ inline relational::safe_bool relational::operator!() const } // namespace GiNaC -#endif // ndef __GINAC_RELATIONAL_H__ +#endif // ndef GINAC_RELATIONAL_H