Univariate Hensel lifting now uses upoly.

[ginac.git] / ginac / relational.h

diff --git a/ginac/relational.h b/ginac/relational.h
index c1077f1506e71f67eea9292e5ce030e3a3a27638..b16b9d3f4f2aa0d59253f143fb3bd2d18cbb5c0b 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-2008 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
@@ -17,7 +17,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef __GINAC_RELATIONAL_H__
@@ -25,10 +25,9 @@
 
 #include "basic.h"
 #include "ex.h"
+#include "archive.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. */
@@ -47,71 +46,75 @@ public:
                greater_or_equal
        };
        
-// member functions
-
-       // default constructor, destructor, copy constructor assignment operator and helpers
-public:
-       relational();
-       ~relational();
-       relational(const relational & other);
-       const relational & operator=(const relational & other);
-protected:
-       void copy(const relational & other);
-       void destroy(bool call_parent);
-
        // other constructors
 public:
        relational(const ex & lhs, const ex & rhs, operators oper=equal);
        
-       // functions overriding virtual functions from bases classes
+       // functions overriding virtual functions from base classes
 public:
-       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;
+       unsigned precedence() const {return 20;}
        bool info(unsigned inf) const;
-       unsigned nops() const;
-       ex & let_op(int i);
+       size_t nops() const;
+       ex op(size_t i) const;
+       ex map(map_function & f) const;
+       ex subs(const exmap & m, unsigned options = 0) const;
        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;
+
+       /** Save (a.k.a. serialize) object into archive. */
+       void archive(archive_node& n) const;
+       /** Read (a.k.a. deserialize) object from archive. */
+       void read_archive(const archive_node& n, lst& syms);
 protected:
-       int compare_same_type(const basic & other) const;
-       unsigned return_type(void) const;
-       unsigned return_type_tinfo(void) const;
+       ex eval_ncmul(const exvector & v) const;
+       bool match_same_type(const basic & other) const;
+       unsigned return_type() const;
+       return_type_t return_type_tinfo() const;
+       unsigned calchash() const;
 
        // new virtual functions which can be overridden by derived classes
+protected:
+       void do_print(const print_context & c, unsigned level) const;
+       void do_print_python_repr(const print_python_repr & c, unsigned level) const;
+
 public:
-       virtual ex lhs(void) const;
-       virtual ex rhs(void) const;
+       virtual ex lhs() const;
+       virtual ex rhs() const;
 
        // non-virtual functions in this class
-public:
-       operator bool(void) const;
+private:
+       // For conversions to boolean, as would be used in an if conditional,
+       // implicit conversions from bool to int have a large number of
+       // undesirable side effects.  The following safe_bool type enables
+       // use of relational objects in conditionals without those side effects
+       struct safe_bool_helper {
+               void nonnull() {};
+       };
+
+       typedef void (safe_bool_helper::*safe_bool)();
        
+       safe_bool make_safe_bool(bool) const;
+
+public:
+       operator safe_bool() const;
+       safe_bool operator!() const;
+
 // member variables
        
 protected:
        ex lh;
        ex rh;
        operators o;
-       static unsigned precedence;
 };
-
-// global constants
-
-extern const relational some_relational;
-extern const std::type_info & typeid_relational;
+GINAC_DECLARE_UNARCHIVER(relational); 
 
 // utility functions
-inline const relational &ex_to_relational(const ex &e)
+
+// inlined functions for efficiency
+inline relational::safe_bool relational::operator!() const
 {
-       return static_cast<const relational &>(*e.bp);
+       return make_safe_bool(!static_cast<bool>(*this));
 }
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC
 
 #endif // ndef __GINAC_RELATIONAL_H__