X-Git-Url: https://ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fexpair.h;h=25fc36f331434e26b6f9fbdd7a69b4ebfd7e9148;hb=2ea7c0da53f0f9ec8ac2936cf36c3f6ef5934bf7;hp=a066382a6a42bba6bb2dbb39201ac773d59c0a88;hpb=487e5659efe401683eee0381b0d23f967ffffc3c;p=ginac.git

diff --git a/ginac/expair.h b/ginac/expair.h
index a066382a..25fc36f3 100644
--- a/ginac/expair.h
+++ b/ginac/expair.h
@@ -3,7 +3,7 @@
  *  Definition of expression pairs (building blocks of expairseq). */
 
 /*
- *  GiNaC Copyright (C) 1999 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2000 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
@@ -26,6 +26,10 @@
 #include <ginac/ex.h>
 #include <ginac/numeric.h>
 
+#ifndef NO_GINAC_NAMESPACE
+namespace GiNaC {
+#endif // ndef NO_GINAC_NAMESPACE
+
 /** A pair of expressions.
  *  This similar to, but slightly extended STL's pair<> but we need to account
  *  for methods like .compare() */
@@ -34,11 +38,11 @@ class expair
 public:
     expair() {}
     ~expair() {}
-    expair(expair const & other) : rest(other.rest), coeff(other.coeff)
+    expair(const expair & other) : rest(other.rest), coeff(other.coeff)
     {
-        ASSERT(is_ex_exactly_of_type(coeff,numeric));
+        GINAC_ASSERT(is_ex_exactly_of_type(coeff,numeric));
     }
-    expair const & operator=(expair const & other)
+    const expair & operator=(const expair & other)
     {
         if (this != &other) {
             rest=other.rest;
@@ -46,28 +50,28 @@ public:
         }
         return *this;
     }
-    expair(ex const & r, ex const & c) : rest(r), coeff(c)
+    expair(const ex & r, const ex & c) : rest(r), coeff(c)
     {
-        ASSERT(is_ex_exactly_of_type(coeff,numeric));
+        GINAC_ASSERT(is_ex_exactly_of_type(coeff,numeric));
     }
     
     bool is_numeric_with_coeff_1(void) const
     {
-        ASSERT(is_ex_exactly_of_type(coeff,numeric));
+        GINAC_ASSERT(is_ex_exactly_of_type(coeff,numeric));
         return is_ex_exactly_of_type(rest,numeric) &&
-               (ex_to_numeric(coeff).compare(numONE())==0);
+               (coeff.is_equal(ex(1)));
     }
 
-    bool is_equal(expair const & other) const
+    bool is_equal(const expair & other) const
     {
         return (rest.is_equal(other.rest) && coeff.is_equal(other.coeff));
     }
-    bool is_less(expair const & other) const 
+    bool is_less(const expair & other) const 
     {
         return (rest.compare(other.rest)<0) ||
                (!(other.rest.compare(rest)<0) && (coeff.compare(other.coeff)<0));
     }
-    int compare(expair const & other) const
+    int compare(const expair & other) const
     {
         int cmpval=rest.compare(other.rest);
         if (cmpval!=0) return cmpval;
@@ -75,7 +79,7 @@ public:
         return cmpval;
     }
 
-    bool is_less_old2(expair const & other) const 
+    bool is_less_old2(const expair & other) const 
     {
         /*
         bool this_numeric_with_coeff_1=is_numeric_with_coeff_1();
@@ -97,14 +101,14 @@ public:
         */
         if (is_ex_exactly_of_type(rest,numeric) &&
             is_ex_exactly_of_type(other.rest,numeric)) {
-            if (ex_to_numeric(coeff).compare(numONE())==0) {
-                if (ex_to_numeric(other.coeff).compare(numONE())==0) {
+            if (coeff.is_equal(ex(1))) {
+                if ((other.coeff).is_equal(ex(1))) {
                     // both have coeff 1: compare rests
                     return rest.compare(other.rest)<0;
                 }
                 // only this has coeff 1: >
                 return false;
-            } else if (ex_to_numeric(other.coeff).compare(numONE())==0) {
+            } else if ((other.coeff).is_equal(ex(1))) {
                 // only other has coeff 1: <
                 return true;
             }
@@ -114,18 +118,18 @@ public:
                (!(other.rest.compare(rest)<0) &&
                  (coeff.compare(other.coeff)<0));
     }
-    int compare_old2(expair const & other) const
+    int compare_old2(const expair & other) const
     {
         if (is_ex_exactly_of_type(rest,numeric) &&
             is_ex_exactly_of_type(other.rest,numeric)) {
-            if (ex_to_numeric(coeff).compare(numONE())==0) {
-                if (ex_to_numeric(other.coeff).compare(numONE())==0) {
+            if ((coeff).is_equal(ex(1))) {
+                if ((other.coeff).is_equal(ex(1))) {
                     // both have coeff 1: compare rests
                     return rest.compare(other.rest);
                 }
                 // only this has coeff 1: >
                 return 1;
-            } else if (ex_to_numeric(other.coeff).compare(numONE())==0) {
+            } else if ((other.coeff).is_equal(ex(1))) {
                 // only other has coeff 1: <
                 return -1;
             }
@@ -151,12 +155,12 @@ public:
         if (cmpval!=0) return cmpval;
         return coeff.compare(other.coeff);
     }
-    bool is_less_old(expair const & other) const 
+    bool is_less_old(const expair & other) const 
     {
         return (rest.compare(other.rest)<0) ||
                (!(other.rest.compare(rest)<0) && (coeff.compare(other.coeff)<0));
     }
-    int compare_old(expair const & other) const
+    int compare_old(const expair & other) const
     {
         int cmpval=rest.compare(other.rest);
         if (cmpval!=0) return cmpval;
@@ -180,7 +184,7 @@ public:
 class expair_is_less
 {
 public:
-    bool operator()(expair const & lh, expair const & rh) const
+    bool operator()(const expair & lh, const expair & rh) const
     {
         return lh.is_less(rh);
     }
@@ -189,10 +193,14 @@ public:
 class expair_is_less_old
 {
 public:
-    bool operator()(expair const & lh, expair const & rh) const
+    bool operator()(const expair & lh, const expair & rh) const
     {
         return lh.is_less_old(rh);
     }
 };
 
+#ifndef NO_GINAC_NAMESPACE
+} // namespace GiNaC
+#endif // ndef NO_GINAC_NAMESPACE
+
 #endif // ndef __GINAC_EXPAIR_H__