- See if __GNUC__ < 2.97 before using std::vector<..,malloc_alloc>. Sorry,

[ginac.git] / ginac / relational.h

diff --git a/ginac/relational.h b/ginac/relational.h
index 39b44fb8370ddc69254df02b1a6f9be89e2ef26e..6d8039d341b538afb83948380eb390f91644fee7 100644 (file)
--- a/ginac/relational.h
+++ b/ginac/relational.h
@@ -3,7 +3,7 @@
  *  Interface to relations between expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2000 Johannes Gutenberg University Mainz, Germany
+ *  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
@@ -23,82 +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)
+       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(const relational & other);
-    const relational & operator=(const relational & other);
+       relational();
+       ~relational();
+       relational(const relational & other);
+       const relational & operator=(const relational & other);
 protected:
-    void copy(const relational & other);
-    void destroy(bool call_parent);
+       void copy(const relational & other);
+       void destroy(bool call_parent);
 
-    // other constructors
+       // other constructors
 public:
-    relational(const ex & lhs, const ex & 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 i);
-    ex eval(int level=0) const;
-    ex evalf(int level=0) const;
-    ex simplify_ncmul(const exvector & 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(const basic & 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 const type_info & typeid_relational;
+extern const std::type_info & typeid_relational;
 
 // utility functions
 inline const relational &ex_to_relational(const ex &e)
@@ -106,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__