X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Frelational.h;h=c1077f1506e71f67eea9292e5ce030e3a3a27638;hb=d812026311a6f18c3db09af14b635fa1ac03e43f;hp=25a05c4c386c6ebc76df05a20879d790479dc1ab;hpb=15d4b353c85f8815a95d97ab977c9ca48e155574;p=ginac.git

diff --git a/ginac/relational.h b/ginac/relational.h
index 25a05c4c..c1077f15 100644
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -23,81 +23,86 @@
 #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:
-    enum operators { equal,
-           not_equal,
-           less,
-           less_or_equal,
-           greater,
-           greater_or_equal
-    };
-    
+	enum operators {
+		equal,
+		not_equal,
+		less,
+		less_or_equal,
+		greater,
+		greater_or_equal
+	};
+	
 // member functions
 
-    // default constructor, destructor, copy constructor assignment operator and helpers
+	// default constructor, destructor, copy constructor assignment operator and helpers
 public:
-    relational();
-    ~relational();
-    relational(relational const & other);
-    relational const & operator=(relational const & other);
+	relational();
+	~relational();
+	relational(const relational & other);
+	const relational & operator=(const relational & other);
 protected:
-    void copy(relational const & other);
-    void destroy(bool call_parent);
+	void copy(const relational & other);
+	void destroy(bool call_parent);
 
-    // other constructors
+	// other constructors
 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 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;
-    bool info(unsigned inf) const;
-    unsigned 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;
+	basic * duplicate() 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(basic const & other) const;
-    unsigned return_type(void) const;
-    unsigned return_type_tinfo(void) 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
+	// 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;
+	static unsigned precedence;
 };
 
 // global constants
 
 extern const relational some_relational;
-extern type_info const & typeid_relational;
+extern const std::type_info & typeid_relational;
 
 // utility functions
 inline const relational &ex_to_relational(const ex &e)
@@ -105,8 +110,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__