- normal() works for relationals: it normalizes both sides

[ginac.git] / ginac / relational.h

diff --git a/ginac/relational.h b/ginac/relational.h
index 25a05c4c386c6ebc76df05a20879d790479dc1ab..ae78c239bff03d72eed4fbe7ebbe87c3e6364d7e 100644 (file)
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -23,17 +23,18 @@
 #ifndef __GINAC_RELATIONAL_H__
 #define __GINAC_RELATIONAL_H__
 
-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 /** This class holds a relation consisting of two expressions and a logical
  *  relation between them. */
 class relational : public basic
 {
+    GINAC_DECLARE_REGISTERED_CLASS(relational, basic)
 
 // types
 public:
@@ -51,15 +52,15 @@ public:
 public:
     relational();
     ~relational();
-    relational(relational const & other);
-    relational const & operator=(relational const & other);
+    relational(const relational & other);
+    const relational & operator=(const relational & other);
 protected:
-    void copy(relational const & other);
+    void copy(const relational & other);
     void destroy(bool call_parent);
 
     // other constructors
 public:
-    relational(ex const & lhs, ex const & rhs, operators oper=equal);
+    relational(const ex & lhs, const ex & rhs, operators oper=equal);
     
     // functions overriding virtual functions from bases classes
 public:
@@ -69,17 +70,20 @@ public:
     void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
     bool info(unsigned inf) const;
     unsigned nops() const;
-    ex & let_op(int const i);
+    ex & let_op(int i);
     ex eval(int level=0) const;
     ex evalf(int level=0) const;
-    ex simplify_ncmul(exvector const & v) const;
+    ex normal(lst &sym_lst, lst &repl_lst, int level=0) const;
+    ex simplify_ncmul(const exvector & v) const;
 protected:
-    int compare_same_type(basic const & other) const;
+    int compare_same_type(const basic & other) const;
     unsigned return_type(void) const;
     unsigned return_type_tinfo(void) const;
 
     // new virtual functions which can be overridden by derived classes
-    // none
+public:
+    virtual ex lhs(void) const;
+    virtual ex rhs(void) const;
 
     // non-virtual functions in this class
 public:
@@ -97,7 +101,7 @@ protected:
 // global constants
 
 extern const relational some_relational;
-extern type_info const & typeid_relational;
+extern const type_info & typeid_relational;
 
 // utility functions
 inline const relational &ex_to_relational(const ex &e)
@@ -105,8 +109,8 @@ inline const relational &ex_to_relational(const ex &e)
        return static_cast<const relational &>(*e.bp);
 }
 
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_RELATIONAL_H__