X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=84b756f9d762e64721bd612485b8be4622a9706c;hp=56fcba68fda4489dc60ef2f32629f76f7be2aff8;hb=65f2693a0948d1db0bc68d7656c64e1fed91c158;hpb=e5362a33f72613b324b3714524a8c2e5f7b7f46f diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index 56fcba68..84b756f9 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-2015 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,28 +17,37 @@ * * 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 "expairseq.h" #include "lst.h" +#include "add.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" +#include "hash_seed.h" +#include "indexed.h" +#include "compiler.h" + +#include +#include +#include +#include +#include +#include -#ifndef NO_NAMESPACE_GINAC namespace GiNaC { -#endif // ndef NO_NAMESPACE_GINAC -#ifdef EXPAIRSEQ_USE_HASHTAB -#error "FIXME: expair_needs_further_processing not yet implemented for hashtabs, sorry. A.F." -#endif // def EXPAIRSEQ_USE_HASHTAB + +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(expairseq, basic, + print_func(&expairseq::do_print). + print_func(&expairseq::do_print_tree)) -GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(expairseq, basic) ////////// // helper classes @@ -47,111 +56,52 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(expairseq, basic) class epp_is_less { public: - bool operator()(const epp & lh, const epp & rh) const + bool operator()(const epp &lh, const epp &rh) const { return (*lh).is_less(*rh); } }; ////////// -// default constructor, destructor, copy constructor assignment operator and helpers +// default constructor ////////// // public -expairseq::expairseq(const expairseq & other) -{ - debugmsg("expairseq copy constructor",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() +{} // protected -void expairseq::copy(const expairseq & other) -{ - inherited::copy(other); - seq=other.seq; - overall_coeff=other.overall_coeff; -#ifdef EXPAIRSEQ_USE_HASHTAB - // copy hashtab - hashtabsize=other.hashtabsize; - if (hashtabsize!=0) { - hashmask=other.hashmask; - hashtab.resize(hashtabsize); - epvector::const_iterator osb=other.seq.begin(); - for (unsigned i=0; i(oc)); + construct_from_epvector(v, do_index_renaming); GINAC_ASSERT(is_canonical()); } -*/ -expairseq::expairseq(const epvector & v, const ex & oc) - : inherited(TINFO_expairseq), overall_coeff(oc) +expairseq::expairseq(epvector && vp, const ex &oc, bool do_index_renaming) + : overall_coeff(oc) { - debugmsg("expairseq constructor from epvector,ex",LOGLEVEL_CONSTRUCT); - construct_from_epvector(v); - GINAC_ASSERT(is_canonical()); -} - -expairseq::expairseq(epvector * vp, const ex & oc) - : inherited(TINFO_expairseq), overall_coeff(oc) -{ - debugmsg("expairseq constructor from epvector *,ex",LOGLEVEL_CONSTRUCT); - GINAC_ASSERT(vp!=0); - construct_from_epvector(*vp); - delete vp; + GINAC_ASSERT(is_a(oc)); + construct_from_epvector(std::move(vp), do_index_renaming); GINAC_ASSERT(is_canonical()); } @@ -159,389 +109,369 @@ expairseq::expairseq(epvector * vp, const ex & oc) // archiving ////////// -/** Construct object from archive_node. */ -expairseq::expairseq(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) -#ifdef EXPAIRSEQ_USE_HASHTAB - , hashtabsize(0) -#endif +void expairseq::read_archive(const archive_node &n, lst &sym_lst) { - debugmsg("expairseq constructor from archive_node", LOGLEVEL_CONSTRUCT); - for (unsigned int i=0; true; i++) { + inherited::read_archive(n, sym_lst); + auto first = n.find_first("rest"); + auto last = n.find_last("coeff"); + ++last; + seq.reserve((last-first)/2); + + for (auto 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); -} -/** Unarchive the object. */ -ex expairseq::unarchive(const archive_node &n, const lst &sym_lst) -{ - return (new expairseq(n, sym_lst))->setflag(status_flags::dynallocated); + canonicalize(); + GINAC_ASSERT(is_canonical()); } -/** Archive the object. */ void expairseq::archive(archive_node &n) const { inherited::archive(n); - epvector::const_iterator i = seq.begin(), iend = seq.end(); - while (i != iend) { - n.add_ex("rest", i->rest); - n.add_ex("coeff", i->coeff); - i++; + for (auto & i : seq) { + n.add_ex("rest", i.rest); + n.add_ex("coeff", i.coeff); } n.add_ex("overall_coeff", overall_coeff); } + ////////// -// functions overriding virtual functions from bases classes +// functions overriding virtual functions from base classes ////////// // public -basic * expairseq::duplicate() const -{ - debugmsg("expairseq duplicate",LOGLEVEL_DUPLICATE); - return new expairseq(*this); -} - -void expairseq::print(std::ostream & os, unsigned upper_precedence) const +void expairseq::do_print(const print_context & c, unsigned level) const { - debugmsg("expairseq print",LOGLEVEL_PRINT); - os << "[["; - printseq(os,',',precedence,upper_precedence); - os << "]]"; + c.s << "[["; + printseq(c, ',', precedence(), level); + c.s << "]]"; } -void expairseq::printraw(std::ostream & os) const +void expairseq::do_print_tree(const print_tree & c, unsigned level) const { - debugmsg("expairseq printraw",LOGLEVEL_PRINT); - - os << "expairseq("; - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - os << "("; - (*cit).rest.printraw(os); - os << ","; - (*cit).coeff.printraw(os); - os << "),"; - } - os << ")"; -} - -void expairseq::printtree(std::ostream & os, unsigned indent) const -{ - debugmsg("expairseq printtree",LOGLEVEL_PRINT); - - os << std::string(indent,' ') << "type=" << class_name() - << ", hash=" << hashvalue - << " (0x" << std::hex << hashvalue << std::dec << ")" - << ", flags=" << flags - << ", nops=" << nops() << std::endl; - for (unsigned i=0; i0) { - os << std::string(indent+delta_indent,' ') - << "bin " << i << " with entries "; - for (epplist::const_iterator it=hashtab[i].begin(); - it!=hashtab[i].end(); ++it) { - os << *it-seq.begin() << " "; - this_bin_fill++; - } - os << std::endl; - cum_fill += this_bin_fill; - cum_fill_sq += this_bin_fill*this_bin_fill; - } - if (this_bin_fill0) fact *= k; - double prob = pow(lambda,k)/fact*exp(-lambda); - cum_prob += prob; - os << std::string(indent+delta_indent,' ') << "bins with " << k << " entries: " - << int(1000.0*count[k]/hashtabsize)/10.0 << "% (expected: " - << int(prob*1000)/10.0 << ")" << std::endl; - } - os << std::string(indent+delta_indent,' ') << "bins with more entries: " - << int(1000.0*count[MAXCOUNT]/hashtabsize)/10.0 << "% (expected: " - << int((1-cum_prob)*1000)/10.0 << ")" << std::endl; - - os << std::string(indent+delta_indent,' ') << "variance: " - << 1.0/hashtabsize*cum_fill_sq-(1.0/hashtabsize*cum_fill)*(1.0/hashtabsize*cum_fill) - << std::endl; - os << std::string(indent+delta_indent,' ') << "average fill: " - << (1.0*cum_fill)/hashtabsize - << " (should be equal to " << (1.0*seq.size())/hashtabsize << ")" << std::endl; -#endif // def EXPAIRSEQ_USE_HASHTAB + c.s << std::string(level + c.delta_indent,' ') << "=====" << std::endl; } 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 (auto & i : seq) { + 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); } -unsigned expairseq::nops() const +size_t expairseq::nops() const { - if (overall_coeff.is_equal(default_overall_coeff())) { + if (overall_coeff.is_equal(default_overall_coeff())) return seq.size(); - } - return seq.size()+1; + else + return seq.size()+1; } -ex expairseq::op(int i) const +ex expairseq::op(size_t i) const { - if (unsigned(i)(newcoeff)) + return thisexpairseq(std::move(v), newcoeff, true); + else { + v.push_back(split_ex_to_pair(newcoeff)); + return thisexpairseq(std::move(v), default_overall_coeff(), true); + } + } } +/** Perform coefficient-wise automatic term rewriting rules in this class. */ ex expairseq::eval(int level) const { - if ((level==1)&&(flags & status_flags::evaluated)) { + if ((level==1) && (flags &status_flags::evaluated)) return *this; - } - epvector * vp=evalchildren(level); - if (vp==0) { + epvector evaled = evalchildren(level); + if (!evaled.empty()) + return dynallocate(std::move(evaled), overall_coeff).setflag(status_flags::evaluated); + else return this->hold(); - } - - 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)); -} - -ex expairseq::normal(lst &sym_lst, lst &repl_lst, int level) const -{ - ex n = thisexpairseq(normalchildren(level),overall_coeff); - return n.bp->basic::normal(sym_lst,repl_lst,level); + epvector *newepv = nullptr; + for (auto 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::subs(const lst & ls, const lst & lr) const +ex expairseq::conjugate() const { - epvector * vp=subschildren(ls,lr); - if (vp==0) { + std::unique_ptr newepv(conjugateepvector(seq)); + ex x = overall_coeff.conjugate(); + if (newepv) { + return thisexpairseq(std::move(*newepv), x); + } + if (are_ex_trivially_equal(x, overall_coeff)) { return *this; } - return thisexpairseq(vp,overall_coeff); + return thisexpairseq(seq, x); } -// protected - -/** Implementation of ex::diff() for an expairseq. It differentiates all elements of the - * sequence. - * @see ex::diff */ -ex expairseq::derivative(const symbol & s) const +bool expairseq::match(const ex & pattern, exmap & repl_lst) const { - return thisexpairseq(diffchildren(s),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 -int expairseq::compare_same_type(const basic & other) const -{ - GINAC_ASSERT(is_of_type(other, expairseq)); - const expairseq & o = static_cast(const_cast(other)); + if (typeid(*this) == typeid(ex_to(pattern))) { - int cmpval; - - // compare number of elements - if (seq.size() != o.seq.size()) { - return (seq.size()(pattern.op(i))) { + has_global_wildcard = true; + global_wildcard = pattern.op(i); + break; + } + } - // compare overall_coeff - cmpval = overall_coeff.compare(o.overall_coeff); - if (cmpval!=0) return cmpval; - - //if (seq.size()==0) return 0; // empty expairseq's are equal - -#ifdef EXPAIRSEQ_USE_HASHTAB - GINAC_ASSERT(hashtabsize==o.hashtabsize); - if (hashtabsize==0) { -#endif // def EXPAIRSEQ_USE_HASHTAB - epvector::const_iterator cit1 = seq.begin(); - epvector::const_iterator cit2 = o.seq.begin(); - epvector::const_iterator last1 = seq.end(); - epvector::const_iterator last2 = o.seq.end(); - - for (; (cit1!=last1)&&(cit2!=last2); ++cit1, ++cit2) { - cmpval = (*cit1).compare(*cit2); - if (cmpval!=0) return cmpval; + // Even if the expression does not match the pattern, some of + // its subexpressions could match it. For example, x^5*y^(-1) + // does not match the pattern $0^5, but its subexpression x^5 + // does. So, save repl_lst in order to not add bogus entries. + exmap tmp_repl = repl_lst; + + // 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, tmp_repl)) { + ops.erase(it); + goto found; + } + ++it; + } + return false; // no match found +found: ; } - GINAC_ASSERT(cit1==last1); - GINAC_ASSERT(cit2==last2); - - return 0; -#ifdef EXPAIRSEQ_USE_HASHTAB - } + 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(); + epvector vp; + vp.reserve(num); + for (size_t i=0; i0) { - const epplist & eppl1=hashtab[i]; - const epplist & eppl2=o.hashtab[i]; - epplist::const_iterator it1=eppl1.begin(); - epplist::const_iterator it2=eppl2.begin(); - while (it1!=eppl1.end()) { - cmpval=(*(*it1)).compare(*(*it2)); - if (cmpval!=0) return cmpval; - ++it1; - ++it2; + } else { + + // No global wildcard, then the match fails if there are any + // unmatched terms left + if (ops.empty()) { + repl_lst = tmp_repl; + return true; } + return false; } } - - return 0; // equal -#endif // def EXPAIRSEQ_USE_HASHTAB + return inherited::match(pattern, repl_lst); } -bool expairseq::is_equal_same_type(const basic & other) const +ex expairseq::subs(const exmap & m, unsigned options) const { - const expairseq & o=dynamic_cast(const_cast(other)); + epvector subsed = subschildren(m, options); + if (!subsed.empty()) + return ex_to(thisexpairseq(std::move(subsed), overall_coeff, (options & subs_options::no_index_renaming) == 0)); + 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); +} - // compare number of elements - if (seq.size() != o.seq.size()) return false; +// protected +int expairseq::compare_same_type(const basic &other) const +{ + GINAC_ASSERT(is_a(other)); + const expairseq &o = static_cast(other); + + int cmpval; + + // compare number of elements + if (seq.size() != o.seq.size()) + return (seq.size()0) { - const epplist & eppl1=hashtab[i]; - const epplist & eppl2=o.hashtab[i]; - epplist::const_iterator it1=eppl1.begin(); - epplist::const_iterator it2=eppl2.begin(); - while (it1!=eppl1.end()) { - if (!(*(*it1)).is_equal(*(*it2))) return false; - ++it1; - ++it2; - } - } +bool expairseq::is_equal_same_type(const basic &other) const +{ + const expairseq &o = static_cast(other); + + // compare number of elements + if (seq.size()!=o.seq.size()) + return false; + + // compare overall_coeff + if (!overall_coeff.is_equal(o.overall_coeff)) + return false; + + auto cit2 = o.seq.begin(); + for (auto & cit1 : seq) { + if (!cit1.is_equal(*cit2)) + return false; + ++cit2; } return true; -#endif // def 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 last=seq.end(); - for (epvector::const_iterator cit=seq.begin(); cit!=last; ++cit) { -#ifndef EXPAIRSEQ_USE_HASHTAB - v=rotate_left_31(v); // rotation would spoil commutativity -#endif // ndef EXPAIRSEQ_USE_HASHTAB - v ^= (*cit).rest.gethash(); + unsigned v = make_hash_seed(typeid(*this)); + for (auto & i : seq) { + v ^= i.rest.gethash(); + v = rotate_left(v); + v ^= i.coeff.gethash(); } v ^= overall_coeff.gethash(); - v=v & 0x7FFFFFFFU; - + // store calculated hash value only if object is already evaluated - if (flags & status_flags::evaluated) { + if (flags &status_flags::evaluated) { setflag(status_flags::hash_calculated); - hashvalue=v; + hashvalue = v; } - + return v; } ex expairseq::expand(unsigned options) const { - epvector * vp = expandchildren(options); - if (vp==0) { - return *this; + epvector expanded = expandchildren(options); + if (!expanded.empty()) { + return thisexpairseq(std::move(expanded), overall_coeff); } - return thisexpairseq(vp,overall_coeff); + return (options == 0) ? setflag(status_flags::expanded) : *this; } ////////// @@ -550,69 +480,87 @@ ex expairseq::expand(unsigned options) const // protected -ex expairseq::thisexpairseq(const epvector & v, const ex & oc) const +/** Create an object of this type. + * This method works similar to a constructor. It is useful because expairseq + * has (at least) two possible different semantics but we want to inherit + * methods thus avoiding code duplication. Sometimes a method in expairseq + * has to create a new one of the same semantics, which cannot be done by a + * ctor because the name (add, mul,...) is unknown on the expairseq 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, 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(epvector && vp, const ex &oc, bool do_index_renaming) const { - return expairseq(vp,oc); + return expairseq(std::move(vp), oc, do_index_renaming); } -void expairseq::printpair(std::ostream & os, const expair & p, unsigned upper_precedence) const +void expairseq::printpair(const print_context & c, const expair & p, unsigned upper_precedence) const { - os << "[["; - p.rest.bp->print(os,precedence); - os << ","; - p.coeff.bp->print(os,precedence); - os << "]]"; + c.s << "[["; + p.rest.print(c, precedence()); + c.s << ","; + p.coeff.print(c, precedence()); + c.s << "]]"; } -void expairseq::printseq(std::ostream & os, char delim, +void expairseq::printseq(const print_context & c, char delim, unsigned this_precedence, unsigned upper_precedence) const { - if (this_precedence<=upper_precedence) os << "("; - epvector::const_iterator it,it_last; - it_last=seq.end(); - --it_last; - for (it=seq.begin(); it!=it_last; ++it) { - printpair(os,*it,this_precedence); - os << delim; + if (this_precedence <= upper_precedence) + c.s << "("; + auto it = seq.begin(), it_last = seq.end() - 1; + for (; it!=it_last; ++it) { + printpair(c, *it, this_precedence); + c.s << delim; } - printpair(os,*it,this_precedence); + printpair(c, *it, this_precedence); if (!overall_coeff.is_equal(default_overall_coeff())) { - os << delim << overall_coeff; + c.s << delim; + overall_coeff.print(c, this_precedence); } - if (this_precedence<=upper_precedence) os << ")"; -} -expair expairseq::split_ex_to_pair(const ex & e) const -{ - return expair(e,_ex1()); + if (this_precedence <= upper_precedence) + c.s << ")"; } -expair expairseq::combine_ex_with_coeff_to_pair(const ex & e, - const ex & c) const + +/** Form an expair from an ex, using the corresponding semantics. + * @see expairseq::recombine_pair_to_ex() */ +expair expairseq::split_ex_to_pair(const ex &e) const { - GINAC_ASSERT(is_ex_exactly_of_type(c,numeric)); + return expair(e,_ex1); +} + +expair expairseq::combine_ex_with_coeff_to_pair(const ex &e, + const ex &c) const +{ + GINAC_ASSERT(is_exactly_a(c)); + return expair(e,c); } -expair expairseq::combine_pair_with_coeff_to_pair(const expair & p, - const ex & c) const + +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))); } -ex expairseq::recombine_pair_to_ex(const expair & p) const + +/** Form an ex out of an expair, using the corresponding semantics. + * @see expairseq::split_ex_to_pair() */ +ex expairseq::recombine_pair_to_ex(const expair &p) const { - return lst(p.rest,p.coeff); + return lst{p.rest, p.coeff}; } bool expairseq::expair_needs_further_processing(epp it) @@ -620,104 +568,71 @@ 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) +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) +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 +bool expairseq::can_make_flat(const expair &p) const { return true; } - + ////////// // non-virtual functions in this class ////////// -void expairseq::construct_from_2_ex_via_exvector(const ex & lh, const ex & rh) +void expairseq::construct_from_2_ex_via_exvector(const ex &lh, const ex &rh) { exvector v; v.reserve(2); v.push_back(lh); v.push_back(rh); construct_from_exvector(v); -#ifdef EXPAIRSEQ_USE_HASHTAB - GINAC_ASSERT((hashtabsize==0)||(hashtabsize>=minhashtabsize)); - GINAC_ASSERT(hashtabsize==calc_hashtabsize(seq.size())); -#endif // def EXPAIRSEQ_USE_HASHTAB } -void expairseq::construct_from_2_ex(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()) { -#ifdef EXPAIRSEQ_USE_HASHTAB - unsigned totalsize = ex_to_expairseq(lh).seq.size() + - ex_to_expairseq(rh).seq.size(); - if (calc_hashtabsize(totalsize)!=0) { - construct_from_2_ex_via_exvector(lh,rh); - } else { -#endif // def EXPAIRSEQ_USE_HASHTAB - construct_from_2_expairseq(ex_to_expairseq(lh), - ex_to_expairseq(rh)); -#ifdef EXPAIRSEQ_USE_HASHTAB + if (typeid(ex_to(lh)) == typeid(*this)) { + if (typeid(ex_to(rh)) == typeid(*this)) { + 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)); } -#endif // def EXPAIRSEQ_USE_HASHTAB + else + construct_from_2_expairseq(ex_to(lh), + ex_to(rh)); return; } else { -#ifdef EXPAIRSEQ_USE_HASHTAB - unsigned totalsize=ex_to_expairseq(lh).seq.size()+1; - if (calc_hashtabsize(totalsize) != 0) { - construct_from_2_ex_via_exvector(lh, rh); - } else { -#endif // def EXPAIRSEQ_USE_HASHTAB - construct_from_expairseq_ex(ex_to_expairseq(lh), rh); -#ifdef EXPAIRSEQ_USE_HASHTAB - } -#endif // def EXPAIRSEQ_USE_HASHTAB + construct_from_expairseq_ex(ex_to(lh), rh); return; } - } else if (rh.bp->tinfo()==tinfo()) { -#ifdef EXPAIRSEQ_USE_HASHTAB - unsigned totalsize=ex_to_expairseq(rh).seq.size()+1; - if (calc_hashtabsize(totalsize)!=0) { - construct_from_2_ex_via_exvector(lh,rh); - } else { -#endif // def EXPAIRSEQ_USE_HASHTAB - construct_from_expairseq_ex(ex_to_expairseq(rh),lh); -#ifdef EXPAIRSEQ_USE_HASHTAB - } -#endif // def EXPAIRSEQ_USE_HASHTAB + } else if (typeid(ex_to(rh)) == typeid(*this)) { + construct_from_expairseq_ex(ex_to(rh),lh); return; } - -#ifdef EXPAIRSEQ_USE_HASHTAB - if (calc_hashtabsize(2)!=0) { - construct_from_2_ex_via_exvector(lh,rh); - return; - } - hashtabsize=0; -#endif // def 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 { @@ -725,17 +640,17 @@ 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 { - expair p1=split_ex_to_pair(lh); - expair p2=split_ex_to_pair(rh); - - int cmpval=p1.rest.compare(p2.rest); + expair p1 = split_ex_to_pair(lh); + expair p2 = split_ex_to_pair(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); @@ -754,29 +669,28 @@ void expairseq::construct_from_2_ex(const ex & lh, const ex & rh) } } -void expairseq::construct_from_2_expairseq(const expairseq & s1, - const expairseq & s2) +void expairseq::construct_from_2_expairseq(const expairseq &s1, + const expairseq &s2) { combine_overall_coeff(s1.overall_coeff); combine_overall_coeff(s2.overall_coeff); - epvector::const_iterator first1=s1.seq.begin(); - epvector::const_iterator last1=s1.seq.end(); - epvector::const_iterator first2=s2.seq.begin(); - epvector::const_iterator last2=s2.seq.end(); + auto first1 = s1.seq.begin(), last1 = s1.seq.end(); + auto first2 = s2.seq.begin(), last2 = s2.seq.end(); seq.reserve(s1.seq.size()+s2.seq.size()); bool needs_further_processing=false; while (first1!=last1 && first2!=last2) { - int cmpval=(*first1).rest.compare((*first2).rest); + 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; } @@ -800,59 +714,57 @@ void expairseq::construct_from_2_expairseq(const expairseq & s1, seq.push_back(*first2); ++first2; } - + if (needs_further_processing) { - epvector v=seq; - seq.clear(); - construct_from_epvector(v); + // Clear seq and start over. + epvector v = std::move(seq); + construct_from_epvector(std::move(v)); } } -void expairseq::construct_from_expairseq_ex(const expairseq & s, - const ex & e) +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; + seq = s.seq; return; } - - epvector::const_iterator first=s.seq.begin(); - epvector::const_iterator last=s.seq.end(); - expair p=split_ex_to_pair(e); - + + auto first = s.seq.begin(), last = s.seq.end(); + expair p = split_ex_to_pair(e); + seq.reserve(s.seq.size()+1); - bool p_pushed=0; - + bool p_pushed = false; + bool needs_further_processing=false; - + // 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=1; + p_pushed = true; break; } else if (cmpval<0) { seq.push_back(*first); ++first; } else { seq.push_back(p); - p_pushed=1; + p_pushed = true; break; } } - + if (p_pushed) { // while loop exited because p was pushed, now push rest of s.seq while (first!=last) { @@ -865,673 +777,226 @@ void expairseq::construct_from_expairseq_ex(const expairseq & s, } if (needs_further_processing) { - epvector v=seq; - seq.clear(); - construct_from_epvector(v); + // Clear seq and start over. + epvector v = std::move(seq); + construct_from_epvector(std::move(v)); } } -void expairseq::construct_from_exvector(const exvector & v) +void expairseq::construct_from_exvector(const exvector &v) { // 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()) + // +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric) // (same for (+,*) -> (*,^) make_flat(v); -#ifdef EXPAIRSEQ_USE_HASHTAB - combine_same_terms(); -#else canonicalize(); combine_same_terms_sorted_seq(); -#endif // def 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 (+,*) -> (*,^) + // +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric) + // same for (+,*) -> (*,^) - make_flat(v); -#ifdef EXPAIRSEQ_USE_HASHTAB - combine_same_terms(); -#else + make_flat(v, do_index_renaming); canonicalize(); combine_same_terms_sorted_seq(); -#endif // def EXPAIRSEQ_USE_HASHTAB } -void expairseq::make_flat(const exvector & v) +void expairseq::construct_from_epvector(epvector &&v, bool do_index_renaming) { - exvector::const_iterator cit, citend = v.end(); + // 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(std::move(v), do_index_renaming); + canonicalize(); + combine_same_terms_sorted_seq(); +} +/** Combine this expairseq with argument exvector. + * It cares for associativity as well as for special handling of numerics. */ +void expairseq::make_flat(const exvector &v) +{ // count number of operands which are of same expairseq derived type // and their cumulative number of operands - int nexpairseqs=0; - int noperands=0; - cit=v.begin(); - while (cit!=citend) { - if (cit->bp->tinfo()==tinfo()) { - nexpairseqs++; - noperands+=ex_to_expairseq(*cit).seq.size(); + int nexpairseqs = 0; + int noperands = 0; + bool do_idx_rename = false; + + for (auto & cit : v) { + if (typeid(ex_to(cit)) == typeid(*this)) { + ++nexpairseqs; + noperands += ex_to(cit).seq.size(); } - ++cit; + if (is_a(*this) && (!do_idx_rename) && + cit.info(info_flags::has_indices)) + do_idx_rename = true; } - + // reserve seq and coeffseq which will hold all operands seq.reserve(v.size()+noperands-nexpairseqs); - + // copy elements and split off numerical part - cit=v.begin(); - while (cit!=citend) { - if (cit->bp->tinfo()==tinfo()) { - const expairseq & subseqref=ex_to_expairseq(*cit); + make_flat_inserter mf(v, do_idx_rename); + for (auto & cit : v) { + 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()) { - seq.push_back(*cit_s); - ++cit_s; + for (auto & cit_s : subseqref.seq) { + seq.push_back(cit_s); } } else { - if (is_ex_exactly_of_type(*cit,numeric)) { - combine_overall_coeff(*cit); - } else { - seq.push_back(split_ex_to_pair(*cit)); + if (is_exactly_a(cit)) + combine_overall_coeff(cit); + else { + ex newfactor = mf.handle_factor(cit, _ex1); + seq.push_back(split_ex_to_pair(newfactor)); } } - ++cit; } - - /* - cout << "after make flat" << std::endl; - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - (*cit).printraw(cout); - } - cout << std::endl; - */ } -void expairseq::make_flat(const epvector & 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, bool do_index_renaming) { - epvector::const_iterator cit, citend = v.end(); - // count number of operands which are of same expairseq derived type // and their cumulative number of operands - int nexpairseqs=0; - int noperands=0; - - cit = v.begin(); - while (cit!=citend) { - if (cit->rest.bp->tinfo()==tinfo()) { - nexpairseqs++; - noperands += ex_to_expairseq((*cit).rest).seq.size(); + int nexpairseqs = 0; + int noperands = 0; + bool really_need_rename_inds = false; + + for (auto & cit : v) { + if (typeid(ex_to(cit.rest)) == typeid(*this)) { + ++nexpairseqs; + noperands += ex_to(cit.rest).seq.size(); } - ++cit; + if ((!really_need_rename_inds) && is_a(*this) && + cit.rest.info(info_flags::has_indices)) + really_need_rename_inds = true; } - + 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!=citend) { - if ((cit->rest.bp->tinfo()==tinfo())&&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)); - 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(combine_pair_with_coeff_to_pair(*cit_s, - // (*cit).coeff)); - ++cit_s; + for (auto & cit : v) { + if (typeid(ex_to(cit.rest)) == typeid(*this) && + this->can_make_flat(cit)) { + 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)); + for (auto & cit_s : subseqref.seq) { + seq.push_back(expair(cit_s.rest, + ex_to(cit_s.coeff).mul_dyn(ex_to(cit.coeff)))); } } else { - if ((*cit).is_numeric_with_coeff_1()) { - combine_overall_coeff((*cit).rest); - //if (is_ex_exactly_of_type((*cit).rest,numeric)) { - // combine_overall_coeff(recombine_pair_to_ex(*cit)); - } else { - seq.push_back(*cit); + if (cit.is_canonical_numeric()) + 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; } } -epvector * expairseq::bubblesort(epvector::iterator itbegin, epvector::iterator itend) +/** Brings this expairseq into a sorted (canonical) form. */ +void expairseq::canonicalize() { - unsigned n=itend-itbegin; - - epvector * sp=new epvector; - sp->reserve(n); - - epvector::iterator last=itend-1; - for (epvector::iterator it1=itbegin; it1!=last; ++it1) { - for (epvector::iterator it2=it1+1; it2!=itend; ++it2) { - if ((*it2).rest.compare((*it1).rest)<0) { - iter_swap(it1,it2); - } - } - sp->push_back(*it1); - } - sp->push_back(*last); - return sp; + std::sort(seq.begin(), seq.end(), expair_rest_is_less()); } -epvector * expairseq::mergesort(epvector::iterator itbegin, epvector::iterator itend) -{ - unsigned n=itend-itbegin; - /* - if (n==1) { - epvector * sp=new epvector; - sp->push_back(*itbegin); - return sp; - } - */ - if (n<16) return bubblesort(itbegin, itend); - unsigned m=n/2; - - epvector * s1p=mergesort(itbegin, itbegin+m); - epvector * s2p=mergesort(itbegin+m, itend); - - epvector * sp=new epvector; - sp->reserve(s1p->size()+s2p->size()); - epvector::iterator first1=s1p->begin(); - epvector::iterator last1=s1p->end(); - - epvector::iterator first2=s2p->begin(); - epvector::iterator last2=s2p->end(); - - while (first1 != last1 && first2 != last2) { - if ((*first1).rest.compare((*first2).rest)<0) { - sp->push_back(*first1); - ++first1; - } else { - sp->push_back(*first2); - ++first2; - } - } - - if (first1 != last1) { - while (first1 != last1) { - sp->push_back(*first1); - ++first1; - } - } else { - while (first2 != last2) { - sp->push_back(*first2); - ++first2; - } - } - - delete s1p; - delete s2p; - - return sp; -} - - -void expairseq::canonicalize(void) +/** 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() { - // canonicalize - sort(seq.begin(),seq.end(),expair_is_less()); - /* - sort(seq.begin(),seq.end(),expair_is_less_old()); - if (seq.size()>1) { - if (is_ex_exactly_of_type((*(seq.begin())).rest,numeric)) { - sort(seq.begin(),seq.end(),expair_is_less()); - } else { - epvector::iterator last_numeric=seq.end(); - do { - last_numeric--; - } while (is_ex_exactly_of_type((*last_numeric).rest,numeric)); - last_numeric++; - sort(last_numeric,seq.end(),expair_is_less()); - } - } - */ - - /* - epvector * sorted_seqp=mergesort(seq.begin(),seq.end()); - epvector::iterator last=sorted_seqp->end(); - epvector::iterator it2=seq.begin(); - for (epvector::iterator it1=sorted_seqp->begin(); it1!=last; ++it1, ++it2) { - iter_swap(it1,it2); - } - delete sorted_seqp; - */ - - /* - cout << "after canonicalize" << std::endl; - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - (*cit).printraw(cout); - } - cout << std::endl; - cout.flush(); - */ -} - -void expairseq::combine_same_terms_sorted_seq(void) -{ - bool needs_further_processing=false; - - // combine same terms, drop term with coeff 0 - 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; - } - ++itin2; - } - if (!ex_to_numeric((*itin1).coeff).is_zero()) { - if (must_copy) { - *itout=*itin1; - } - ++itout; - } - if (itout!=last) { - seq.erase(itout,last); - } - } - - /* - cout << "after combine" << std::endl; - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - (*cit).printraw(cout); - } - cout << std::endl; - cout.flush(); - */ - - if (needs_further_processing) { - epvector v=seq; - seq.clear(); - construct_from_epvector(v); - } -} - -#ifdef EXPAIRSEQ_USE_HASHTAB - -unsigned expairseq::calc_hashtabsize(unsigned sz) const -{ - unsigned size; - unsigned nearest_power_of_2 = 1 << log2(sz); - // if (nearest_power_of_2 < maxhashtabsize/hashtabfactor) { - // size=nearest_power_of_2*hashtabfactor; - size=nearest_power_of_2/hashtabfactor; - if (size=0); - GINAC_ASSERT((hashindex & touched, - unsigned & number_of_zeroes) -{ - epp current=seq.begin(); - - while (current!=first_numeric) { - if (is_ex_exactly_of_type((*current).rest,numeric)) { - --first_numeric; - iter_swap(current,first_numeric); - } else { - // calculate hashindex - 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)) break; - ++epplit; - } - if (epplit==eppl.end()) { - // no matching expair found, append this to end of list - sorted_insert(eppl,current); - ++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)); - - // 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 - iter_swap(current,last_non_zero); - --first_numeric; - if (first_numeric!=last_non_zero) iter_swap(first_numeric,current); - --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; - } - } - } -} + if (seq.size()<2) + return; -void expairseq::drop_coeff_0_terms(epvector::iterator & first_numeric, - epvector::iterator & last_non_zero, - vector & touched, - unsigned & number_of_zeroes) -{ - // 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; - while (current!=first_numeric) { - if (!touched[i]) { - ++current; - ++i; - } else if (!ex_to_numeric((*current).coeff).is_equal(_num0())) { - ++current; - ++i; + bool needs_further_processing = false; + + auto itin1 = seq.begin(); + auto itin2 = itin1 + 1; + auto itout = itin1; + auto 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 { - remove_hashtab_entry(current); - - // move element to the end, unless it is already at the end - 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); - epvector::iterator changed_entry; - - if (numeric_swapped) { - changed_entry=first_numeric; - } else { - changed_entry=last_non_zero; - } - - --last_non_zero; - ++number_of_zeroes; - - if (first_numeric!=current) { - - // change entry in hashtab which referred to first_numeric or last_non_zero to current - move_hashtab_entry(changed_entry,current); - touched[current-seq.begin()]=touched[changed_entry-seq.begin()]; - } - } else { - --first_numeric; - --last_non_zero; - ++number_of_zeroes; + if (!ex_to(itin1->coeff).is_zero()) { + if (must_copy) + *itout = *itin1; + ++itout; } + itin1 = itin2; } + ++itin2; } - GINAC_ASSERT(i==current-seq.begin()); -} - -bool expairseq::has_coeff_0(void) const -{ - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - if ((*cit).coeff.is_equal(_ex0())) { - return true; - } - } - return false; -} - -void expairseq::add_numerics_to_hashtab(epvector::iterator first_numeric, - epvector::const_iterator last_non_zero) -{ - 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); - ++current; + if (!ex_to(itin1->coeff).is_zero()) { + if (must_copy) + *itout = *itin1; + ++itout; } -} - -void expairseq::combine_same_terms(void) -{ - // combine same terms, drop term with coeff 0, move numerics to end - - // calculate size of hashtab - hashtabsize=calc_hashtabsize(seq.size()); + if (itout!=last) + seq.erase(itout,last); - // hashtabsize is a power of 2 - hashmask=hashtabsize-1; - - // allocate hashtab - hashtab.clear(); - hashtab.resize(hashtabsize); - - if (hashtabsize==0) { - canonicalize(); - combine_same_terms_sorted_seq(); - GINAC_ASSERT(!has_coeff_0()); - return; - } - - // iterate through seq, move numerics to end, - // fill hashtab and combine same terms - epvector::iterator first_numeric=seq.end(); - epvector::iterator last_non_zero=seq.end()-1; - - vector touched; - touched.reserve(seq.size()); - for (unsigned i=0; i0) return 1; // not canoncalized -#endif // def EXPAIRSEQ_USE_HASHTAB + if (seq.size() <= 1) + return 1; - epvector::const_iterator it = seq.begin(); - 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)) { + auto it = seq.begin(), itend = seq.end(); + auto it_last = it; + 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)) { - printpair(std::clog,*it_last,0); + 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); + printpair(std::clog, *it, 0); std::clog << "\n"; std::clog << "pair1:" << std::endl; - (*it_last).rest.printtree(std::clog); - (*it_last).coeff.printtree(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.printtree(std::clog); - (*it).coeff.printtree(std::clog); + it->rest.print(print_tree(std::clog)); + it->coeff.print(print_tree(std::clog)); return 0; } } @@ -1540,32 +1005,38 @@ bool expairseq::is_canonical() const return 1; } -epvector * expairseq::expandchildren(unsigned options) const +/** Member-wise expand the expairs in this sequence. + * + * @see expairseq::expand() + * @return epvector containing expanded pairs, empty if no members + * had to be changed. */ +epvector expairseq::expandchildren(unsigned options) const { - epvector::const_iterator last = seq.end(); - epvector::const_iterator cit = seq.begin(); + auto cit = seq.begin(), last = seq.end(); 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; - s->reserve(seq.size()); - + epvector s; + s.reserve(seq.size()); + // copy parts of seq which are known not to have changed - epvector::const_iterator cit2 = seq.begin(); + auto cit2 = seq.begin(); while (cit2!=cit) { - s->push_back(*cit2); + s.push_back(*cit2); ++cit2; } + // copy first changed element - s->push_back(combine_ex_with_coeff_to_pair(expanded_ex, - (*cit2).coeff)); + 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), - (*cit2).coeff)); + s.push_back(combine_ex_with_coeff_to_pair(cit2->rest.expand(options), + cit2->coeff)); ++cit2; } return s; @@ -1573,162 +1044,152 @@ epvector * expairseq::expandchildren(unsigned options) const ++cit; } - return 0; // nothing has changed + return epvector(); // empty signalling nothing has changed } - -epvector * 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; - } - if (level == -max_recursion_level) { - throw(std::runtime_error("max recursion level reached")); - } +/** Member-wise evaluate the expairs in this sequence. + * + * @see expairseq::eval() + * @return epvector containing evaluated pairs, empty if no members + * had to be changed. */ +epvector expairseq::evalchildren(int level) const +{ + if (likely(level==1)) + return epvector(); // nothing had to be evaluated + + 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(); + auto cit = seq.begin(), last = seq.end(); 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; - s->reserve(seq.size()); - + epvector s; + s.reserve(seq.size()); + // copy parts of seq which are known not to have changed - epvector::const_iterator cit2=seq.begin(); + auto cit2 = seq.begin(); while (cit2!=cit) { - s->push_back(*cit2); + s.push_back(*cit2); ++cit2; } + // copy first changed element - s->push_back(combine_ex_with_coeff_to_pair(evaled_ex, - (*cit2).coeff)); + 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), - (*cit2).coeff)); + s.push_back(combine_ex_with_coeff_to_pair(cit2->rest.eval(level), + cit2->coeff)); ++cit2; } - return s; + return std::move(s); } ++cit; } - - return 0; // nothing has changed -} -epvector expairseq::evalfchildren(int level) const -{ - if (level==1) - return seq; + return epvector(); // signalling nothing has changed +} - 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))); +/** Member-wise substitute in this sequence. + * + * @see expairseq::subs() + * @return epvector containing expanded pairs, empty if no members + * had to be changed. */ +epvector 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 (auto & it : m) { + 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; -} -epvector expairseq::normalchildren(int level) const -{ - if (level==1) - return seq; - - if (level == -max_recursion_level) - throw(std::runtime_error("max recursion level reached")); + if (options & subs_options::pattern_is_product) { - epvector s; - s.reserve(seq.size()); + // Substitute in the recombined pairs + auto cit = seq.begin(), last = seq.end(); + while (cit != last) { - --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; -} + 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)) { -epvector expairseq::diffchildren(const symbol & y) const -{ - epvector s; - s.reserve(seq.size()); + // Something changed, copy seq, subs and return it + 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; -} + // Copy parts of seq which are known not to have changed + s.insert(s.begin(), seq.begin(), cit); -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 + auto 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 + epvector s; + 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; // nothing has changed + // Nothing has changed + return epvector(); } ////////// // static member variables ////////// -// protected - -unsigned expairseq::precedence=10; - -#ifdef EXPAIRSEQ_USE_HASHTAB -unsigned expairseq::maxhashtabsize=0x4000000U; -unsigned expairseq::minhashtabsize=0x1000U; -unsigned expairseq::hashtabfactor=1; -#endif // def EXPAIRSEQ_USE_HASHTAB - -#ifndef NO_NAMESPACE_GINAC } // namespace GiNaC -#endif // ndef NO_NAMESPACE_GINAC