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

[ginac.git] / ginac / relational.h

diff --git a/ginac/relational.h b/ginac/relational.h
index 97a9f6668446e6ba44a72ce90caedab490f7ba1d..ae78c239bff03d72eed4fbe7ebbe87c3e6364d7e 100644 (file)
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -1,8 +1,9 @@
 /** @file relational.h
  *
- *  Interface to relations between expressions.
- *
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  Interface to relations between expressions. */
+
+/*
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -22,10 +23,18 @@
 #ifndef __GINAC_RELATIONAL_H__
 #define __GINAC_RELATIONAL_H__
 
+#include "basic.h"
+#include "ex.h"
+
+#ifndef NO_NAMESPACE_GINAC
+namespace GiNaC {
+#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:
@@ -43,35 +52,38 @@ 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:
     basic * duplicate() const;
-    void printraw(ostream & os) 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;
     bool info(unsigned inf) const;
-    int nops() const;
-    ex & let_op(int const i);
+    unsigned nops() const;
+    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:
@@ -89,10 +101,16 @@ protected:
 // global constants
 
 extern const relational some_relational;
-extern type_info const & typeid_relational;
-
-#define ex_to_relational(X) static_cast<relational const &>(*(X).bp)
+extern const type_info & typeid_relational;
 
-#endif // ndef __GINAC_RELATIONAL_H__
+// utility functions
+inline const relational &ex_to_relational(const ex &e)
+{
+       return static_cast<const relational &>(*e.bp);
+}
 
+#ifndef NO_NAMESPACE_GINAC
+} // namespace GiNaC
+#endif // ndef NO_NAMESPACE_GINAC
 
+#endif // ndef __GINAC_RELATIONAL_H__