Fixed initialization order bug (references to flyweights removed!) [C.Dams].

[ginac.git] / ginac / relational.cpp

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index c45dd1efc7b23683b00a5c493bf93a2da8ae7fa0..247b75f09105add531a7824a72046243cd8daf0f 100644 (file)
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -3,7 +3,7 @@
  *  Implementation of relations between expressions */
 
 /*
- *  GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2005 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
  */
 
 #include <iostream>
@@ -26,13 +26,15 @@
 #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 constructor
@@ -78,57 +80,55 @@ DEFAULT_UNARCHIVE(relational)
 
 // 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) {
@@ -164,7 +164,14 @@ ex relational::op(size_t i) const
 
 ex relational::map(map_function & f) const
 {
-       return (new relational(f(lh), f(rh), o))->setflag(status_flags::dynallocated);
+       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
@@ -178,15 +185,15 @@ 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, unsigned options) const
+ex relational::subs(const exmap & m, unsigned options) const
 {
-       const ex & subsed_lh = lh.subs(ls, lr, options);
-       const ex & subsed_rh = rh.subs(ls, lr, options);
+       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).subs_one_level(ls, lr, options);
+               return relational(subsed_lh, subsed_rh, o).subs_one_level(m, options);
        else
-               return subs_one_level(ls, lr, options);
+               return subs_one_level(m, options);
 }
 
 ex relational::eval_ncmul(const exvector & v) const
@@ -331,13 +338,13 @@ relational::operator relational::safe_bool() const
                case not_equal:
                        return make_safe_bool(!ex_to<numeric>(df).is_zero());
                case less:
-                       return make_safe_bool(ex_to<numeric>(df)<_num0);
+                       return make_safe_bool(ex_to<numeric>(df)<(*_num0_p));
                case less_or_equal:
-                       return make_safe_bool(ex_to<numeric>(df)<=_num0);
+                       return make_safe_bool(ex_to<numeric>(df)<=(*_num0_p));
                case greater:
-                       return make_safe_bool(ex_to<numeric>(df)>_num0);
+                       return make_safe_bool(ex_to<numeric>(df)>(*_num0_p));
                case greater_or_equal:
-                       return make_safe_bool(ex_to<numeric>(df)>=_num0);
+                       return make_safe_bool(ex_to<numeric>(df)>=(*_num0_p));
                default:
                        throw(std::logic_error("invalid relational operator"));
        }