X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=296575a8382f770ae26bc714ab9ebb02806bdbe6;hp=5abdbc04b9e111c46f83176e58ad2845f9df76ef;hb=95ede03f00106be5fb087d76c86ca5c27edb9122;hpb=5ef801553eb39aed7bd2df9dd1aff9d752c3ea9d diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index 5abdbc04..296575a8 100644 --- a/ginac/expairseq.cpp +++ b/ginac/expairseq.cpp @@ -3,7 +3,7 @@ * Implementation of sequences of expression pairs. */ /* - * GiNaC Copyright (C) 1999-2003 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2010 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,33 +17,38 @@ * * 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 */ -#include -#include -#include -#include - #include "expairseq.h" #include "lst.h" +#include "add.h" #include "mul.h" #include "power.h" #include "relational.h" #include "wildcard.h" -#include "print.h" #include "archive.h" #include "operators.h" #include "utils.h" +#include "hash_seed.h" +#include "indexed.h" +#include #if EXPAIRSEQ_USE_HASHTAB #include #endif // EXPAIRSEQ_USE_HASHTAB +#include +#include +#include +#include namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS(expairseq, basic) +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(expairseq, basic, + print_func(&expairseq::do_print). + print_func(&expairseq::do_print_tree)) + ////////// // helper classes @@ -64,9 +69,9 @@ public: // public -expairseq::expairseq() : inherited(TINFO_expairseq) +expairseq::expairseq() #if EXPAIRSEQ_USE_HASHTAB - , hashtabsize(0) + : hashtabsize(0) #endif // EXPAIRSEQ_USE_HASHTAB {} @@ -103,33 +108,32 @@ void expairseq::copy(const expairseq &other) // other constructors ////////// -expairseq::expairseq(const ex &lh, const ex &rh) : inherited(TINFO_expairseq) +expairseq::expairseq(const ex &lh, const ex &rh) { construct_from_2_ex(lh,rh); GINAC_ASSERT(is_canonical()); } -expairseq::expairseq(const exvector &v) : inherited(TINFO_expairseq) +expairseq::expairseq(const exvector &v) { construct_from_exvector(v); GINAC_ASSERT(is_canonical()); } -expairseq::expairseq(const epvector &v, const ex &oc) - : inherited(TINFO_expairseq), overall_coeff(oc) +expairseq::expairseq(const epvector &v, const ex &oc, bool do_index_renaming) + : overall_coeff(oc) { GINAC_ASSERT(is_a(oc)); - construct_from_epvector(v); + construct_from_epvector(v, do_index_renaming); GINAC_ASSERT(is_canonical()); } -expairseq::expairseq(epvector *vp, const ex &oc) - : inherited(TINFO_expairseq), overall_coeff(oc) +expairseq::expairseq(std::auto_ptr vp, const ex &oc, bool do_index_renaming) + : overall_coeff(oc) { - GINAC_ASSERT(vp!=0); + GINAC_ASSERT(vp.get()!=0); GINAC_ASSERT(is_a(oc)); - construct_from_epvector(*vp); - delete vp; + construct_from_epvector(*vp, do_index_renaming); GINAC_ASSERT(is_canonical()); } @@ -137,18 +141,20 @@ expairseq::expairseq(epvector *vp, const ex &oc) // archiving ////////// -expairseq::expairseq(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) -#if EXPAIRSEQ_USE_HASHTAB - , hashtabsize(0) -#endif +void expairseq::read_archive(const archive_node &n, lst &sym_lst) { - for (unsigned int i=0; true; i++) { + inherited::read_archive(n, sym_lst); + archive_node::archive_node_cit first = n.find_first("rest"); + archive_node::archive_node_cit last = n.find_last("coeff"); + ++last; + seq.reserve((last-first)/2); + + for (archive_node::archive_node_cit loc = first; loc < last;) { ex rest; ex coeff; - if (n.find_ex("rest", rest, sym_lst, i) && n.find_ex("coeff", coeff, sym_lst, i)) - seq.push_back(expair(rest, coeff)); - else - break; + n.find_ex_by_loc(loc++, rest, sym_lst); + n.find_ex_by_loc(loc++, coeff, sym_lst); + seq.push_back(expair(rest, coeff)); } n.find_ex("overall_coeff", overall_coeff, sym_lst); @@ -169,7 +175,6 @@ void expairseq::archive(archive_node &n) const n.add_ex("overall_coeff", overall_coeff); } -DEFAULT_UNARCHIVE(expairseq) ////////// // functions overriding virtual functions from base classes @@ -177,92 +182,109 @@ DEFAULT_UNARCHIVE(expairseq) // public -void expairseq::print(const print_context &c, unsigned level) const +void expairseq::do_print(const print_context & c, unsigned level) const { - if (is_a(c)) { - - 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; - size_t num = seq.size(); - for (size_t 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; - } - c.s << 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 { + switch(inf) { + case info_flags::expanded: + return (flags & status_flags::expanded); + case info_flags::has_indices: { + if (flags & status_flags::has_indices) + return true; + else if (flags & status_flags::has_no_indices) + return false; + for (epvector::const_iterator i = seq.begin(); i != seq.end(); ++i) { + if (i->rest.info(info_flags::has_indices)) { + this->setflag(status_flags::has_indices); + this->clearflag(status_flags::has_no_indices); + return true; + } + } + this->clearflag(status_flags::has_indices); + this->setflag(status_flags::has_no_indices); + return false; + } + } return inherited::info(inf); } @@ -284,8 +306,8 @@ ex expairseq::op(size_t i) const ex expairseq::map(map_function &f) const { - epvector *v = new epvector; - v->reserve(seq.size()); + std::auto_ptr v(new epvector); + v->reserve(seq.size()+1); epvector::const_iterator cit = seq.begin(), last = seq.end(); while (cit != last) { @@ -294,9 +316,16 @@ ex expairseq::map(map_function &f) const } if (overall_coeff.is_equal(default_overall_coeff())) - return thisexpairseq(v, default_overall_coeff()); - else - return thisexpairseq(v, f(overall_coeff)); + return thisexpairseq(v, default_overall_coeff(), true); + else { + ex newcoeff = f(overall_coeff); + if(is_a(newcoeff)) + return thisexpairseq(v, newcoeff, true); + else { + v->push_back(split_ex_to_pair(newcoeff)); + return thisexpairseq(v, default_overall_coeff(), true); + } + } } /** Perform coefficient-wise automatic term rewriting rules in this class. */ @@ -305,19 +334,66 @@ 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); +} + +epvector* conjugateepvector(const epvector&epv) +{ + 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::conjugate() const +{ + 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; +} + +bool expairseq::is_polynomial(const ex & var) const +{ + if (!is_exactly_a(*this) && !is_exactly_a(*this)) + return basic::is_polynomial(var); + for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) { + if (!(i->rest).is_polynomial(var)) + return false; + } + return true; } -bool expairseq::match(const ex & pattern, lst & repl_lst) const +bool expairseq::match(const ex & pattern, exmap & repl_lst) const { // 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 - if (this->tinfo() == ex_to(pattern).tinfo()) { + if (typeid(*this) == typeid(ex_to(pattern))) { // Check whether global wildcard (one that matches the "rest of the // expression", like "*" above) is present @@ -364,16 +440,16 @@ found: ; // it has already been matched before, in which case the matches // must be equal) size_t num = ops.size(); - epvector *vp = new epvector(); + 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)); + for (exmap::const_iterator it = repl_lst.begin(); it != repl_lst.end(); ++it) { + if (it->first.is_equal(global_wildcard)) + return rest.is_equal(it->second); } - repl_lst.append(global_wildcard == rest); + repl_lst[global_wildcard] = rest; return true; } else { @@ -388,10 +464,10 @@ found: ; ex expairseq::subs(const exmap & m, unsigned options) const { - epvector *vp = subschildren(m, options); - if (vp) - return ex_to(thisexpairseq(vp, overall_coeff)); - else if ((options & subs_options::subs_algebraic) && is_exactly_a(*this)) + std::auto_ptr vp = subschildren(m, options); + if (vp.get()) + return ex_to(thisexpairseq(vp, overall_coeff, true)); + 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); @@ -536,7 +612,7 @@ unsigned expairseq::return_type() const unsigned expairseq::calchash() const { - unsigned v = golden_ratio_hash(this->tinfo()); + unsigned v = make_hash_seed(typeid(*this)); epvector::const_iterator i = seq.begin(); const epvector::const_iterator end = seq.end(); while (i != end) { @@ -562,12 +638,13 @@ unsigned expairseq::calchash() const ex expairseq::expand(unsigned options) const { - epvector *vp = expandchildren(options); - if (vp == NULL) { + 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; - } else - return thisexpairseq(vp, overall_coeff); + } } ////////// @@ -584,14 +661,14 @@ ex expairseq::expand(unsigned options) const * ctor because the name (add, mul,...) is unknown on the expaiseq level. In * order for this trick to work a derived class must of course override this * definition. */ -ex expairseq::thisexpairseq(const epvector &v, const ex &oc) const +ex expairseq::thisexpairseq(const epvector &v, const ex &oc, bool do_index_renaming) const { - return expairseq(v,oc); + return expairseq(v, oc, do_index_renaming); } -ex expairseq::thisexpairseq(epvector *vp, const ex &oc) const +ex expairseq::thisexpairseq(std::auto_ptr vp, const ex &oc, bool do_index_renaming) const { - return expairseq(vp,oc); + return expairseq(vp, oc, do_index_renaming); } void expairseq::printpair(const print_context & c, const expair & p, unsigned upper_precedence) const @@ -713,8 +790,8 @@ 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 (ex_to(lh).tinfo()==this->tinfo()) { - if (ex_to(rh).tinfo()==this->tinfo()) { + if (typeid(ex_to(lh)) == typeid(*this)) { + if (typeid(ex_to(rh)) == typeid(*this)) { #if EXPAIRSEQ_USE_HASHTAB unsigned totalsize = ex_to(lh).seq.size() + ex_to(rh).seq.size(); @@ -722,8 +799,15 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh) construct_from_2_ex_via_exvector(lh,rh); } else { #endif // EXPAIRSEQ_USE_HASHTAB - construct_from_2_expairseq(ex_to(lh), - ex_to(rh)); + if (is_a(lh) && lh.info(info_flags::has_indices) && + rh.info(info_flags::has_indices)) { + ex newrh=rename_dummy_indices_uniquely(lh, rh); + construct_from_2_expairseq(ex_to(lh), + ex_to(newrh)); + } + else + construct_from_2_expairseq(ex_to(lh), + ex_to(rh)); #if EXPAIRSEQ_USE_HASHTAB } #endif // EXPAIRSEQ_USE_HASHTAB @@ -741,7 +825,7 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh) #endif // EXPAIRSEQ_USE_HASHTAB return; } - } else if (ex_to(rh).tinfo()==this->tinfo()) { + } else if (typeid(ex_to(rh)) == typeid(*this)) { #if EXPAIRSEQ_USE_HASHTAB unsigned totalsize=ex_to(rh).seq.size()+1; if (calc_hashtabsize(totalsize)!=0) { @@ -818,6 +902,7 @@ void expairseq::construct_from_2_expairseq(const expairseq &s1, while (first1!=last1 && first2!=last2) { int cmpval = (*first1).rest.compare((*first2).rest); + if (cmpval==0) { // combine terms const numeric &newcoeff = ex_to(first1->coeff). @@ -933,14 +1018,14 @@ void expairseq::construct_from_exvector(const exvector &v) #endif // EXPAIRSEQ_USE_HASHTAB } -void expairseq::construct_from_epvector(const epvector &v) +void expairseq::construct_from_epvector(const epvector &v, bool do_index_renaming) { // simplifications: +(a,+(b,c),d) -> +(a,b,c,d) (associativity) // +(d,b,c,a) -> +(a,b,c,d) (canonicalization) // +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric()) // (same for (+,*) -> (*,^) - make_flat(v); + make_flat(v, do_index_renaming); #if EXPAIRSEQ_USE_HASHTAB combine_same_terms(); #else @@ -959,13 +1044,17 @@ void expairseq::make_flat(const exvector &v) // and their cumulative number of operands int nexpairseqs = 0; int noperands = 0; + bool do_idx_rename = false; cit = v.begin(); while (cit!=v.end()) { - if (ex_to(*cit).tinfo()==this->tinfo()) { + if (typeid(ex_to(*cit)) == typeid(*this)) { ++nexpairseqs; noperands += ex_to(*cit).seq.size(); } + if (is_a(*this) && (!do_idx_rename) && + cit->info(info_flags::has_indices)) + do_idx_rename = true; ++cit; } @@ -973,10 +1062,12 @@ void expairseq::make_flat(const exvector &v) seq.reserve(v.size()+noperands-nexpairseqs); // copy elements and split off numerical part + make_flat_inserter mf(v, do_idx_rename); cit = v.begin(); while (cit!=v.end()) { - if (ex_to(*cit).tinfo()==this->tinfo()) { - const expairseq &subseqref = ex_to(*cit); + if (typeid(ex_to(*cit)) == typeid(*this)) { + ex newfactor = mf.handle_factor(*cit, _ex1); + const expairseq &subseqref = ex_to(newfactor); combine_overall_coeff(subseqref.overall_coeff); epvector::const_iterator cit_s = subseqref.seq.begin(); while (cit_s!=subseqref.seq.end()) { @@ -986,8 +1077,10 @@ void expairseq::make_flat(const exvector &v) } else { if (is_exactly_a(*cit)) combine_overall_coeff(*cit); - else - seq.push_back(split_ex_to_pair(*cit)); + else { + ex newfactor = mf.handle_factor(*cit, _ex1); + seq.push_back(split_ex_to_pair(newfactor)); + } } ++cit; } @@ -995,7 +1088,7 @@ void expairseq::make_flat(const exvector &v) /** Combine this expairseq with argument epvector. * It cares for associativity as well as for special handling of numerics. */ -void expairseq::make_flat(const epvector &v) +void expairseq::make_flat(const epvector &v, bool do_index_renaming) { epvector::const_iterator cit; @@ -1003,25 +1096,32 @@ void expairseq::make_flat(const epvector &v) // and their cumulative number of operands int nexpairseqs = 0; int noperands = 0; + bool really_need_rename_inds = false; cit = v.begin(); while (cit!=v.end()) { - if (ex_to(cit->rest).tinfo()==this->tinfo()) { + if (typeid(ex_to(cit->rest)) == typeid(*this)) { ++nexpairseqs; noperands += ex_to(cit->rest).seq.size(); } + if ((!really_need_rename_inds) && is_a(*this) && + cit->rest.info(info_flags::has_indices)) + really_need_rename_inds = true; ++cit; } + do_index_renaming = do_index_renaming && really_need_rename_inds; // reserve seq and coeffseq which will hold all operands seq.reserve(v.size()+noperands-nexpairseqs); + make_flat_inserter mf(v, do_index_renaming); // copy elements and split off numerical part cit = v.begin(); while (cit!=v.end()) { - if (ex_to(cit->rest).tinfo()==this->tinfo() && + if ((typeid(ex_to(cit->rest)) == typeid(*this)) && this->can_make_flat(*cit)) { - const expairseq &subseqref = ex_to(cit->rest); + ex newrest = mf.handle_factor(cit->rest, cit->coeff); + const expairseq &subseqref = ex_to(newrest); combine_overall_coeff(ex_to(subseqref.overall_coeff), ex_to(cit->coeff)); epvector::const_iterator cit_s = subseqref.seq.begin(); @@ -1034,9 +1134,15 @@ void expairseq::make_flat(const epvector &v) } } else { if (cit->is_canonical_numeric()) - combine_overall_coeff(cit->rest); - else - seq.push_back(*cit); + combine_overall_coeff(mf.handle_factor(cit->rest, _ex1)); + else { + ex rest = cit->rest; + ex newrest = mf.handle_factor(rest, cit->coeff); + if (are_ex_trivially_equal(newrest, rest)) + seq.push_back(*cit); + else + seq.push_back(expair(newrest, cit->coeff)); + } } ++cit; } @@ -1451,7 +1557,7 @@ 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 { const epvector::const_iterator last = seq.end(); epvector::const_iterator cit = seq.begin(); @@ -1460,7 +1566,7 @@ epvector * expairseq::expandchildren(unsigned options) const 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 @@ -1469,10 +1575,12 @@ 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; + // copy rest while (cit2!=last) { s->push_back(combine_ex_with_coeff_to_pair(cit2->rest.expand(options), @@ -1484,7 +1592,7 @@ epvector * expairseq::expandchildren(unsigned options) const ++cit; } - return 0; // signalling nothing has changed + return std::auto_ptr(0); // signalling nothing has changed } @@ -1493,14 +1601,14 @@ 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")); @@ -1513,7 +1621,7 @@ epvector * expairseq::evalchildren(int level) const 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 @@ -1522,10 +1630,12 @@ 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; + // copy rest while (cit2!=last) { s->push_back(combine_ex_with_coeff_to_pair(cit2->rest.eval(level), @@ -1537,16 +1647,15 @@ epvector * expairseq::evalchildren(int level) const ++cit; } - return 0; // signalling nothing has changed + return std::auto_ptr(0); // signalling nothing has changed } - /** Member-wise substitute in this sequence. * * @see expairseq::subs() * @return pointer to epvector containing pairs after application of subs, * or NULL pointer if no members were changed. */ -epvector * expairseq::subschildren(const exmap & m, unsigned options) const +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 @@ -1575,7 +1684,7 @@ epvector * expairseq::subschildren(const exmap & m, unsigned options) const if (!are_ex_trivially_equal(orig_ex, subsed_ex)) { // Something changed, copy seq, subs 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 @@ -1606,7 +1715,7 @@ epvector * expairseq::subschildren(const exmap & m, unsigned options) const if (!are_ex_trivially_equal(cit->rest, subsed_ex)) { // Something changed, copy seq, subs 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 @@ -1618,8 +1727,7 @@ epvector * expairseq::subschildren(const exmap & m, unsigned options) const // Copy rest while (cit != last) { - s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(m, options), - cit->coeff)); + s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(m, options), cit->coeff)); ++cit; } return s; @@ -1630,7 +1738,7 @@ epvector * expairseq::subschildren(const exmap & m, unsigned options) const } // Nothing has changed - return NULL; + return std::auto_ptr(0); } //////////