X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Frelational.h;h=dcbcacc5a30bc2e36d40cc99577bca749a844f1a;hb=85ce9664ddba79c28a6945b1e5b4e2b71f77cb51;hp=6f5009df33998a28498dfad456aaf2012dfdac0a;hpb=66c0f31c678e6c1938d637636b230ea376c157c1;p=ginac.git

diff --git a/ginac/relational.h b/ginac/relational.h
index 6f5009df..dcbcacc5 100644
--- 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,70 @@
 #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 bases 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;
+	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;
+	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;
+// utility functions
+inline const relational &ex_to_relational(const ex &e)
+{
+	return static_cast<const relational &>(*e.bp);
+}
 
-#define ex_to_relational(X) static_cast<relational const &>(*(X).bp)
+} // namespace GiNaC
 
 #endif // ndef __GINAC_RELATIONAL_H__
-
-