]> www.ginac.de Git - ginac.git/blobdiff - ginac/relational.cpp
Univariate Hensel lifting now uses upoly.
[ginac.git] / ginac / relational.cpp
index d779c632bd49e5bbf8b5bb236deb2b6980c74c01..d345943c26cc2bbea2157efbe0ff9894d220d0ad 100644 (file)
@@ -3,7 +3,7 @@
  *  Implementation of relations between expressions */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 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
  *
  *  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
  */
 
 #include <iostream>
 #include <stdexcept>
 
 #include "relational.h"
+#include "operators.h"
 #include "numeric.h"
-#include "print.h"
 #include "archive.h"
 #include "utils.h"
 
 namespace GiNaC {
 
-GINAC_IMPLEMENT_REGISTERED_CLASS(relational, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(relational, basic,
+  print_func<print_context>(&relational::do_print).
+  print_func<print_tree>(&relational::do_print_tree).
+  print_func<print_python_repr>(&relational::do_print_python_repr))
 
 //////////
-// default ctor, dtor, copy ctor, assignment operator and helpers
+// default constructor
 //////////
 
-relational::relational() : basic(TINFO_relational) {}
-
-void relational::copy(const relational & other)
-{
-       basic::copy(other);
-       lh=other.lh;
-       rh=other.rh;
-       o=other.o;
-}
-
-DEFAULT_DESTROY(relational)
+relational::relational() { }
 
 //////////
-// other ctors
+// other constructors
 //////////
 
 // public
 
-relational::relational(const ex & lhs, const ex & rhs, operators oper) : basic(TINFO_relational), lh(lhs), rh(rhs), o(oper) {}
+relational::relational(const ex & lhs, const ex & rhs, operators oper) :
+       lh(lhs), rh(rhs), o(oper) { }
 
 //////////
 // archiving
 //////////
 
-relational::relational(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
+void relational::read_archive(const archive_node& n, lst& sym_lst)
 {
+       inherited::read_archive(n, sym_lst);
        unsigned int opi;
        if (!(n.find_unsigned("op", opi)))
                throw (std::runtime_error("unknown relational operator in archive"));
@@ -70,6 +65,7 @@ relational::relational(const archive_node &n, const lst &sym_lst) : inherited(n,
        n.find_ex("lh", lh, sym_lst);
        n.find_ex("rh", rh, sym_lst);
 }
+GINAC_BIND_UNARCHIVER(relational);
 
 void relational::archive(archive_node &n) const
 {
@@ -79,65 +75,61 @@ void relational::archive(archive_node &n) const
        n.add_unsigned("op", o);
 }
 
-DEFAULT_UNARCHIVE(relational)
-
 //////////
 // functions overriding virtual functions from base classes
 //////////
 
 // public
 
-void relational::print(const print_context & c, unsigned level) const
+static void print_operator(const print_context & c, relational::operators o)
 {
-       if (is_a<print_tree>(c)) {
-
-               inherited::print(c, level);
-
-       } else {
-
-               if (is_a<print_python_repr>(c)) {
-                       c.s << class_name() << '(';
-                       lh.print(c);
-                       c.s << ',';
-                       rh.print(c);
-                       c.s << ",'";
-               } else {
-                       if (precedence() <= level)
-                               c.s << "(";
-                       lh.print(c, precedence());
-               }
-               switch (o) {
-                       case equal:
-                               c.s << "==";
-                               break;
-                       case not_equal:
-                               c.s << "!=";
-                               break;
-                       case less:
-                               c.s << "<";
-                               break;
-                       case less_or_equal:
-                               c.s << "<=";
-                               break;
-                       case greater:
-                               c.s << ">";
-                               break;
-                       case greater_or_equal:
-                               c.s << ">=";
-                               break;
-                       default:
-                               c.s << "(INVALID RELATIONAL OPERATOR)";
-               }
-               if (is_a<print_python_repr>(c))
-                       c.s << "')";
-               else {
-                       rh.print(c, precedence());
-                       if (precedence() <= level)
-                               c.s << ")";
-               }
+       switch (o) {
+       case relational::equal:
+               c.s << "==";
+               break;
+       case relational::not_equal:
+               c.s << "!=";
+               break;
+       case relational::less:
+               c.s << "<";
+               break;
+       case relational::less_or_equal:
+               c.s << "<=";
+               break;
+       case relational::greater:
+               c.s << ">";
+               break;
+       case relational::greater_or_equal:
+               c.s << ">=";
+               break;
+       default:
+               c.s << "(INVALID RELATIONAL OPERATOR)";
+               break;
        }
 }
 
+void relational::do_print(const print_context & c, unsigned level) const
+{
+       if (precedence() <= level)
+               c.s << "(";
+       lh.print(c, precedence());
+       print_operator(c, o);
+       rh.print(c, precedence());
+       if (precedence() <= level)
+               c.s << ")";
+}
+
+void relational::do_print_python_repr(const print_python_repr & c, unsigned level) const
+{
+       c.s << class_name() << '(';
+       lh.print(c);
+       c.s << ',';
+       rh.print(c);
+       c.s << ",'";
+       print_operator(c, o);
+       c.s << "')";
+}
+
 bool relational::info(unsigned inf) const
 {
        switch (inf) {
@@ -159,19 +151,30 @@ bool relational::info(unsigned inf) const
        return 0;
 }
 
-unsigned relational::nops() const
+size_t relational::nops() const
 {
        return 2;
 }
 
-ex & relational::let_op(int i)
+ex relational::op(size_t i) const
 {
-       GINAC_ASSERT(i>=0);
        GINAC_ASSERT(i<2);
 
        return i==0 ? lh : rh;
 }
 
+ex relational::map(map_function & f) const
+{
+       const ex &mapped_lh = f(lh);
+       const ex &mapped_rh = f(rh);
+
+       if (!are_ex_trivially_equal(lh, mapped_lh)
+        || !are_ex_trivially_equal(rh, mapped_rh))
+               return (new relational(mapped_lh, mapped_rh, o))->setflag(status_flags::dynallocated);
+       else
+               return *this;
+}
+
 ex relational::eval(int level) const
 {
        if (level==1)
@@ -183,20 +186,20 @@ ex relational::eval(int level) const
        return (new relational(lh.eval(level-1),rh.eval(level-1),o))->setflag(status_flags::dynallocated | status_flags::evaluated);
 }
 
-ex relational::subs(const lst & ls, const lst & lr, bool no_pattern) const
+ex relational::subs(const exmap & m, unsigned options) const
 {
-       const ex & subsed_lh = lh.subs(ls, lr, no_pattern);
-       const ex & subsed_rh = rh.subs(ls, lr, no_pattern);
+       const ex & subsed_lh = lh.subs(m, options);
+       const ex & subsed_rh = rh.subs(m, options);
 
        if (!are_ex_trivially_equal(lh, subsed_lh) || !are_ex_trivially_equal(rh, subsed_rh))
-               return relational(subsed_lh, subsed_rh, o).basic::subs(ls, lr, no_pattern);
+               return relational(subsed_lh, subsed_rh, o).subs_one_level(m, options);
        else
-               return basic::subs(ls, lr, no_pattern);
+               return subs_one_level(m, options);
 }
 
-ex relational::simplify_ncmul(const exvector & v) const
+ex relational::eval_ncmul(const exvector & v) const
 {
-       return lh.simplify_ncmul(v);
+       return lh.eval_ncmul(v);
 }
 
 // protected
@@ -242,25 +245,26 @@ bool relational::match_same_type(const basic & other) const
        return o == oth.o;
 }
 
-unsigned relational::return_type(void) const
+unsigned relational::return_type() const
 {
        GINAC_ASSERT(lh.return_type()==rh.return_type());
        return lh.return_type();
 }
    
-unsigned relational::return_type_tinfo(void) const
+return_type_t relational::return_type_tinfo() const
 {
        GINAC_ASSERT(lh.return_type_tinfo()==rh.return_type_tinfo());
        return lh.return_type_tinfo();
 }
 
-unsigned relational::calchash(void) const
+unsigned relational::calchash() const
 {
-       unsigned v = golden_ratio_hash(tinfo());
+       const void* this_tinfo = (const void*)typeid(*this).name();
+       unsigned v = golden_ratio_hash((p_int)this_tinfo);
        unsigned lhash = lh.gethash();
        unsigned rhash = rh.gethash();
 
-       v = rotate_left_31(v);
+       v = rotate_left(v);
        switch(o) {
                case equal:
                case not_equal:
@@ -281,12 +285,9 @@ unsigned relational::calchash(void) const
                        lhash = rhash;
                        break;
        }
-       v = rotate_left_31(v);
+       v = rotate_left(v);
        v ^= lhash;
 
-       // mask out numeric hashes:
-       v &= 0x7FFFFFFFU;
-
        // store calculated hash value only if object is already evaluated
        if (flags & status_flags::evaluated) {
                setflag(status_flags::hash_calculated);
@@ -301,13 +302,13 @@ unsigned relational::calchash(void) const
 //////////
 
 /** Left hand side of relational. */
-ex relational::lhs(void) const
+ex relational::lhs() const
 {
        return lh;
 }
 
 /** Right hand side of relational. */
-ex relational::rhs(void) const
+ex relational::rhs() const
 {
        return rh;    
 }
@@ -316,31 +317,36 @@ ex relational::rhs(void) const
 // non-virtual functions in this class
 //////////
 
-/** Cast the relational into a boolean, mainly for evaluation within an 
+relational::safe_bool relational::make_safe_bool(bool cond) const
+{
+       return cond? &safe_bool_helper::nonnull : 0;
+}
+
+/** Cast the relational into a boolean, mainly for evaluation within an
  *  if-statement.  Note that (a<b) == false does not imply (a>=b) == true in
  *  the general symbolic case.  A false result means the comparison is either
  *  false or undecidable (except of course for !=, where true means either
  *  unequal or undecidable). */
-relational::operator bool() const
+relational::operator relational::safe_bool() const
 {
        const ex df = lh-rh;
-       if (!is_ex_exactly_of_type(df,numeric))
+       if (!is_exactly_a<numeric>(df))
                // cannot decide on non-numerical results
-               return o==not_equal ? true : false;
-       
+               return o==not_equal ? make_safe_bool(true) : make_safe_bool(false);
+
        switch (o) {
                case equal:
-                       return ex_to<numeric>(df).is_zero();
+                       return make_safe_bool(ex_to<numeric>(df).is_zero());
                case not_equal:
-                       return !ex_to<numeric>(df).is_zero();
+                       return make_safe_bool(!ex_to<numeric>(df).is_zero());
                case less:
-                       return ex_to<numeric>(df)<_num0;
+                       return make_safe_bool(ex_to<numeric>(df)<(*_num0_p));
                case less_or_equal:
-                       return ex_to<numeric>(df)<=_num0;
+                       return make_safe_bool(ex_to<numeric>(df)<=(*_num0_p));
                case greater:
-                       return ex_to<numeric>(df)>_num0;
+                       return make_safe_bool(ex_to<numeric>(df)>(*_num0_p));
                case greater_or_equal:
-                       return ex_to<numeric>(df)>=_num0;
+                       return make_safe_bool(ex_to<numeric>(df)>=(*_num0_p));
                default:
                        throw(std::logic_error("invalid relational operator"));
        }