X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpair.h;h=3be0af91741815119c71955d5f7c66385cb8ee05;hp=3a6c01ca823e29c805df1adac3f7437c743ec432;hb=cdddbc6dcdabef73aeb20bb9b81e08dba92a235c;hpb=fbdd5eefb7188778ca9c04b5bee08223609b880f

diff --git a/ginac/expair.h b/ginac/expair.h
index 3a6c01ca..3be0af91 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-2020 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
@@ -17,11 +17,11 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef __GINAC_EXPAIR_H__
-#define __GINAC_EXPAIR_H__
+#ifndef GINAC_EXPAIR_H
+#define GINAC_EXPAIR_H
 
 #include "ex.h"
 #include "numeric.h"
@@ -38,20 +38,7 @@ class expair
 {
 public:
 	expair() : rest(0), coeff(1) { }
-	~expair() { }
-	expair(const expair & other) : rest(other.rest), coeff(other.coeff)
-	{
-		GINAC_ASSERT(is_exactly_a<numeric>(coeff));
-	}
-	const expair & operator=(const expair & other)
-	{
-		if (this != &other) {
-			rest = other.rest;
-			coeff = other.coeff;
-		}
-		return *this;
-	}
-	
+
 	/** Construct an expair from two ex. */
 	expair(const ex & r, const ex & c) : rest(r), coeff(c)
 	{
@@ -85,7 +72,7 @@ public:
 	void print(std::ostream & os) const;
 	
 	/** True if this is of the form (numeric,ex(1)). */
-	bool is_canonical_numeric(void) const
+	bool is_canonical_numeric() const
 	{
 		GINAC_ASSERT(is_exactly_a<numeric>(coeff));
 		return (is_exactly_a<numeric>(rest) && (coeff.is_equal(1)));
@@ -97,20 +84,33 @@ public:
 		rest.swap(other.rest);
 		coeff.swap(other.coeff);
 	}
-	
+
+	const expair conjugate() const;
+
 	ex rest;    ///< first member of pair, an arbitrary expression
 	ex coeff;   ///< second member of pair, must be numeric
 };
 
-/** Function objects for insertion into third argument of STL's sort() etc. */
-struct expair_is_less : public std::binary_function<expair, expair, bool> {
+/** Function object for insertion into third argument of STL's sort() etc. */
+struct expair_is_less {
 	bool operator()(const expair &lh, const expair &rh) const { return lh.is_less(rh); }
 };
 
-struct expair_swap : public std::binary_function<expair, expair, void> {
+/** 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 {
+	bool operator()(const expair &lh, const expair &rh) const { return (lh.rest.compare(rh.rest)<0); }
+};
+
+struct expair_swap {
 	void operator()(expair &lh, expair &rh) const { lh.swap(rh); }
 };
 
+inline void swap(expair & e1, expair & e2)
+{ e1.swap(e2); }
+
 } // namespace GiNaC
 
-#endif // ndef __GINAC_EXPAIR_H__
+#endif // ndef GINAC_EXPAIR_H