inlined ex::swap() and provided versions of iter_swap() for ex and expair

[ginac.git] / ginac / expair.h

diff --git a/ginac/expair.h b/ginac/expair.h
index 91dd2323ffb2352bdaf0240acd2af9c150f7420e..925db97230ea8f471416b27ccedfe9a1328f6925 100644 (file)
--- a/ginac/expair.h
+++ b/ginac/expair.h
@@ -3,7 +3,7 @@
  *  Definition of expression pairs (building blocks of expairseq). */
 
 /*
- *  GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2002 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
@@ -82,36 +82,42 @@ public:
                        return coeff.compare(other.coeff);
        }
        
-       void print(std::ostream & os) const
-       {
-               os << "expair:";
-               print_tree c(os);
-               rest.print(c, c.delta_indent);
-               coeff.print(c, c.delta_indent);
-       }
+       void print(std::ostream & os) const;
        
        /** True if this is of the form (numeric,ex(1)). */
        bool is_canonical_numeric(void) const
        {
                GINAC_ASSERT(is_exactly_a<numeric>(coeff));
-               return (is_ex_exactly_of_type(rest,numeric) &&
-                       (coeff.is_equal(1)));
+               return (is_exactly_a<numeric>(rest) && (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); }
 };
 
+inline void swap(expair & e1, expair & e2)
+{ e1.swap(e2); }
+
+// This makes STL algorithms use the more efficient swap operation for ex objects
+inline void iter_swap(std::vector<expair>::iterator i1, std::vector<expair>::iterator i2)
+{ i1->swap(*i2); }
+
 } // namespace GiNaC
 
 #endif // ndef __GINAC_EXPAIR_H__