- prepared for 1.0.13 release

[ginac.git] / ginac / expair.h

diff --git a/ginac/expair.h b/ginac/expair.h
index d7a76ca1574dc115e831492467748caf85152ab3..a170ae8649ba994b621ebc6ef15d51bde99c528f 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-2003 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,13 +82,7 @@ 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
@@ -108,15 +102,30 @@ public:
        ex coeff;   ///< second member of pair, must be numeric
 };
 
-/** Function objects for insertion into third argument of STL's sort() etc. */
+/** Function object 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); }
 };
 
+/** Function object not caring about the numerical coefficients for insertion
+ *  into third argument of STL's sort().  Note that this does not define a
+ *  strict weak ordering since for any symbol x we have neither 3*x<2*x or
+ *  2*x<3*x.  Handle with care! */
+struct expair_rest_is_less : public std::binary_function<expair, expair, bool> {
+       bool operator()(const expair &lh, const expair &rh) const { return (lh.rest.compare(rh.rest)<0); }
+};
+
 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__