X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Frelational.cpp;h=614c1629c11382ab66db911d07a5c02bcc9a59a1;hp=1cce02d977fa5018ae8061759251c8f788711622;hb=955cb185a85535ab328ffedbfccdc508ce80fa91;hpb=487e5659efe401683eee0381b0d23f967ffffc3c

diff --git a/ginac/relational.cpp b/ginac/relational.cpp
index 1cce02d9..614c1629 100644
--- a/ginac/relational.cpp
+++ b/ginac/relational.cpp
@@ -24,6 +24,12 @@
 
 #include "relational.h"
 #include "numeric.h"
+#include "debugmsg.h"
+#include "utils.h"
+
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
 
 //////////
 // default constructor, destructor, copy constructor assignment operator and helpers
@@ -99,6 +105,111 @@ basic * relational::duplicate() const
     return new relational(*this);
 }
 
+void relational::print(ostream & os, unsigned upper_precedence) const
+{
+    debugmsg("relational print",LOGLEVEL_PRINT);
+    if (precedence<=upper_precedence) os << "(";
+    lh.print(os,precedence);
+    switch (o) {
+    case equal:
+        os << "==";
+        break;
+    case not_equal:
+        os << "!=";
+        break;
+    case less:
+        os << "<";
+        break;
+    case less_or_equal:
+        os << "<=";
+        break;
+    case greater:
+        os << ">";
+        break;
+    case greater_or_equal:
+        os << ">=";
+        break;
+    default:
+        os << "(INVALID RELATIONAL OPERATOR)";
+    }
+    rh.print(os,precedence);
+    if (precedence<=upper_precedence) os << ")";
+}
+
+void relational::printraw(ostream & os) const
+{
+    debugmsg("relational printraw",LOGLEVEL_PRINT);
+    os << "RELATIONAL(";
+    lh.printraw(os);
+    os << ",";
+    rh.printraw(os);
+    os << ",";
+    switch (o) {
+    case equal:
+        os << "==";
+        break;
+    case not_equal:
+        os << "!=";
+        break;
+    case less:
+        os << "<";
+        break;
+    case less_or_equal:
+        os << "<=";
+        break;
+    case greater:
+        os << ">";
+        break;
+    case greater_or_equal:
+        os << ">=";
+        break;
+    default:
+        os << "(INVALID RELATIONAL OPERATOR)";
+    }
+    os << ")";
+}
+
+void relational::printcsrc(ostream & os, unsigned type, unsigned upper_precedence) const
+{
+    debugmsg("relational print csrc", LOGLEVEL_PRINT);
+    if (precedence<=upper_precedence)
+        os << "(";
+
+    // Print left-hand expression
+    lh.bp->printcsrc(os, type, precedence);
+
+    // Print relational operator
+    switch (o) {
+        case equal:
+            os << "==";
+            break;
+        case not_equal:
+            os << "!=";
+            break;
+        case less:
+            os << "<";
+            break;
+        case less_or_equal:
+            os << "<=";
+            break;
+        case greater:
+            os << ">";
+            break;
+        case greater_or_equal:
+            os << ">=";
+            break;
+        default:
+            os << "(INVALID RELATIONAL OPERATOR)";
+            break;
+    }
+
+    // Print right-hand operator
+    rh.bp->printcsrc(os, type, precedence);
+
+    if (precedence <= upper_precedence)
+        os << ")";
+}
+
 bool relational::info(unsigned inf) const
 {
     switch (inf) {
@@ -127,8 +238,8 @@ int relational::nops() const
 
 ex & relational::let_op(int const i)
 {
-    ASSERT(i>=0);
-    ASSERT(i<2);
+    GINAC_ASSERT(i>=0);
+    GINAC_ASSERT(i<2);
 
     return i==0 ? lh : rh;
 }
@@ -167,7 +278,7 @@ ex relational::simplify_ncmul(exvector const & v) const
 
 int relational::compare_same_type(basic const & other) const
 {
-    ASSERT(is_exactly_of_type(other, relational));
+    GINAC_ASSERT(is_exactly_of_type(other, relational));
     relational const & oth=static_cast<relational const &>(const_cast<basic &>(other));
     
     int cmpval;
@@ -189,13 +300,13 @@ int relational::compare_same_type(basic const & other) const
 
 unsigned relational::return_type(void) const
 {
-    ASSERT(lh.return_type()==rh.return_type());
+    GINAC_ASSERT(lh.return_type()==rh.return_type());
     return lh.return_type();
 }
    
 unsigned relational::return_type_tinfo(void) const
 {
-    ASSERT(lh.return_type_tinfo()==rh.return_type_tinfo());
+    GINAC_ASSERT(lh.return_type_tinfo()==rh.return_type_tinfo());
     return lh.return_type_tinfo();
 }
 
@@ -220,7 +331,7 @@ relational::operator bool() const
     if (!is_ex_exactly_of_type(df,numeric)) {
         return o==not_equal ? true : false; // cannot decide on non-numerical results
     }
-    int cmpval=ex_to_numeric(df).compare(numZERO());
+    int cmpval=ex_to_numeric(df).compare(_num0());
     switch (o) {
     case equal:
         return cmpval==0;
@@ -261,3 +372,6 @@ unsigned relational::precedence=20;
 const relational some_relational;
 type_info const & typeid_relational=typeid(some_relational);
 
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE