* expairseq::expairseq(const epvector&, const ex& oc) (expairseq.cpp):

  check assertion: GINAC_ASSERT(is_a<numeric>(oc)).
* expairseq::expairseq(epvector*, const ex& oc) (expairseq.cpp): Likewise.
* expair_rest_is_less (expair.h): New functor...
* expairseq::canonicalize() (expairseq.cpp): ...used here.

diff --git a/ginac/expair.h b/ginac/expair.h
index 925db97230ea8f471416b27ccedfe9a1328f6925..513dd5c96442b294f1d4a2a755196155a8459334 100644 (file)
--- a/ginac/expair.h
+++ b/ginac/expair.h
@@ -102,11 +102,19 @@ 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); }
 };

diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp
index 36261a985c4e5810f3ec7f80fd6a1846f1d940ef..b233fe2973ea2f297441d66657d3b70536c52d0b 100644 (file)
--- a/ginac/expairseq.cpp
+++ b/ginac/expairseq.cpp
@@ -126,6 +126,7 @@ expairseq::expairseq(const exvector &v) : inherited(TINFO_expairseq)
 expairseq::expairseq(const epvector &v, const ex &oc)
   : inherited(TINFO_expairseq), overall_coeff(oc)
 {
+       GINAC_ASSERT(is_a<numeric>(oc));
        construct_from_epvector(v);
        GINAC_ASSERT(is_canonical());
 }
@@ -134,6 +135,7 @@ expairseq::expairseq(epvector *vp, const ex &oc)
   : inherited(TINFO_expairseq), overall_coeff(oc)
 {
        GINAC_ASSERT(vp!=0);
+       GINAC_ASSERT(is_a<numeric>(oc));
        construct_from_epvector(*vp);
        delete vp;
        GINAC_ASSERT(is_canonical());
@@ -1057,7 +1059,7 @@ void expairseq::make_flat(const epvector &v)
 /** Brings this expairseq into a sorted (canonical) form. */
 void expairseq::canonicalize(void)
 {
-       std::sort(seq.begin(), seq.end(), expair_is_less());
+       std::sort(seq.begin(), seq.end(), expair_rest_is_less());
 }