* Add Pearu's patch canonicalizing class relational, augmented by missing

[ginac.git] / ginac / relational.h

diff --git a/ginac/relational.h b/ginac/relational.h
index 6f5009df33998a28498dfad456aaf2012dfdac0a..8f2263e64b4e220e34bf906b59306ce5a2165502 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-2001 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,80 +23,74 @@
 #ifndef __GINAC_RELATIONAL_H__
 #define __GINAC_RELATIONAL_H__
 
-#include <ginac/basic.h>
-#include <ginac/ex.h>
+#include "basic.h"
+#include "ex.h"
+
+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:
-    enum operators { equal,
-           not_equal,
-           less,
-           less_or_equal,
-           greater,
-           greater_or_equal
-    };
-    
-// member functions
-
-    // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-    relational();
-    ~relational();
-    relational(relational const & other);
-    relational const & operator=(relational const & other);
-protected:
-    void copy(relational const & other);
-    void destroy(bool call_parent);
-
-    // other constructors
+       enum operators {
+               equal,
+               not_equal,
+               less,
+               less_or_equal,
+               greater,
+               greater_or_equal
+       };
+       
+       // other ctors
 public:
-    relational(ex const & lhs, ex const & rhs, operators oper=equal);
-    
-    // functions overriding virtual functions from bases classes
+       relational(const ex & lhs, const ex & rhs, operators oper=equal);
+       
+       // functions overriding virtual functions from base classes
 public:
-    basic * duplicate() const;
-    void printraw(ostream & os) const;
-    void print(ostream & os, unsigned upper_precedence=0) 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);
-    ex eval(int level=0) const;
-    ex evalf(int level=0) const;
-    ex simplify_ncmul(exvector const & v) const;
+       void print(const print_context & c, unsigned level = 0) const;
+       unsigned precedence(void) const {return 20;}
+       bool info(unsigned inf) const;
+       unsigned nops() const;
+       ex & let_op(int i);
+       ex eval(int level=0) const;
+       ex simplify_ncmul(const exvector & v) const;
+
 protected:
-    int compare_same_type(basic const & other) const;
-    unsigned return_type(void) const;
-    unsigned return_type_tinfo(void) const;
+       bool match_same_type(const basic & other) const;
+       unsigned return_type(void) const;
+       unsigned return_type_tinfo(void) const;
+       bool is_equal_same_type(const basic & other) const;
+       unsigned calchash(void) const;
 
-    // new virtual functions which can be overridden by derived classes
-    // none
+       // new virtual functions which can be overridden by derived classes
+public:
+       virtual ex lhs(void) const;
+       virtual ex rhs(void) const;
 
-    // non-virtual functions in this class
+       // non-virtual functions in this class
 public:
-    operator bool(void) const;
-    
+       operator bool(void) const;
+       
 // member variables
-    
+       
 protected:
-    ex lh;
-    ex rh;
-    operators o;
-    static unsigned precedence;
+       ex lh;
+       ex rh;
+       operators o;
 };
 
-// global constants
+// utility functions
 
-extern const relational some_relational;
-extern type_info const & typeid_relational;
+/** Specialization of is_exactly_a<relational>(obj) for relational objects. */
+template<> inline bool is_exactly_a<relational>(const basic & obj)
+{
+       return obj.tinfo()==TINFO_relational;
+}
 
-#define ex_to_relational(X) static_cast<relational const &>(*(X).bp)
+} // namespace GiNaC
 
 #endif // ndef __GINAC_RELATIONAL_H__
-
-