- Bernard Parisse's patch for Order_eval().

[ginac.git] / ginac / relational.h

diff --git a/ginac/relational.h b/ginac/relational.h
index 39b44fb8370ddc69254df02b1a6f9be89e2ef26e..48b5971996b0182cf148a272641e6dedc4777f2c 100644 (file)
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -23,12 +23,12 @@
 #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. */
@@ -65,14 +65,15 @@ public:
     // functions overriding virtual functions from bases classes
 public:
     basic * duplicate() const;
-    void print(ostream & os, unsigned upper_precedence=0) const;
-    void printraw(ostream & os) const;
-    void printcsrc(ostream & os, unsigned type, unsigned upper_precedence=0) const;
+    void print(std::ostream & os, unsigned upper_precedence=0) const;
+    void printraw(std::ostream & os) const;
+    void printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence=0) const;
     bool info(unsigned inf) const;
     unsigned nops() const;
     ex & let_op(int i);
     ex eval(int level=0) const;
     ex evalf(int level=0) 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(const basic & other) const;
@@ -80,7 +81,9 @@ protected:
     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:
@@ -106,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__