X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=2c359b4ae6698642f4a21c271c15179a77fcbd67;hp=d796e4b2e8054440a7566634694849fb19a5dc6e;hb=ba0b56c5ac76274c5d748eaa29fbd83cb1d4fb9e;hpb=aa6281216091efd92dc5fcc3f96c7189114e80f1 diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index d796e4b2..2c359b4a 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,16 +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 "mul.h" +#include "power.h" #include "relational.h" -#include "print.h" +#include "wildcard.h" #include "archive.h" -#include "debugmsg.h" +#include "operators.h" #include "utils.h" #if EXPAIRSEQ_USE_HASHTAB @@ -38,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 @@ -54,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 @@ -102,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()); } @@ -126,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(vp.get()!=0); + GINAC_ASSERT(is_a(oc)); construct_from_epvector(*vp); - delete vp; GINAC_ASSERT(is_canonical()); } @@ -145,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; @@ -159,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 @@ -182,96 +178,85 @@ DEFAULT_UNARCHIVE(expairseq) // 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; - unsigned num = seq.size(); - 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; - } - 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 @@ -279,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(); @@ -287,22 +272,17 @@ 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(); @@ -317,16 +297,53 @@ ex expairseq::map(map_function & f) const 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); +} + +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::match(const ex & pattern, lst & repl_lst) const @@ -334,14 +351,14 @@ bool expairseq::match(const ex & pattern, lst & 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 (tinfo() == pattern.bp->tinfo()) { + 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 (unsigned int i=0; i(pattern.op(i))) { has_global_wildcard = true; global_wildcard = pattern.op(i); break; @@ -354,12 +371,12 @@ bool expairseq::match(const ex & pattern, lst & repl_lst) const // Chop into terms exvector ops; ops.reserve(nops()); - for (unsigned i=0; i vp(new epvector); vp->reserve(num); - for (unsigned i=0; ipush_back(split_ex_to_pair(ops[i])); ex rest = thisexpairseq(vp, default_overall_coeff()); - for (unsigned i=0; iop(0).is_equal(global_wildcard)) + return rest.is_equal(it->op(1)); } repl_lst.append(global_wildcard == rest); return true; @@ -403,20 +420,22 @@ found: ; return inherited::match(pattern, repl_lst); } -ex expairseq::subs(const lst &ls, const lst &lr, bool no_pattern) const +ex expairseq::subs(const exmap & m, unsigned options) const { - epvector *vp = subschildren(ls, lr, no_pattern); - if (vp) - return thisexpairseq(vp, overall_coeff).bp->basic::subs(ls, lr, no_pattern); + 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 basic::subs(ls, lr, no_pattern); + return subs_one_level(m, options); } // protected int expairseq::compare_same_type(const basic &other) const { - GINAC_ASSERT(is_of_type(other, expairseq)); + GINAC_ASSERT(is_a(other)); const expairseq &o = static_cast(other); int cmpval; @@ -544,30 +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()); - epvector::const_iterator i = seq.begin(), end = seq.end(); + unsigned v = golden_ratio_hash(this->tinfo()); + epvector::const_iterator i = seq.begin(); + const epvector::const_iterator end = seq.end(); while (i != end) { -#if !EXPAIRSEQ_USE_HASHTAB - v = rotate_left_31(v); // rotation would spoil commutativity -#endif // EXPAIRSEQ_USE_HASHTAB v ^= i->rest.gethash(); #if !EXPAIRSEQ_USE_HASHTAB - v = rotate_left_31(v); + // rotation spoils commutativity! + v = rotate_left(v); v ^= i->coeff.gethash(); -#endif // EXPAIRSEQ_USE_HASHTAB +#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); @@ -579,12 +596,13 @@ unsigned expairseq::calchash(void) 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); + } } ////////// @@ -603,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 << "]]"; } @@ -646,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); } @@ -662,8 +680,8 @@ 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(p.coeff).mul_dyn(ex_to(c))); } @@ -684,23 +702,23 @@ 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)); + 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)); + 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))); } @@ -730,8 +748,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 (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(lh).seq.size() + ex_to(rh).seq.size(); @@ -758,7 +776,7 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh) #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(rh).seq.size()+1; if (calc_hashtabsize(totalsize)!=0) { @@ -780,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 { @@ -789,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 { @@ -798,7 +816,7 @@ 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(p1.coeff).add_dyn(ex_to(p2.coeff)); + 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() @@ -837,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((*first1).coeff). - add(ex_to((*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; } @@ -876,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; @@ -979,7 +997,7 @@ 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(*cit).seq.size(); } @@ -992,7 +1010,7 @@ 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()) { + 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(); @@ -1001,7 +1019,7 @@ 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)); @@ -1023,7 +1041,7 @@ 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(cit->rest).seq.size(); } @@ -1036,7 +1054,7 @@ 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(cit->rest); combine_overall_coeff(ex_to(subseqref.overall_coeff), @@ -1060,53 +1078,54 @@ void expairseq::make_flat(const epvector &v) } /** Brings this expairseq into a sorted (canonical) form. */ -void expairseq::canonicalize(void) +void expairseq::canonicalize() { - sort(seq.begin(), seq.end(), expair_is_less()); + 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(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; - } - 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(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(); @@ -1125,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,numeric)) { + if (is_exactly_a(current->rest)) { --first_numeric; iter_swap(current,first_numeric); } else { @@ -1298,7 +1315,7 @@ 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; @@ -1345,7 +1362,7 @@ 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 { epvector::const_iterator i = seq.begin(), end = seq.end(); while (i != end) { @@ -1368,7 +1385,7 @@ void expairseq::add_numerics_to_hashtab(epvector::iterator first_numeric, } } -void expairseq::combine_same_terms(void) +void expairseq::combine_same_terms() { // combine same terms, drop term with coeff 0, move numerics to end @@ -1394,7 +1411,7 @@ void expairseq::combine_same_terms(void) epvector::iterator first_numeric = seq.end(); epvector::iterator last_non_zero = seq.end()-1; - unsigned num = seq.size(); + size_t num = seq.size(); std::vector touched(num); unsigned number_of_zeroes = 0; @@ -1440,11 +1457,11 @@ bool expairseq::is_canonical() const epvector::const_iterator it_last = it; for (++it; it!=itend; 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)) { + 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); @@ -1469,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)) { // 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 @@ -1487,10 +1504,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), @@ -1502,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 } @@ -1511,14 +1530,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")); @@ -1531,7 +1550,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 @@ -1540,10 +1559,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), @@ -1555,7 +1576,7 @@ epvector * expairseq::evalchildren(int level) const ++cit; } - return 0; // signalling nothing has changed + return std::auto_ptr(0); // signalling nothing has changed } @@ -1564,32 +1585,36 @@ epvector * expairseq::evalchildren(int level) const * @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 lst &ls, const lst &lr, bool no_pattern) const +std::auto_ptr expairseq::subschildren(const exmap & m, unsigned options) const { - GINAC_ASSERT(ls.nops()==lr.nops()); - - // The substitution is "complex" when any of the objects to be substituted - // is a product or power. In this case we have to recombine the pairs - // because the numeric coefficients may be part of the search pattern. - bool complex_subs = false; - for (unsigned i=0; i(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; + } - if (complex_subs) { + if (options & subs_options::pattern_is_product) { // 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(ls, lr, no_pattern); + const ex &subsed_ex = orig_ex.subs(m, options); 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 @@ -1601,7 +1626,7 @@ epvector * expairseq::subschildren(const lst &ls, const lst &lr, bool no_pattern // Copy rest while (cit != last) { - s->push_back(split_ex_to_pair(recombine_pair_to_ex(*cit).subs(ls, lr, no_pattern))); + s->push_back(split_ex_to_pair(recombine_pair_to_ex(*cit).subs(m, options))); ++cit; } return s; @@ -1616,11 +1641,11 @@ epvector * expairseq::subschildren(const lst &ls, const lst &lr, bool no_pattern epvector::const_iterator cit = seq.begin(), last = seq.end(); while (cit != last) { - const ex &subsed_ex = cit->rest.subs(ls, lr, no_pattern); + 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; + std::auto_ptr s(new epvector); s->reserve(seq.size()); // Copy parts of seq which are known not to have changed @@ -1632,7 +1657,7 @@ epvector * expairseq::subschildren(const lst &ls, const lst &lr, bool no_pattern // Copy rest while (cit != last) { - s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(ls, lr, no_pattern), + s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(m, options), cit->coeff)); ++cit; } @@ -1644,7 +1669,7 @@ epvector * expairseq::subschildren(const lst &ls, const lst &lr, bool no_pattern } // Nothing has changed - return NULL; + return std::auto_ptr(0); } //////////