some sections where sums/products are constructed are slightly more efficient

[ginac.git] / ginac / expair.h

diff --git a/ginac/expair.h b/ginac/expair.h
index 74744e0213e3d7f1ea65af0936412602fa76ca8a..a285295899223a9268628cf639d9551ca01e238e 100644 (file)
--- a/ginac/expair.h
+++ b/ginac/expair.h
@@ -41,7 +41,7 @@ public:
        ~expair() { }
        expair(const expair & other) : rest(other.rest), coeff(other.coeff)
        {
-               GINAC_ASSERT(is_ex_exactly_of_type(coeff,numeric));
+               GINAC_ASSERT(is_exactly_a<numeric>(coeff));
        }
        const expair & operator=(const expair & other)
        {
@@ -55,7 +55,7 @@ public:
        /** Construct an expair from two ex. */
        expair(const ex & r, const ex & c) : rest(r), coeff(c)
        {
-               GINAC_ASSERT(is_ex_exactly_of_type(coeff,numeric));
+               GINAC_ASSERT(is_exactly_a<numeric>(coeff));
        }
        
        /** Member-wise check for canonical ordering equality. */
@@ -93,23 +93,29 @@ public:
        /** True if this is of the form (numeric,ex(1)). */
        bool is_canonical_numeric(void) const
        {
-               GINAC_ASSERT(is_ex_exactly_of_type(coeff,numeric));
+               GINAC_ASSERT(is_exactly_a<numeric>(coeff));
                return (is_ex_exactly_of_type(rest,numeric) &&
                        (coeff.is_equal(1)));
        }
+
+       /** Swap contents with other expair. */
+       void swap(expair & other)
+       {
+               rest.swap(other.rest);
+               coeff.swap(other.coeff);
+       }
        
        ex rest;    ///< first member of pair, an arbitrary expression
        ex coeff;   ///< second member of pair, must be numeric
 };
 
-/** Function object for insertion into third argument of STL's sort() etc. */
-class expair_is_less
-{
-public:
-       bool operator()(const expair &lh, const expair &rh) const
-       {
-               return lh.is_less(rh);
-       }
+/** Function objects for insertion into third argument of STL's sort() etc. */
+struct expair_is_less : public std::binary_function<expair, expair, bool> {
+       bool operator()(const expair &lh, const expair &rh) const { return lh.is_less(rh); }
+};
+
+struct expair_swap : public std::binary_function<expair, expair, void> {
+       void operator()(expair &lh, expair &rh) const { lh.swap(rh); }
 };
 
 } // namespace GiNaC