- Derivatives are now assembled in a slightly different manner (i.e. they

[ginac.git] / ginac / relational.cpp

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index 5784c359561c5531ad1243c0580c6d88c2a8537f..b2726acd342ff73b3c4cd6f75b5d27434988c46e 100644 (file)
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -24,12 +24,15 @@
 
 #include "relational.h"
 #include "numeric.h"
-#include "debugmsg.h"
+#include "archive.h"
 #include "utils.h"
+#include "debugmsg.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
+
+GINAC_IMPLEMENT_REGISTERED_CLASS(relational, basic)
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -48,13 +51,13 @@ relational::~relational()
     destroy(0);
 }
 
-relational::relational(relational const & other)
+relational::relational(const relational & other)
 {
     debugmsg("relational copy constructor",LOGLEVEL_CONSTRUCT);
     copy(other);
 }
 
-relational const & relational::operator=(relational const & other)
+const relational & relational::operator=(const relational & other)
 {
     debugmsg("relational operator=",LOGLEVEL_ASSIGNMENT);
     if (this != &other) {
@@ -66,7 +69,7 @@ relational const & relational::operator=(relational const & other)
 
 // protected
 
-void relational::copy(relational const & other)
+void relational::copy(const relational & other)
 {
     basic::copy(other);
     lh=other.lh;
@@ -85,7 +88,7 @@ void relational::destroy(bool call_parent)
 
 // public
 
-relational::relational(ex const & lhs, ex const & rhs, operators oper) : basic(TINFO_relational)
+relational::relational(const ex & lhs, const ex & rhs, operators oper) : basic(TINFO_relational)
 {
     debugmsg("relational constructor ex,ex,operator",LOGLEVEL_CONSTRUCT);
     lh=lhs;
@@ -93,6 +96,37 @@ relational::relational(ex const & lhs, ex const & rhs, operators oper) : basic(T
     o=oper;
 }
 
+//////////
+// archiving
+//////////
+
+/** Construct object from archive_node. */
+relational::relational(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
+{
+    debugmsg("relational constructor from archive_node", LOGLEVEL_CONSTRUCT);
+    unsigned int opi;
+    if (!(n.find_unsigned("op", opi)))
+        throw (std::runtime_error("unknown relational operator in archive"));
+    o = (operators)opi;
+    n.find_ex("lh", lh, sym_lst);
+    n.find_ex("rh", rh, sym_lst);
+}
+
+/** Unarchive the object. */
+ex relational::unarchive(const archive_node &n, const lst &sym_lst)
+{
+    return (new relational(n, sym_lst))->setflag(status_flags::dynallocated);
+}
+
+/** Archive the object. */
+void relational::archive(archive_node &n) const
+{
+    inherited::archive(n);
+    n.add_ex("lh", lh);
+    n.add_ex("rh", rh);
+    n.add_unsigned("op", o);
+}
+
 //////////
 // functions overriding virtual functions from bases classes
 //////////
@@ -105,7 +139,7 @@ basic * relational::duplicate() const
     return new relational(*this);
 }
 
-void relational::print(ostream & os, unsigned upper_precedence) const
+void relational::print(std::ostream & os, unsigned upper_precedence) const
 {
     debugmsg("relational print",LOGLEVEL_PRINT);
     if (precedence<=upper_precedence) os << "(";
@@ -136,7 +170,7 @@ void relational::print(ostream & os, unsigned upper_precedence) const
     if (precedence<=upper_precedence) os << ")";
 }
 
-void relational::printraw(ostream & os) const
+void relational::printraw(std::ostream & os) const
 {
     debugmsg("relational printraw",LOGLEVEL_PRINT);
     os << "RELATIONAL(";
@@ -169,7 +203,7 @@ void relational::printraw(ostream & os) const
     os << ")";
 }
 
-void relational::printcsrc(ostream & os, unsigned type, unsigned upper_precedence) const
+void relational::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const
 {
     debugmsg("relational print csrc", LOGLEVEL_PRINT);
     if (precedence<=upper_precedence)
@@ -236,7 +270,7 @@ unsigned relational::nops() const
     return 2;
 }
 
-ex & relational::let_op(int const i)
+ex & relational::let_op(int i)
 {
     GINAC_ASSERT(i>=0);
     GINAC_ASSERT(i<2);
@@ -269,17 +303,17 @@ ex relational::evalf(int level) const
             setflag(status_flags::dynallocated);
 }
 
-ex relational::simplify_ncmul(exvector const & v) const
+ex relational::simplify_ncmul(const exvector & v) const
 {
     return lh.simplify_ncmul(v);
 }
 
 // protected
 
-int relational::compare_same_type(basic const & other) const
+int relational::compare_same_type(const basic & other) const
 {
     GINAC_ASSERT(is_exactly_of_type(other, relational));
-    relational const & oth=static_cast<relational const &>(const_cast<basic &>(other));
+    const relational & oth=static_cast<const relational &>(const_cast<basic &>(other));
     
     int cmpval;
     
@@ -314,14 +348,22 @@ unsigned relational::return_type_tinfo(void) const
 // new virtual functions which can be overridden by derived classes
 //////////
 
-// none
+/** Left hand side of relational. */
+ex relational::lhs(void) const
+{
+    return lh;
+}
+
+/** Right hand side of relational. */
+ex relational::rhs(void) const
+{
+    return rh;    
+}
 
 //////////
 // non-virtual functions in this class
 //////////
 
-#include <iostream>
-
 relational::operator bool() const
 {
     // please note that (a<b) == false does not imply (a>=b) == true
@@ -370,8 +412,8 @@ unsigned relational::precedence=20;
 //////////
 
 const relational some_relational;
-type_info const & typeid_relational=typeid(some_relational);
+const type_info & typeid_relational=typeid(some_relational);
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC