X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=3ed9e2892a23040c8bbb8e2ce4bf3ebfed36705f;hp=5c9e38614913f87de6529fd63c7bd7d8a289070a;hb=77b6a0304a48d6a306deeda18177680f16025b33;hpb=695f6ae955ec530cded8f21efd5569df39447f76 diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index 5c9e3861..3ed9e289 100644 --- a/ginac/expairseq.cpp +++ b/ginac/expairseq.cpp @@ -3,7 +3,7 @@ * Implementation of sequences of expression pairs. */ /* - * GiNaC Copyright (C) 1999-2005 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2008 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,16 +17,18 @@ * * 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 #include "expairseq.h" #include "lst.h" +#include "add.h" #include "mul.h" #include "power.h" #include "relational.h" @@ -34,6 +36,7 @@ #include "archive.h" #include "operators.h" #include "utils.h" +#include "indexed.h" #if EXPAIRSEQ_USE_HASHTAB #include @@ -66,7 +69,7 @@ public: // public -expairseq::expairseq() : inherited(TINFO_expairseq) +expairseq::expairseq() : inherited(&expairseq::tinfo_static) #if EXPAIRSEQ_USE_HASHTAB , hashtabsize(0) #endif // EXPAIRSEQ_USE_HASHTAB @@ -105,32 +108,32 @@ void expairseq::copy(const expairseq &other) // other constructors ////////// -expairseq::expairseq(const ex &lh, const ex &rh) : inherited(TINFO_expairseq) +expairseq::expairseq(const ex &lh, const ex &rh) : inherited(&expairseq::tinfo_static) { construct_from_2_ex(lh,rh); GINAC_ASSERT(is_canonical()); } -expairseq::expairseq(const exvector &v) : inherited(TINFO_expairseq) +expairseq::expairseq(const exvector &v) : inherited(&expairseq::tinfo_static) { 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) + : inherited(&expairseq::tinfo_static), 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(std::auto_ptr vp, const ex &oc) - : inherited(TINFO_expairseq), overall_coeff(oc) +expairseq::expairseq(std::auto_ptr vp, const ex &oc, bool do_index_renaming) + : inherited(&expairseq::tinfo_static), overall_coeff(oc) { GINAC_ASSERT(vp.get()!=0); GINAC_ASSERT(is_a(oc)); - construct_from_epvector(*vp); + construct_from_epvector(*vp, do_index_renaming); GINAC_ASSERT(is_canonical()); } @@ -143,13 +146,17 @@ expairseq::expairseq(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst , hashtabsize(0) #endif { - for (unsigned int i=0; true; i++) { + 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); @@ -261,6 +268,26 @@ void expairseq::do_print_tree(const print_tree & c, unsigned level) const 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); } @@ -283,7 +310,7 @@ ex expairseq::op(size_t i) const ex expairseq::map(map_function &f) const { std::auto_ptr v(new epvector); - v->reserve(seq.size()); + v->reserve(seq.size()+1); epvector::const_iterator cit = seq.begin(), last = seq.end(); while (cit != last) { @@ -292,9 +319,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. */ @@ -346,6 +380,17 @@ ex expairseq::conjugate() const return result; } +bool expairseq::is_polynomial(const ex & var) const +{ + if (!is_exactly_a(*this) && !is_exactly_a(*this)) + return basic::is_polynomial(var); + for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) { + if (!(i->rest).is_polynomial(var)) + return false; + } + return true; +} + bool expairseq::match(const ex & pattern, lst & repl_lst) const { // This differs from basic::match() because we want "a+b+c+d" to @@ -382,10 +427,20 @@ bool expairseq::match(const ex & pattern, lst & repl_lst) const continue; exvector::iterator it = ops.begin(), itend = ops.end(); while (it != itend) { + lst::const_iterator last_el = repl_lst.end(); + --last_el; if (it->match(p, repl_lst)) { ops.erase(it); goto found; } + while(true) { + lst::const_iterator next_el = last_el; + ++next_el; + if(next_el == repl_lst.end()) + break; + else + repl_lst.remove_last(); + } ++it; } return false; // no match found @@ -424,7 +479,7 @@ ex expairseq::subs(const exmap & m, unsigned options) const { std::auto_ptr vp = subschildren(m, options); if (vp.get()) - return ex_to(thisexpairseq(vp, overall_coeff)); + return ex_to(thisexpairseq(vp, overall_coeff, true)); else if ((options & subs_options::algebraic) && is_exactly_a(*this)) return static_cast(this)->algebraic_subs_mul(m, options); else @@ -570,7 +625,7 @@ unsigned expairseq::return_type() const unsigned expairseq::calchash() const { - unsigned v = golden_ratio_hash(this->tinfo()); + unsigned v = golden_ratio_hash((p_int)this->tinfo()); epvector::const_iterator i = seq.begin(); const epvector::const_iterator end = seq.end(); while (i != end) { @@ -619,14 +674,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(std::auto_ptr 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 @@ -757,8 +812,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 @@ -853,6 +915,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). @@ -968,14 +1031,14 @@ void expairseq::construct_from_exvector(const exvector &v) #endif // EXPAIRSEQ_USE_HASHTAB } -void expairseq::construct_from_epvector(const epvector &v) +void expairseq::construct_from_epvector(const epvector &v, bool do_index_renaming) { // simplifications: +(a,+(b,c),d) -> +(a,b,c,d) (associativity) // +(d,b,c,a) -> +(a,b,c,d) (canonicalization) // +(...,x,*(x,c1),*(x,c2)) -> +(...,*(x,1+c1+c2)) (c1, c2 numeric()) // (same for (+,*) -> (*,^) - make_flat(v); + make_flat(v, do_index_renaming); #if EXPAIRSEQ_USE_HASHTAB combine_same_terms(); #else @@ -994,6 +1057,7 @@ 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()) { @@ -1001,6 +1065,9 @@ void expairseq::make_flat(const exvector &v) ++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; } @@ -1008,10 +1075,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); + 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()) { @@ -1021,8 +1090,10 @@ void expairseq::make_flat(const exvector &v) } else { if (is_exactly_a(*cit)) combine_overall_coeff(*cit); - else - seq.push_back(split_ex_to_pair(*cit)); + else { + ex newfactor = mf.handle_factor(*cit, _ex1); + seq.push_back(split_ex_to_pair(newfactor)); + } } ++cit; } @@ -1030,7 +1101,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; @@ -1038,6 +1109,7 @@ 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()) { @@ -1045,18 +1117,24 @@ void expairseq::make_flat(const epvector &v) ++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() && 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(); @@ -1069,9 +1147,15 @@ void expairseq::make_flat(const epvector &v) } } else { if (cit->is_canonical_numeric()) - combine_overall_coeff(cit->rest); - else - seq.push_back(*cit); + combine_overall_coeff(mf.handle_factor(cit->rest, _ex1)); + else { + ex rest = cit->rest; + ex newrest = mf.handle_factor(rest, cit->coeff); + if (are_ex_trivially_equal(newrest, rest)) + seq.push_back(*cit); + else + seq.push_back(expair(newrest, cit->coeff)); + } } ++cit; } @@ -1579,7 +1663,6 @@ std::auto_ptr expairseq::evalchildren(int level) const return std::auto_ptr(0); // signalling nothing has changed } - /** Member-wise substitute in this sequence. * * @see expairseq::subs() @@ -1657,8 +1740,7 @@ std::auto_ptr expairseq::subschildren(const exmap & m, unsigned option // Copy rest while (cit != last) { - s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(m, options), - cit->coeff)); + s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(m, options), cit->coeff)); ++cit; } return s;