X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=7c6e5223653889730407aa0fd5a246417cc06f6d;hp=f46039d6c231cd34b9a04592591c6423015ea9fd;hb=bb0f99d6298fccb8cf1421fa0c7463c647f543a7;hpb=dbd9c306a74f1cb258c0d15a346b973b39deaad2 diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index f46039d6..7c6e5223 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-2011 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,32 +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_NO_CTORS(expairseq, basic) +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(expairseq, basic, + print_func(&expairseq::do_print). + print_func(&expairseq::do_print_tree)) + ////////// // helper classes @@ -58,31 +64,23 @@ public: }; ////////// -// default ctor, dtor, copy ctor, assignment operator and helpers +// default constructor ////////// // public -expairseq::expairseq(const expairseq &other) -{ - copy(other); -} - -const expairseq &expairseq::operator=(const expairseq &other) -{ - if (this != &other) { - destroy(true); - copy(other); - } - return *this; -} +expairseq::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 @@ -104,40 +102,38 @@ 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) +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()); } @@ -145,20 +141,26 @@ expairseq::expairseq(epvector *vp, const ex &oc) // archiving ////////// -expairseq::expairseq(const archive_node &n, const 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); + + canonicalize(); + GINAC_ASSERT(is_canonical()); } void expairseq::archive(archive_node &n) const @@ -173,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 @@ -181,101 +182,113 @@ DEFAULT_UNARCHIVE(expairseq) // public -basic *expairseq::duplicate() const +void expairseq::do_print(const print_context & c, unsigned level) const { - 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 { - 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 { + 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); } -unsigned expairseq::nops() const +size_t expairseq::nops() const { if (overall_coeff.is_equal(default_overall_coeff())) return seq.size(); @@ -283,23 +296,18 @@ unsigned expairseq::nops() const return seq.size()+1; } -ex expairseq::op(int i) const +ex expairseq::op(size_t i) const { - if (unsigned(i)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) { @@ -308,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. */ @@ -319,26 +334,60 @@ 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); } -bool expairseq::match(const ex & pattern, lst & repl_lst) const +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); + delete newepv; + return result; +} + +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 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; @@ -351,12 +400,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; ifirst.is_equal(global_wildcard)) + return rest.is_equal(it->second); } - repl_lst.append(global_wildcard == rest); + repl_lst[global_wildcard] = rest; return true; } else { @@ -400,13 +449,15 @@ 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 ex_to(thisexpairseq(vp, overall_coeff)); + std::auto_ptr vp = subschildren(m, options); + if (vp.get()) + return ex_to(thisexpairseq(vp, 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 basic::subs(ls, lr, no_pattern); + return subs_one_level(m, options); } // protected @@ -541,30 +592,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(this->tinfo()); - epvector::const_iterator i = seq.begin(), end = seq.end(); + unsigned v = make_hash_seed(typeid(*this)); + 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); @@ -576,12 +625,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); + } } ////////// @@ -598,14 +648,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 @@ -681,7 +731,7 @@ 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; } @@ -727,8 +777,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(); @@ -736,8 +786,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 @@ -755,7 +812,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) { @@ -777,8 +834,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 { @@ -786,7 +843,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 { @@ -816,7 +873,7 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh) } void expairseq::construct_from_2_expairseq(const expairseq &s1, - const expairseq &s2) + const expairseq &s2) { combine_overall_coeff(s1.overall_coeff); combine_overall_coeff(s2.overall_coeff); @@ -832,6 +889,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). @@ -870,10 +928,10 @@ void expairseq::construct_from_2_expairseq(const expairseq &s1, } void expairseq::construct_from_expairseq_ex(const expairseq &s, - const ex &e) + 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; @@ -935,7 +993,7 @@ 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); @@ -947,14 +1005,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 (+,*) -> (*,^) + // +(...,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 @@ -973,13 +1031,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; } @@ -987,10 +1049,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()) { @@ -998,10 +1062,12 @@ 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)); + else { + ex newfactor = mf.handle_factor(*cit, _ex1); + seq.push_back(split_ex_to_pair(newfactor)); + } } ++cit; } @@ -1009,7 +1075,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; @@ -1017,25 +1083,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(); @@ -1048,16 +1121,22 @@ 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; } } /** Brings this expairseq into a sorted (canonical) form. */ -void expairseq::canonicalize(void) +void expairseq::canonicalize() { std::sort(seq.begin(), seq.end(), expair_rest_is_less()); } @@ -1066,7 +1145,7 @@ 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(void) +void expairseq::combine_same_terms_sorted_seq() { if (seq.size()<2) return; @@ -1123,7 +1202,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 { @@ -1296,7 +1373,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; @@ -1343,7 +1420,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) { @@ -1355,7 +1432,7 @@ bool expairseq::has_coeff_0(void) const } void expairseq::add_numerics_to_hashtab(epvector::iterator first_numeric, - epvector::const_iterator last_non_zero) + epvector::const_iterator last_non_zero) { if (first_numeric == seq.end()) return; // no numerics @@ -1366,7 +1443,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 @@ -1392,7 +1469,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; @@ -1438,11 +1515,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); @@ -1467,7 +1544,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(); @@ -1476,7 +1553,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 @@ -1485,10 +1562,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), @@ -1500,7 +1579,7 @@ epvector * expairseq::expandchildren(unsigned options) const ++cit; } - return 0; // signalling nothing has changed + return std::auto_ptr(0); // signalling nothing has changed } @@ -1509,14 +1588,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")); @@ -1529,7 +1608,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 @@ -1538,10 +1617,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), @@ -1553,41 +1634,44 @@ 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 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 @@ -1599,7 +1683,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; @@ -1614,11 +1698,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 @@ -1630,8 +1714,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), - cit->coeff)); + s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(m, options), cit->coeff)); ++cit; } return s; @@ -1642,7 +1725,7 @@ epvector * expairseq::subschildren(const lst &ls, const lst &lr, bool no_pattern } // Nothing has changed - return NULL; + return std::auto_ptr(0); } //////////