X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fexpair.h;h=513dd5c96442b294f1d4a2a755196155a8459334;hb=0cbf40f6d41d256c4137a8469070e304a8480e3f;hp=74744e0213e3d7f1ea65af0936412602fa76ca8a;hpb=06eb6b761f4b9d9eed4decd8ed50d94b40b94a0e;p=ginac.git

diff --git a/ginac/expair.h b/ginac/expair.h
index 74744e02..513dd5c9 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-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
@@ -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. */
@@ -82,20 +82,20 @@ 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_ex_exactly_of_type(coeff,numeric));
-		return (is_ex_exactly_of_type(rest,numeric) &&
-		        (coeff.is_equal(1)));
+		GINAC_ASSERT(is_exactly_a<numeric>(coeff));
+		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
@@ -103,15 +103,29 @@ public:
 };
 
 /** 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);
-	}
+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__