X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=676011a319c2417d40f408ddf43c7cd8a0e1004c;hp=b14ffb3027e7b72c61ae4642306fece67def22aa;hb=8dc09f48182574d792a2ed7c37b66831d9267a6c;hpb=e78622a06f749a124b007aa7b969de02fcc9c3d2 diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index b14ffb30..676011a3 100644 --- a/ginac/expairseq.cpp +++ b/ginac/expairseq.cpp @@ -3,7 +3,7 @@ * Implementation of sequences of expression pairs. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2004 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 @@ -20,15 +20,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include #include "expairseq.h" #include "lst.h" -#include "print.h" +#include "mul.h" +#include "power.h" +#include "relational.h" +#include "wildcard.h" #include "archive.h" -#include "debugmsg.h" +#include "operators.h" #include "utils.h" #if EXPAIRSEQ_USE_HASHTAB @@ -37,7 +41,11 @@ namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(expairseq, basic) + +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(expairseq, basic, + print_func(&expairseq::do_print). + print_func(&expairseq::do_print_tree)) + ////////// // helper classes @@ -53,33 +61,23 @@ public: }; ////////// -// default ctor, dtor, copy ctor assignment operator and helpers +// default constructor ////////// // public -expairseq::expairseq(const expairseq &other) -{ - debugmsg("expairseq copy ctor",LOGLEVEL_CONSTRUCT); - copy(other); -} - -const expairseq &expairseq::operator=(const expairseq &other) -{ - debugmsg("expairseq operator=",LOGLEVEL_ASSIGNMENT); - if (this != &other) { - destroy(true); - copy(other); - } - return *this; -} +expairseq::expairseq() : inherited(TINFO_expairseq) +#if EXPAIRSEQ_USE_HASHTAB + , hashtabsize(0) +#endif // EXPAIRSEQ_USE_HASHTAB +{} // protected +#if 0 /** For use by copy ctor and assignment operator. */ void expairseq::copy(const expairseq &other) { - inherited::copy(other); seq = other.seq; overall_coeff = other.overall_coeff; #if EXPAIRSEQ_USE_HASHTAB @@ -101,23 +99,20 @@ void expairseq::copy(const expairseq &other) } #endif // EXPAIRSEQ_USE_HASHTAB } - -DEFAULT_DESTROY(expairseq) +#endif ////////// -// other ctors +// other constructors ////////// expairseq::expairseq(const ex &lh, const ex &rh) : inherited(TINFO_expairseq) { - debugmsg("expairseq ctor from ex,ex",LOGLEVEL_CONSTRUCT); construct_from_2_ex(lh,rh); GINAC_ASSERT(is_canonical()); } expairseq::expairseq(const exvector &v) : inherited(TINFO_expairseq) { - debugmsg("expairseq ctor from exvector",LOGLEVEL_CONSTRUCT); construct_from_exvector(v); GINAC_ASSERT(is_canonical()); } @@ -125,18 +120,17 @@ expairseq::expairseq(const exvector &v) : inherited(TINFO_expairseq) expairseq::expairseq(const epvector &v, const ex &oc) : inherited(TINFO_expairseq), overall_coeff(oc) { - debugmsg("expairseq ctor from epvector,ex",LOGLEVEL_CONSTRUCT); + GINAC_ASSERT(is_a(oc)); construct_from_epvector(v); GINAC_ASSERT(is_canonical()); } -expairseq::expairseq(epvector *vp, const ex &oc) +expairseq::expairseq(std::auto_ptr vp, const ex &oc) : inherited(TINFO_expairseq), overall_coeff(oc) { - debugmsg("expairseq ctor from epvector *,ex",LOGLEVEL_CONSTRUCT); GINAC_ASSERT(vp!=0); + GINAC_ASSERT(is_a(oc)); construct_from_epvector(*vp); - delete vp; GINAC_ASSERT(is_canonical()); } @@ -144,12 +138,11 @@ expairseq::expairseq(epvector *vp, const ex &oc) // archiving ////////// -expairseq::expairseq(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) +expairseq::expairseq(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) #if EXPAIRSEQ_USE_HASHTAB , hashtabsize(0) #endif { - debugmsg("expairseq ctor from archive_node", LOGLEVEL_CONSTRUCT); for (unsigned int i=0; true; i++) { ex rest; ex coeff; @@ -158,7 +151,11 @@ expairseq::expairseq(const archive_node &n, const lst &sym_lst) : inherited(n, s else break; } + n.find_ex("overall_coeff", overall_coeff, sym_lst); + + canonicalize(); + GINAC_ASSERT(is_canonical()); } void expairseq::archive(archive_node &n) const @@ -176,100 +173,90 @@ void expairseq::archive(archive_node &n) const DEFAULT_UNARCHIVE(expairseq) ////////// -// functions overriding virtual functions from bases classes +// functions overriding virtual functions from base classes ////////// // public -basic *expairseq::duplicate() const +void expairseq::do_print(const print_context & c, unsigned level) const { - debugmsg("expairseq duplicate",LOGLEVEL_DUPLICATE); - return new expairseq(*this); + c.s << "[["; + printseq(c, ',', precedence(), level); + c.s << "]]"; } -void expairseq::print(const print_context & c, unsigned level) const +void expairseq::do_print_tree(const print_tree & c, unsigned level) const { - debugmsg("expairseq print",LOGLEVEL_PRINT); - - if (is_of_type(c, print_tree)) { - - unsigned delta_indent = static_cast(c).delta_indent; - - c.s << std::string(level, ' ') << class_name() - << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec - << ", nops=" << nops() - << std::endl; - for (unsigned i=0; i 0) { - c.s << std::string(level + delta_indent, ' ') - << "bin " << i << " with entries "; - for (epplist::const_iterator it=hashtab[i].begin(); - it!=hashtab[i].end(); ++it) { - c.s << *it-seq.begin() << " "; - ++this_bin_fill; - } - os << std::endl; - cum_fill += this_bin_fill; - cum_fill_sq += this_bin_fill*this_bin_fill; + unsigned count[MAXCOUNT+1]; + for (int i=0; i 0) { + c.s << std::string(level + c.delta_indent, ' ') + << "bin " << i << " with entries "; + for (epplist::const_iterator it=hashtab[i].begin(); + it!=hashtab[i].end(); ++it) { + c.s << *it-seq.begin() << " "; + ++this_bin_fill; } - if (this_bin_fill0) - fact *= k; - double prob = std::pow(lambda,k)/fact * std::exp(-lambda); - cum_prob += prob; - c.s << std::string(level + delta_indent, ' ') << "bins with " << k << " entries: " - << int(1000.0*count[k]/hashtabsize)/10.0 << "% (expected: " - << int(prob*1000)/10.0 << ")" << std::endl; + c.s << std::endl; + cum_fill += this_bin_fill; + cum_fill_sq += this_bin_fill*this_bin_fill; } - c.s << std::string(level + delta_indent, ' ') << "bins with more entries: " - << int(1000.0*count[MAXCOUNT]/hashtabsize)/10.0 << "% (expected: " - << int((1-cum_prob)*1000)/10.0 << ")" << std::endl; - - c.s << std::string(level + delta_indent, ' ') << "variance: " - << 1.0/hashtabsize*cum_fill_sq-(1.0/hashtabsize*cum_fill)*(1.0/hashtabsize*cum_fill) - << std::endl; - c.s << std::string(level + delta_indent, ' ') << "average fill: " - << (1.0*cum_fill)/hashtabsize - << " (should be equal to " << (1.0*seq.size())/hashtabsize << ")" << std::endl; -#endif // EXPAIRSEQ_USE_HASHTAB - - } else { - c.s << "[["; - printseq(c, ',', precedence(), level); - c.s << "]]"; + if (this_bin_fill0) + fact *= k; + double prob = std::pow(lambda,k)/fact * std::exp(-lambda); + cum_prob += prob; + c.s << std::string(level + c.delta_indent, ' ') << "bins with " << k << " entries: " + << int(1000.0*count[k]/hashtabsize)/10.0 << "% (expected: " + << int(prob*1000)/10.0 << ")" << std::endl; } + c.s << std::string(level + c.delta_indent, ' ') << "bins with more entries: " + << int(1000.0*count[MAXCOUNT]/hashtabsize)/10.0 << "% (expected: " + << int((1-cum_prob)*1000)/10.0 << ")" << std::endl; + + c.s << std::string(level + c.delta_indent, ' ') << "variance: " + << 1.0/hashtabsize*cum_fill_sq-(1.0/hashtabsize*cum_fill)*(1.0/hashtabsize*cum_fill) + << std::endl; + c.s << std::string(level + c.delta_indent, ' ') << "average fill: " + << (1.0*cum_fill)/hashtabsize + << " (should be equal to " << (1.0*seq.size())/hashtabsize << ")" << std::endl; +#endif // EXPAIRSEQ_USE_HASHTAB } bool expairseq::info(unsigned inf) const @@ -277,7 +264,7 @@ bool expairseq::info(unsigned inf) const return inherited::info(inf); } -unsigned expairseq::nops() const +size_t expairseq::nops() const { if (overall_coeff.is_equal(default_overall_coeff())) return seq.size(); @@ -285,65 +272,171 @@ unsigned expairseq::nops() const return seq.size()+1; } -ex expairseq::op(int i) const +ex expairseq::op(size_t i) const { - if (unsigned(i) v(new epvector); + v->reserve(seq.size()); + + epvector::const_iterator cit = seq.begin(), last = seq.end(); + while (cit != last) { + v->push_back(split_ex_to_pair(f(recombine_pair_to_ex(*cit)))); + ++cit; + } + + if (overall_coeff.is_equal(default_overall_coeff())) + return thisexpairseq(v, default_overall_coeff()); + else + return thisexpairseq(v, f(overall_coeff)); } +/** Perform coefficient-wise automatic term rewriting rules in this class. */ ex expairseq::eval(int level) const { if ((level==1) && (flags &status_flags::evaluated)) return *this; - epvector *vp = evalchildren(level); - if (vp==0) + std::auto_ptr vp = evalchildren(level); + if (vp.get() == 0) return this->hold(); - return (new expairseq(vp,overall_coeff))->setflag(status_flags::dynallocated | status_flags::evaluated); + return (new expairseq(vp, overall_coeff))->setflag(status_flags::dynallocated | status_flags::evaluated); } -ex expairseq::evalf(int level) const +epvector* conjugateepvector(const epvector&epv) { - return thisexpairseq(evalfchildren(level),overall_coeff.evalf(level-1)); + epvector *newepv = 0; + for (epvector::const_iterator i=epv.begin(); i!=epv.end(); ++i) { + if(newepv) { + newepv->push_back(i->conjugate()); + continue; + } + expair x = i->conjugate(); + if (x.is_equal(*i)) { + continue; + } + newepv = new epvector; + newepv->reserve(epv.size()); + for (epvector::const_iterator j=epv.begin(); j!=i; ++j) { + newepv->push_back(*j); + } + newepv->push_back(x); + } + return newepv; } -ex expairseq::normal(lst &sym_lst, lst &repl_lst, int level) const +ex expairseq::conjugate() const { - ex n = thisexpairseq(normalchildren(level),overall_coeff); - return n.bp->basic::normal(sym_lst,repl_lst,level); + epvector* newepv = conjugateepvector(seq); + ex x = overall_coeff.conjugate(); + if (!newepv && are_ex_trivially_equal(x, overall_coeff)) { + return *this; + } + ex result = thisexpairseq(newepv ? *newepv : seq, x); + if (newepv) { + delete newepv; + } + return result; } -ex expairseq::subs(const lst &ls, const lst &lr) const +bool expairseq::match(const ex & pattern, lst & repl_lst) const { - epvector *vp = subschildren(ls,lr); - if (vp==0) - return inherited::subs(ls, lr); - - return thisexpairseq(vp,overall_coeff); -} + // This differs from basic::match() because we want "a+b+c+d" to + // match "d+*+b" with "*" being "a+c", and we want to honor commutativity -// protected + if (this->tinfo() == ex_to(pattern).tinfo()) { + + // Check whether global wildcard (one that matches the "rest of the + // expression", like "*" above) is present + bool has_global_wildcard = false; + ex global_wildcard; + for (size_t i=0; i(pattern.op(i))) { + has_global_wildcard = true; + global_wildcard = pattern.op(i); + break; + } + } + + // Unfortunately, this is an O(N^2) operation because we can't + // sort the pattern in a useful way... + + // Chop into terms + exvector ops; + ops.reserve(nops()); + for (size_t i=0; imatch(p, repl_lst)) { + ops.erase(it); + goto found; + } + ++it; + } + return false; // no match found +found: ; + } + + if (has_global_wildcard) { + + // Assign all the remaining terms to the global wildcard (unless + // it has already been matched before, in which case the matches + // must be equal) + size_t num = ops.size(); + std::auto_ptr vp(new epvector); + vp->reserve(num); + for (size_t i=0; ipush_back(split_ex_to_pair(ops[i])); + ex rest = thisexpairseq(vp, default_overall_coeff()); + for (lst::const_iterator it = repl_lst.begin(); it != repl_lst.end(); ++it) { + if (it->op(0).is_equal(global_wildcard)) + return rest.is_equal(it->op(1)); + } + repl_lst.append(global_wildcard == rest); + return true; + + } else { -/** Implementation of ex::diff() for an expairseq. - * It differentiates all elements of the sequence. - * @see ex::diff */ -ex expairseq::derivative(const symbol &s) const + // No global wildcard, then the match fails if there are any + // unmatched terms left + return ops.empty(); + } + } + return inherited::match(pattern, repl_lst); +} + +ex expairseq::subs(const exmap & m, unsigned options) const { - return thisexpairseq(diffchildren(s),overall_coeff); + std::auto_ptr vp = subschildren(m, options); + if (vp.get()) + return ex_to(thisexpairseq(vp, overall_coeff)); + else if ((options & subs_options::algebraic) && is_exactly_a(*this)) + return static_cast(this)->algebraic_subs_mul(m, options); + else + return subs_one_level(m, options); } +// protected + int expairseq::compare_same_type(const basic &other) const { - GINAC_ASSERT(is_of_type(other, expairseq)); - const expairseq &o = static_cast(const_cast(other)); + GINAC_ASSERT(is_a(other)); + const expairseq &o = static_cast(other); int cmpval; @@ -408,7 +501,7 @@ int expairseq::compare_same_type(const basic &other) const bool expairseq::is_equal_same_type(const basic &other) const { - const expairseq &o = dynamic_cast(const_cast(other)); + const expairseq &o = static_cast(other); // compare number of elements if (seq.size()!=o.seq.size()) @@ -470,28 +563,28 @@ bool expairseq::is_equal_same_type(const basic &other) const #endif // EXPAIRSEQ_USE_HASHTAB } -unsigned expairseq::return_type(void) const +unsigned expairseq::return_type() const { return return_types::noncommutative_composite; } -unsigned expairseq::calchash(void) const +unsigned expairseq::calchash() const { - unsigned v = golden_ratio_hash(tinfo()); - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { -#if !EXPAIRSEQ_USE_HASHTAB - v = rotate_left_31(v); // rotation would spoil commutativity -#endif // EXPAIRSEQ_USE_HASHTAB - v ^= cit->rest.gethash(); + unsigned v = golden_ratio_hash(this->tinfo()); + epvector::const_iterator i = seq.begin(); + const epvector::const_iterator end = seq.end(); + while (i != end) { + v ^= i->rest.gethash(); #if !EXPAIRSEQ_USE_HASHTAB - v = rotate_left_31(v); - v ^= cit->coeff.gethash(); -#endif // EXPAIRSEQ_USE_HASHTAB + // rotation spoils commutativity! + v = rotate_left(v); + v ^= i->coeff.gethash(); +#endif // !EXPAIRSEQ_USE_HASHTAB + ++i; } - + v ^= overall_coeff.gethash(); - v &= 0x7FFFFFFFU; - + // store calculated hash value only if object is already evaluated if (flags &status_flags::evaluated) { setflag(status_flags::hash_calculated); @@ -503,14 +596,13 @@ unsigned expairseq::calchash(void) const ex expairseq::expand(unsigned options) const { - epvector *vp = expandchildren(options); - if (vp==0) { - // the terms have not changed, so it is safe to declare this expanded - setflag(status_flags::expanded); - return *this; + std::auto_ptr vp = expandchildren(options); + if (vp.get()) + return thisexpairseq(vp, overall_coeff); + else { + // The terms have not changed, so it is safe to declare this expanded + return (options == 0) ? setflag(status_flags::expanded) : *this; } - - return thisexpairseq(vp,overall_coeff); } ////////// @@ -529,20 +621,20 @@ ex expairseq::expand(unsigned options) const * definition. */ ex expairseq::thisexpairseq(const epvector &v, const ex &oc) const { - return expairseq(v,oc); + return expairseq(v, oc); } -ex expairseq::thisexpairseq(epvector *vp, const ex &oc) const +ex expairseq::thisexpairseq(std::auto_ptr vp, const ex &oc) const { - return expairseq(vp,oc); + return expairseq(vp, oc); } void expairseq::printpair(const print_context & c, const expair & p, unsigned upper_precedence) const { c.s << "[["; - p.rest.bp->print(c, precedence()); + p.rest.print(c, precedence()); c.s << ","; - p.coeff.bp->print(c, precedence()); + p.coeff.print(c, precedence()); c.s << "]]"; } @@ -572,14 +664,14 @@ void expairseq::printseq(const print_context & c, char delim, * @see expairseq::recombine_pair_to_ex() */ expair expairseq::split_ex_to_pair(const ex &e) const { - return expair(e,_ex1()); + return expair(e,_ex1); } expair expairseq::combine_ex_with_coeff_to_pair(const ex &e, const ex &c) const { - GINAC_ASSERT(is_ex_exactly_of_type(c,numeric)); + GINAC_ASSERT(is_exactly_a(c)); return expair(e,c); } @@ -588,10 +680,10 @@ expair expairseq::combine_ex_with_coeff_to_pair(const ex &e, expair expairseq::combine_pair_with_coeff_to_pair(const expair &p, const ex &c) const { - GINAC_ASSERT(is_ex_exactly_of_type(p.coeff,numeric)); - GINAC_ASSERT(is_ex_exactly_of_type(c,numeric)); + GINAC_ASSERT(is_exactly_a(p.coeff)); + GINAC_ASSERT(is_exactly_a(c)); - return expair(p.rest,ex_to_numeric(p.coeff).mul_dyn(ex_to_numeric(c))); + return expair(p.rest,ex_to(p.coeff).mul_dyn(ex_to(c))); } @@ -610,25 +702,25 @@ bool expairseq::expair_needs_further_processing(epp it) return false; } -ex expairseq::default_overall_coeff(void) const +ex expairseq::default_overall_coeff() const { - return _ex0(); + return _ex0; } void expairseq::combine_overall_coeff(const ex &c) { - GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric)); - GINAC_ASSERT(is_ex_exactly_of_type(c,numeric)); - overall_coeff = ex_to_numeric(overall_coeff).add_dyn(ex_to_numeric(c)); + GINAC_ASSERT(is_exactly_a(overall_coeff)); + GINAC_ASSERT(is_exactly_a(c)); + overall_coeff = ex_to(overall_coeff).add_dyn(ex_to(c)); } void expairseq::combine_overall_coeff(const ex &c1, const ex &c2) { - GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric)); - GINAC_ASSERT(is_ex_exactly_of_type(c1,numeric)); - GINAC_ASSERT(is_ex_exactly_of_type(c2,numeric)); - overall_coeff = ex_to_numeric(overall_coeff). - add_dyn(ex_to_numeric(c1).mul(ex_to_numeric(c2))); + GINAC_ASSERT(is_exactly_a(overall_coeff)); + GINAC_ASSERT(is_exactly_a(c1)); + GINAC_ASSERT(is_exactly_a(c2)); + overall_coeff = ex_to(overall_coeff). + add_dyn(ex_to(c1).mul(ex_to(c2))); } bool expairseq::can_make_flat(const expair &p) const @@ -656,42 +748,42 @@ void expairseq::construct_from_2_ex_via_exvector(const ex &lh, const ex &rh) void expairseq::construct_from_2_ex(const ex &lh, const ex &rh) { - if (lh.bp->tinfo()==tinfo()) { - if (rh.bp->tinfo()==tinfo()) { + if (ex_to(lh).tinfo()==this->tinfo()) { + if (ex_to(rh).tinfo()==this->tinfo()) { #if EXPAIRSEQ_USE_HASHTAB - unsigned totalsize = ex_to_expairseq(lh).seq.size() + - ex_to_expairseq(rh).seq.size(); + unsigned totalsize = ex_to(lh).seq.size() + + ex_to(rh).seq.size(); if (calc_hashtabsize(totalsize)!=0) { construct_from_2_ex_via_exvector(lh,rh); } else { #endif // EXPAIRSEQ_USE_HASHTAB - construct_from_2_expairseq(ex_to_expairseq(lh), - ex_to_expairseq(rh)); + construct_from_2_expairseq(ex_to(lh), + ex_to(rh)); #if EXPAIRSEQ_USE_HASHTAB } #endif // EXPAIRSEQ_USE_HASHTAB return; } else { #if EXPAIRSEQ_USE_HASHTAB - unsigned totalsize = ex_to_expairseq(lh).seq.size()+1; + unsigned totalsize = ex_to(lh).seq.size()+1; if (calc_hashtabsize(totalsize)!=0) { construct_from_2_ex_via_exvector(lh, rh); } else { #endif // EXPAIRSEQ_USE_HASHTAB - construct_from_expairseq_ex(ex_to_expairseq(lh), rh); + construct_from_expairseq_ex(ex_to(lh), rh); #if EXPAIRSEQ_USE_HASHTAB } #endif // EXPAIRSEQ_USE_HASHTAB return; } - } else if (rh.bp->tinfo()==tinfo()) { + } else if (ex_to(rh).tinfo()==this->tinfo()) { #if EXPAIRSEQ_USE_HASHTAB - unsigned totalsize=ex_to_expairseq(rh).seq.size()+1; + unsigned totalsize=ex_to(rh).seq.size()+1; if (calc_hashtabsize(totalsize)!=0) { construct_from_2_ex_via_exvector(lh,rh); } else { #endif // EXPAIRSEQ_USE_HASHTAB - construct_from_expairseq_ex(ex_to_expairseq(rh),lh); + construct_from_expairseq_ex(ex_to(rh),lh); #if EXPAIRSEQ_USE_HASHTAB } #endif // EXPAIRSEQ_USE_HASHTAB @@ -706,8 +798,8 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh) hashtabsize = 0; #endif // EXPAIRSEQ_USE_HASHTAB - if (is_ex_exactly_of_type(lh,numeric)) { - if (is_ex_exactly_of_type(rh,numeric)) { + if (is_exactly_a(lh)) { + if (is_exactly_a(rh)) { combine_overall_coeff(lh); combine_overall_coeff(rh); } else { @@ -715,7 +807,7 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh) seq.push_back(split_ex_to_pair(rh)); } } else { - if (is_ex_exactly_of_type(rh,numeric)) { + if (is_exactly_a(rh)) { combine_overall_coeff(rh); seq.push_back(split_ex_to_pair(lh)); } else { @@ -724,8 +816,8 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh) int cmpval = p1.rest.compare(p2.rest); if (cmpval==0) { - p1.coeff=ex_to_numeric(p1.coeff).add_dyn(ex_to_numeric(p2.coeff)); - if (!ex_to_numeric(p1.coeff).is_zero()) { + p1.coeff = ex_to(p1.coeff).add_dyn(ex_to(p2.coeff)); + if (!ex_to(p1.coeff).is_zero()) { // no further processing is necessary, since this // one element will usually be recombined in eval() seq.push_back(p1); @@ -763,10 +855,10 @@ void expairseq::construct_from_2_expairseq(const expairseq &s1, int cmpval = (*first1).rest.compare((*first2).rest); if (cmpval==0) { // combine terms - const numeric &newcoeff = ex_to_numeric((*first1).coeff). - add(ex_to_numeric((*first2).coeff)); + const numeric &newcoeff = ex_to(first1->coeff). + add(ex_to(first2->coeff)); if (!newcoeff.is_zero()) { - seq.push_back(expair((*first1).rest,newcoeff)); + seq.push_back(expair(first1->rest,newcoeff)); if (expair_needs_further_processing(seq.end()-1)) { needs_further_processing = true; } @@ -802,7 +894,7 @@ void expairseq::construct_from_expairseq_ex(const expairseq &s, const ex &e) { combine_overall_coeff(s.overall_coeff); - if (is_ex_exactly_of_type(e,numeric)) { + if (is_exactly_a(e)) { combine_overall_coeff(e); seq = s.seq; return; @@ -819,16 +911,15 @@ void expairseq::construct_from_expairseq_ex(const expairseq &s, // merge p into s.seq while (first!=last) { - int cmpval=(*first).rest.compare(p.rest); + int cmpval = (*first).rest.compare(p.rest); if (cmpval==0) { // combine terms - const numeric &newcoeff = ex_to_numeric((*first).coeff). - add(ex_to_numeric(p.coeff)); + const numeric &newcoeff = ex_to(first->coeff). + add(ex_to(p.coeff)); if (!newcoeff.is_zero()) { - seq.push_back(expair((*first).rest,newcoeff)); - if (expair_needs_further_processing(seq.end()-1)) { + seq.push_back(expair(first->rest,newcoeff)); + if (expair_needs_further_processing(seq.end()-1)) needs_further_processing = true; - } } ++first; p_pushed = true; @@ -875,7 +966,6 @@ void expairseq::construct_from_exvector(const exvector &v) canonicalize(); combine_same_terms_sorted_seq(); #endif // EXPAIRSEQ_USE_HASHTAB - return; } void expairseq::construct_from_epvector(const epvector &v) @@ -892,7 +982,6 @@ void expairseq::construct_from_epvector(const epvector &v) canonicalize(); combine_same_terms_sorted_seq(); #endif // EXPAIRSEQ_USE_HASHTAB - return; } /** Combine this expairseq with argument exvector. @@ -908,9 +997,9 @@ void expairseq::make_flat(const exvector &v) cit = v.begin(); while (cit!=v.end()) { - if (cit->bp->tinfo()==this->tinfo()) { + if (ex_to(*cit).tinfo()==this->tinfo()) { ++nexpairseqs; - noperands += ex_to_expairseq(*cit).seq.size(); + noperands += ex_to(*cit).seq.size(); } ++cit; } @@ -921,8 +1010,8 @@ void expairseq::make_flat(const exvector &v) // copy elements and split off numerical part cit = v.begin(); while (cit!=v.end()) { - if (cit->bp->tinfo()==this->tinfo()) { - const expairseq &subseqref = ex_to_expairseq(*cit); + if (ex_to(*cit).tinfo()==this->tinfo()) { + const expairseq &subseqref = ex_to(*cit); combine_overall_coeff(subseqref.overall_coeff); epvector::const_iterator cit_s = subseqref.seq.begin(); while (cit_s!=subseqref.seq.end()) { @@ -930,15 +1019,13 @@ void expairseq::make_flat(const exvector &v) ++cit_s; } } else { - if (is_ex_exactly_of_type(*cit,numeric)) + if (is_exactly_a(*cit)) combine_overall_coeff(*cit); else seq.push_back(split_ex_to_pair(*cit)); } ++cit; } - - return; } /** Combine this expairseq with argument epvector. @@ -954,9 +1041,9 @@ void expairseq::make_flat(const epvector &v) cit = v.begin(); while (cit!=v.end()) { - if (cit->rest.bp->tinfo()==this->tinfo()) { + if (ex_to(cit->rest).tinfo()==this->tinfo()) { ++nexpairseqs; - noperands += ex_to_expairseq((*cit).rest).seq.size(); + noperands += ex_to(cit->rest).seq.size(); } ++cit; } @@ -967,15 +1054,15 @@ void expairseq::make_flat(const epvector &v) // copy elements and split off numerical part cit = v.begin(); while (cit!=v.end()) { - if (cit->rest.bp->tinfo()==this->tinfo() && + if (ex_to(cit->rest).tinfo()==this->tinfo() && this->can_make_flat(*cit)) { - const expairseq &subseqref = ex_to_expairseq((*cit).rest); - combine_overall_coeff(ex_to_numeric(subseqref.overall_coeff), - ex_to_numeric((*cit).coeff)); + const expairseq &subseqref = ex_to(cit->rest); + combine_overall_coeff(ex_to(subseqref.overall_coeff), + ex_to(cit->coeff)); epvector::const_iterator cit_s = subseqref.seq.begin(); while (cit_s!=subseqref.seq.end()) { - seq.push_back(expair((*cit_s).rest, - ex_to_numeric((*cit_s).coeff).mul_dyn(ex_to_numeric((*cit).coeff)))); + seq.push_back(expair(cit_s->rest, + ex_to(cit_s->coeff).mul_dyn(ex_to(cit->coeff)))); //seq.push_back(combine_pair_with_coeff_to_pair(*cit_s, // (*cit).coeff)); ++cit_s; @@ -988,65 +1075,62 @@ void expairseq::make_flat(const epvector &v) } ++cit; } - return; } /** Brings this expairseq into a sorted (canonical) form. */ -void expairseq::canonicalize(void) +void expairseq::canonicalize() { - // canonicalize - sort(seq.begin(),seq.end(),expair_is_less()); - return; + std::sort(seq.begin(), seq.end(), expair_rest_is_less()); } /** Compact a presorted expairseq by combining all matching expairs to one * each. On an add object, this is responsible for 2*x+3*x+y -> 5*x+y, for * instance. */ -void expairseq::combine_same_terms_sorted_seq(void) +void expairseq::combine_same_terms_sorted_seq() { + if (seq.size()<2) + return; + bool needs_further_processing = false; - - if (seq.size()>1) { - epvector::iterator itin1 = seq.begin(); - epvector::iterator itin2 = itin1+1; - epvector::iterator itout = itin1; - epvector::iterator last = seq.end(); - // must_copy will be set to true the first time some combination is - // possible from then on the sequence has changed and must be compacted - bool must_copy = false; - while (itin2!=last) { - if ((*itin1).rest.compare((*itin2).rest)==0) { - (*itin1).coeff = ex_to_numeric((*itin1).coeff). - add_dyn(ex_to_numeric((*itin2).coeff)); - if (expair_needs_further_processing(itin1)) - needs_further_processing = true; - must_copy = true; - } else { - if (!ex_to_numeric((*itin1).coeff).is_zero()) { - if (must_copy) - *itout = *itin1; - ++itout; - } - itin1 = itin2; + + epvector::iterator itin1 = seq.begin(); + epvector::iterator itin2 = itin1+1; + epvector::iterator itout = itin1; + epvector::iterator last = seq.end(); + // must_copy will be set to true the first time some combination is + // possible from then on the sequence has changed and must be compacted + bool must_copy = false; + while (itin2!=last) { + if (itin1->rest.compare(itin2->rest)==0) { + itin1->coeff = ex_to(itin1->coeff). + add_dyn(ex_to(itin2->coeff)); + if (expair_needs_further_processing(itin1)) + needs_further_processing = true; + must_copy = true; + } else { + if (!ex_to(itin1->coeff).is_zero()) { + if (must_copy) + *itout = *itin1; + ++itout; } - ++itin2; + itin1 = itin2; } - if (!ex_to_numeric((*itin1).coeff).is_zero()) { - if (must_copy) - *itout = *itin1; - ++itout; - } - if (itout!=last) - seq.erase(itout,last); + ++itin2; } - + if (!ex_to(itin1->coeff).is_zero()) { + if (must_copy) + *itout = *itin1; + ++itout; + } + if (itout!=last) + seq.erase(itout,last); + if (needs_further_processing) { epvector v = seq; seq.clear(); construct_from_epvector(v); } - return; } #if EXPAIRSEQ_USE_HASHTAB @@ -1060,7 +1144,7 @@ unsigned expairseq::calc_hashtabsize(unsigned sz) const size = nearest_power_of_2/hashtabfactor; if (size(e)) { hashindex = hashmask; } else { - hashindex = hash &hashmask; + hashindex = e.gethash() & hashmask; // last hashtab entry is reserved for numerics if (hashindex==hashmask) hashindex = 0; } - GINAC_ASSERT(hashindex>=0); GINAC_ASSERT((hashindexrest); epplist &eppl = hashtab[hashindex]; - epplist::iterator epplit=eppl.begin(); - bool erased=false; + epplist::iterator epplit = eppl.begin(); + bool erased = false; while (epplit!=eppl.end()) { if (*epplit == element) { eppl.erase(epplit); @@ -1171,10 +1252,10 @@ void expairseq::move_hashtab_entry(epvector::const_iterator oldpos, GINAC_ASSERT(epplit!=eppl.end()); } -void expairseq::sorted_insert(epplist &eppl, epp elem) +void expairseq::sorted_insert(epplist &eppl, epvector::const_iterator elem) { - epplist::iterator current = eppl.begin(); - while ((current!=eppl.end())&&((*(*current)).is_less(*elem))) { + epplist::const_iterator current = eppl.begin(); + while ((current!=eppl.end()) && ((*current)->is_less(*elem))) { ++current; } eppl.insert(current,elem); @@ -1185,21 +1266,21 @@ void expairseq::build_hashtab_and_combine(epvector::iterator &first_numeric, std::vector &touched, unsigned &number_of_zeroes) { - epp current=seq.begin(); + epp current = seq.begin(); while (current!=first_numeric) { - if (is_ex_exactly_of_type((*current).rest,numeric)) { + if (is_exactly_a(current->rest)) { --first_numeric; iter_swap(current,first_numeric); } else { // calculate hashindex - unsigned currenthashindex = calc_hashindex((*current).rest); + unsigned currenthashindex = calc_hashindex(current->rest); // test if there is already a matching expair in the hashtab-list epplist &eppl=hashtab[currenthashindex]; epplist::iterator epplit = eppl.begin(); while (epplit!=eppl.end()) { - if ((*current).rest.is_equal((*(*epplit)).rest)) + if (current->rest.is_equal((*epplit)->rest)) break; ++epplit; } @@ -1209,8 +1290,8 @@ void expairseq::build_hashtab_and_combine(epvector::iterator &first_numeric, ++current; } else { // epplit points to a matching expair, combine it with current - (*(*epplit)).coeff = ex_to_numeric((*(*epplit)).coeff). - add_dyn(ex_to_numeric((*current).coeff)); + (*epplit)->coeff = ex_to((*epplit)->coeff). + add_dyn(ex_to(current->coeff)); // move obsolete current expair to end by swapping with last_non_zero element // if this was a numeric, it is swapped with the expair before first_numeric @@ -1220,7 +1301,7 @@ void expairseq::build_hashtab_and_combine(epvector::iterator &first_numeric, --last_non_zero; ++number_of_zeroes; // test if combined term has coeff 0 and can be removed is done later - touched[(*epplit)-seq.begin()]=true; + touched[(*epplit)-seq.begin()] = true; } } } @@ -1234,12 +1315,12 @@ void expairseq::drop_coeff_0_terms(epvector::iterator &first_numeric, // move terms with coeff 0 to end and remove them from hashtab // check only those elements which have been touched epp current = seq.begin(); - unsigned i = 0; + size_t i = 0; while (current!=first_numeric) { if (!touched[i]) { ++current; ++i; - } else if (!ex_to_numeric((*current).coeff).is_zero()) { + } else if (!ex_to((*current).coeff).is_zero()) { ++current; ++i; } else { @@ -1249,8 +1330,9 @@ void expairseq::drop_coeff_0_terms(epvector::iterator &first_numeric, if (current!=last_non_zero) { iter_swap(current,last_non_zero); --first_numeric; - bool numeric_swapped=first_numeric!=last_non_zero; - if (numeric_swapped) iter_swap(first_numeric,current); + bool numeric_swapped = first_numeric!=last_non_zero; + if (numeric_swapped) + iter_swap(first_numeric,current); epvector::iterator changed_entry; if (numeric_swapped) @@ -1280,11 +1362,13 @@ void expairseq::drop_coeff_0_terms(epvector::iterator &first_numeric, /** True if one of the coeffs vanishes, otherwise false. * This would be an invariant violation, so this should only be used for * debugging purposes. */ -bool expairseq::has_coeff_0(void) const +bool expairseq::has_coeff_0() const { - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - if ((*cit).coeff.is_zero()) + epvector::const_iterator i = seq.begin(), end = seq.end(); + while (i != end) { + if (i->coeff.is_zero()) return true; + ++i; } return false; } @@ -1292,17 +1376,16 @@ bool expairseq::has_coeff_0(void) const void expairseq::add_numerics_to_hashtab(epvector::iterator first_numeric, epvector::const_iterator last_non_zero) { - if (first_numeric==seq.end()) return; // no numerics + if (first_numeric == seq.end()) return; // no numerics - epvector::iterator current = first_numeric; - epvector::const_iterator last = last_non_zero+1; - while (current!=last) { - sorted_insert(hashtab[hashmask],current); + epvector::const_iterator current = first_numeric, last = last_non_zero + 1; + while (current != last) { + sorted_insert(hashtab[hashmask], current); ++current; } } -void expairseq::combine_same_terms(void) +void expairseq::combine_same_terms() { // combine same terms, drop term with coeff 0, move numerics to end @@ -1328,41 +1411,18 @@ void expairseq::combine_same_terms(void) epvector::iterator first_numeric = seq.end(); epvector::iterator last_non_zero = seq.end()-1; - std::vector touched; - touched.reserve(seq.size()); - for (unsigned i=0; i touched(num); unsigned number_of_zeroes = 0; GINAC_ASSERT(!has_coeff_0()); build_hashtab_and_combine(first_numeric,last_non_zero,touched,number_of_zeroes); - /* - cout << "in combine:" << std::endl; - printtree(cout,0); - cout << "size=" << seq.end() - seq.begin() << std::endl; - cout << "first_numeric=" << first_numeric - seq.begin() << std::endl; - cout << "last_non_zero=" << last_non_zero - seq.begin() << std::endl; - for (unsigned i=0; i 0) return 1; // not canoncalized #endif // EXPAIRSEQ_USE_HASHTAB - epvector::const_iterator it = seq.begin(); + epvector::const_iterator it = seq.begin(), itend = seq.end(); epvector::const_iterator it_last = it; - for (++it; it!=seq.end(); it_last=it, ++it) { - if (!((*it_last).is_less(*it) || (*it_last).is_equal(*it))) { - if (!is_ex_exactly_of_type((*it_last).rest,numeric) || - !is_ex_exactly_of_type((*it).rest,numeric)) { + for (++it; it!=itend; it_last=it, ++it) { + if (!(it_last->is_less(*it) || it_last->is_equal(*it))) { + if (!is_exactly_a(it_last->rest) || + !is_exactly_a(it->rest)) { // double test makes it easier to set a breakpoint... - if (!is_ex_exactly_of_type((*it_last).rest,numeric) || - !is_ex_exactly_of_type((*it).rest,numeric)) { + if (!is_exactly_a(it_last->rest) || + !is_exactly_a(it->rest)) { printpair(std::clog, *it_last, 0); std::clog << ">"; printpair(std::clog, *it, 0); std::clog << "\n"; std::clog << "pair1:" << std::endl; - (*it_last).rest.print(print_tree(std::clog)); - (*it_last).coeff.print(print_tree(std::clog)); + it_last->rest.print(print_tree(std::clog)); + it_last->coeff.print(print_tree(std::clog)); std::clog << "pair2:" << std::endl; - (*it).rest.print(print_tree(std::clog)); - (*it).coeff.print(print_tree(std::clog)); + it->rest.print(print_tree(std::clog)); + it->coeff.print(print_tree(std::clog)); return 0; } } @@ -1426,16 +1486,16 @@ bool expairseq::is_canonical() const * @see expairseq::expand() * @return pointer to epvector containing expanded pairs or zero pointer, * if no members were changed. */ -epvector * expairseq::expandchildren(unsigned options) const +std::auto_ptr expairseq::expandchildren(unsigned options) const { - epvector::const_iterator last = seq.end(); + const epvector::const_iterator last = seq.end(); epvector::const_iterator cit = seq.begin(); while (cit!=last) { - const ex &expanded_ex = (*cit).rest.expand(options); - if (!are_ex_trivially_equal((*cit).rest,expanded_ex)) { + const ex &expanded_ex = cit->rest.expand(options); + if (!are_ex_trivially_equal(cit->rest,expanded_ex)) { // something changed, copy seq, eval and return it - epvector *s = new epvector; + std::auto_ptr s(new epvector); s->reserve(seq.size()); // copy parts of seq which are known not to have changed @@ -1444,14 +1504,16 @@ epvector * expairseq::expandchildren(unsigned options) const s->push_back(*cit2); ++cit2; } + // copy first changed element s->push_back(combine_ex_with_coeff_to_pair(expanded_ex, - (*cit2).coeff)); + cit2->coeff)); ++cit2; + // copy rest while (cit2!=last) { - s->push_back(combine_ex_with_coeff_to_pair((*cit2).rest.expand(options), - (*cit2).coeff)); + s->push_back(combine_ex_with_coeff_to_pair(cit2->rest.expand(options), + cit2->coeff)); ++cit2; } return s; @@ -1459,7 +1521,7 @@ epvector * expairseq::expandchildren(unsigned options) const ++cit; } - return 0; // signalling nothing has changed + return std::auto_ptr(0); // signalling nothing has changed } @@ -1468,27 +1530,27 @@ epvector * expairseq::expandchildren(unsigned options) const * @see expairseq::eval() * @return pointer to epvector containing evaluated pairs or zero pointer, * if no members were changed. */ -epvector * expairseq::evalchildren(int level) const +std::auto_ptr expairseq::evalchildren(int level) const { // returns a NULL pointer if nothing had to be evaluated // returns a pointer to a newly created epvector otherwise // (which has to be deleted somewhere else) if (level==1) - return 0; + return std::auto_ptr(0); if (level == -max_recursion_level) throw(std::runtime_error("max recursion level reached")); --level; - epvector::const_iterator last=seq.end(); - epvector::const_iterator cit=seq.begin(); + epvector::const_iterator last = seq.end(); + epvector::const_iterator cit = seq.begin(); while (cit!=last) { - const ex &evaled_ex = (*cit).rest.eval(level); - if (!are_ex_trivially_equal((*cit).rest,evaled_ex)) { + const ex &evaled_ex = cit->rest.eval(level); + if (!are_ex_trivially_equal(cit->rest,evaled_ex)) { // something changed, copy seq, eval and return it - epvector *s = new epvector; + std::auto_ptr s(new epvector); s->reserve(seq.size()); // copy parts of seq which are known not to have changed @@ -1497,14 +1559,16 @@ epvector * expairseq::evalchildren(int level) const s->push_back(*cit2); ++cit2; } + // copy first changed element s->push_back(combine_ex_with_coeff_to_pair(evaled_ex, - (*cit2).coeff)); + cit2->coeff)); ++cit2; + // copy rest while (cit2!=last) { - s->push_back(combine_ex_with_coeff_to_pair((*cit2).rest.eval(level), - (*cit2).coeff)); + s->push_back(combine_ex_with_coeff_to_pair(cit2->rest.eval(level), + cit2->coeff)); ++cit2; } return s; @@ -1512,119 +1576,100 @@ epvector * expairseq::evalchildren(int level) const ++cit; } - return 0; // signalling nothing has changed + return std::auto_ptr(0); // signalling nothing has changed } -/** Member-wise evaluate numerically all expairs in this sequence. +/** Member-wise substitute in this sequence. * - * @see expairseq::evalf() - * @return epvector with all entries evaluated numerically. */ -epvector expairseq::evalfchildren(int level) const -{ - if (level==1) - return seq; - - if (level==-max_recursion_level) - throw(std::runtime_error("max recursion level reached")); - - epvector s; - s.reserve(seq.size()); - - --level; - for (epvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) { - s.push_back(combine_ex_with_coeff_to_pair((*it).rest.evalf(level), - (*it).coeff.evalf(level))); + * @see expairseq::subs() + * @return pointer to epvector containing pairs after application of subs, + * or NULL pointer if no members were changed. */ +std::auto_ptr expairseq::subschildren(const exmap & m, unsigned options) const +{ + // When any of the objects to be substituted is a product or power + // we have to recombine the pairs because the numeric coefficients may + // be part of the search pattern. + if (!(options & (subs_options::pattern_is_product | subs_options::pattern_is_not_product))) { + + // Search the list of substitutions and cache our findings + for (exmap::const_iterator it = m.begin(); it != m.end(); ++it) { + if (is_exactly_a(it->first) || is_exactly_a(it->first)) { + options |= subs_options::pattern_is_product; + break; + } + } + if (!(options & subs_options::pattern_is_product)) + options |= subs_options::pattern_is_not_product; } - return s; -} + if (options & subs_options::pattern_is_product) { -/** Member-wise normalize all expairs in this sequence. - * - * @see expairseq::normal() - * @return epvector with all entries normalized. */ -epvector expairseq::normalchildren(int level) const -{ - if (level==1) - return seq; - - if (level==-max_recursion_level) - throw(std::runtime_error("max recursion level reached")); - - epvector s; - s.reserve(seq.size()); - - --level; - for (epvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) { - s.push_back(combine_ex_with_coeff_to_pair((*it).rest.normal(level), - (*it).coeff)); - } - return s; -} + // Substitute in the recombined pairs + epvector::const_iterator cit = seq.begin(), last = seq.end(); + while (cit != last) { + const ex &orig_ex = recombine_pair_to_ex(*cit); + const ex &subsed_ex = orig_ex.subs(m, options); + if (!are_ex_trivially_equal(orig_ex, subsed_ex)) { -/** Member-wise differentiate all expairs in this sequence. - * - * @see expairseq::diff() - * @return epvector with all entries differentiated. */ -epvector expairseq::diffchildren(const symbol &y) const -{ - epvector s; - s.reserve(seq.size()); - - for (epvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) { - s.push_back(combine_ex_with_coeff_to_pair((*it).rest.diff(y), - (*it).coeff)); - } - return s; -} + // Something changed, copy seq, subs and return it + std::auto_ptr s(new epvector); + s->reserve(seq.size()); + // Copy parts of seq which are known not to have changed + s->insert(s->begin(), seq.begin(), cit); -/** Member-wise substitute in this sequence. - * - * @see expairseq::subs() - * @return pointer to epvector containing pairs after application of subs or zero - * pointer, if no members were changed. */ -epvector * expairseq::subschildren(const lst &ls, const lst &lr) const -{ - // returns a NULL pointer if nothing had to be substituted - // returns a pointer to a newly created epvector otherwise - // (which has to be deleted somewhere else) - GINAC_ASSERT(ls.nops()==lr.nops()); - - epvector::const_iterator last = seq.end(); - epvector::const_iterator cit = seq.begin(); - while (cit!=last) { - const ex &subsed_ex=(*cit).rest.subs(ls,lr); - if (!are_ex_trivially_equal((*cit).rest,subsed_ex)) { + // Copy first changed element + s->push_back(split_ex_to_pair(subsed_ex)); + ++cit; + + // Copy rest + while (cit != last) { + s->push_back(split_ex_to_pair(recombine_pair_to_ex(*cit).subs(m, options))); + ++cit; + } + return s; + } + + ++cit; + } + + } else { + + // Substitute only in the "rest" part of the pairs + epvector::const_iterator cit = seq.begin(), last = seq.end(); + while (cit != last) { + + const ex &subsed_ex = cit->rest.subs(m, options); + if (!are_ex_trivially_equal(cit->rest, subsed_ex)) { - // something changed, copy seq, subs and return it - epvector *s = new epvector; - s->reserve(seq.size()); + // Something changed, copy seq, subs and return it + std::auto_ptr s(new epvector); + s->reserve(seq.size()); + + // Copy parts of seq which are known not to have changed + s->insert(s->begin(), seq.begin(), cit); - // copy parts of seq which are known not to have changed - epvector::const_iterator cit2 = seq.begin(); - while (cit2!=cit) { - s->push_back(*cit2); - ++cit2; - } - // copy first changed element - s->push_back(combine_ex_with_coeff_to_pair(subsed_ex, - (*cit2).coeff)); - ++cit2; - // copy rest - while (cit2!=last) { - s->push_back(combine_ex_with_coeff_to_pair((*cit2).rest.subs(ls,lr), - (*cit2).coeff)); - ++cit2; + // Copy first changed element + s->push_back(combine_ex_with_coeff_to_pair(subsed_ex, cit->coeff)); + ++cit; + + // Copy rest + while (cit != last) { + s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(m, options), + cit->coeff)); + ++cit; + } + return s; } - return s; + + ++cit; } - ++cit; } - return 0; // signalling nothing has changed + // Nothing has changed + return std::auto_ptr(0); } //////////