X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=7c6e5223653889730407aa0fd5a246417cc06f6d;hp=9d72a7873c45ee23a4a4ceb0236a62571dfafe09;hb=5bf87cea66bb2071222c2910ed68c2649a98906c;hpb=73f0ce4cf8d91f073f35a45443f5fbe886921c5c diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index 9d72a787..7c6e5223 100644 --- a/ginac/expairseq.cpp +++ b/ginac/expairseq.cpp @@ -3,7 +3,7 @@ * Implementation of sequences of expression pairs. */ /* - * GiNaC Copyright (C) 1999-2006 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 @@ -20,11 +20,6 @@ * 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" @@ -35,11 +30,17 @@ #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 { @@ -68,9 +69,9 @@ public: // public -expairseq::expairseq() : inherited(&expairseq::tinfo_static) +expairseq::expairseq() #if EXPAIRSEQ_USE_HASHTAB - , hashtabsize(0) + : hashtabsize(0) #endif // EXPAIRSEQ_USE_HASHTAB {} @@ -107,32 +108,32 @@ void expairseq::copy(const expairseq &other) // other constructors ////////// -expairseq::expairseq(const ex &lh, const ex &rh) : inherited(&expairseq::tinfo_static) +expairseq::expairseq(const ex &lh, const ex &rh) { construct_from_2_ex(lh,rh); GINAC_ASSERT(is_canonical()); } -expairseq::expairseq(const exvector &v) : inherited(&expairseq::tinfo_static) +expairseq::expairseq(const exvector &v) { construct_from_exvector(v); GINAC_ASSERT(is_canonical()); } -expairseq::expairseq(const epvector &v, const ex &oc) - : inherited(&expairseq::tinfo_static), 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(std::auto_ptr vp, const ex &oc) - : inherited(&expairseq::tinfo_static), overall_coeff(oc) +expairseq::expairseq(std::auto_ptr vp, const ex &oc, bool do_index_renaming) + : 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()); } @@ -140,18 +141,20 @@ expairseq::expairseq(std::auto_ptr vp, const ex &oc) // archiving ////////// -expairseq::expairseq(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst) -#if EXPAIRSEQ_USE_HASHTAB - , hashtabsize(0) -#endif +void expairseq::read_archive(const archive_node &n, lst &sym_lst) { - for (unsigned int i=0; true; i++) { + inherited::read_archive(n, sym_lst); + archive_node::archive_node_cit first = n.find_first("rest"); + archive_node::archive_node_cit last = n.find_last("coeff"); + ++last; + seq.reserve((last-first)/2); + + for (archive_node::archive_node_cit loc = first; loc < last;) { ex rest; ex coeff; - if (n.find_ex("rest", rest, sym_lst, i) && n.find_ex("coeff", coeff, sym_lst, i)) - seq.push_back(expair(rest, coeff)); - else - break; + n.find_ex_by_loc(loc++, rest, sym_lst); + n.find_ex_by_loc(loc++, coeff, sym_lst); + seq.push_back(expair(rest, coeff)); } n.find_ex("overall_coeff", overall_coeff, sym_lst); @@ -172,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 @@ -263,6 +265,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); } @@ -285,7 +307,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) { @@ -294,9 +316,16 @@ ex expairseq::map(map_function &f) const } if (overall_coeff.is_equal(default_overall_coeff())) - return thisexpairseq(v, default_overall_coeff()); - else - return thisexpairseq(v, f(overall_coeff)); + return thisexpairseq(v, default_overall_coeff(), true); + else { + ex newcoeff = f(overall_coeff); + if(is_a(newcoeff)) + return thisexpairseq(v, newcoeff, true); + else { + v->push_back(split_ex_to_pair(newcoeff)); + return thisexpairseq(v, default_overall_coeff(), true); + } + } } /** Perform coefficient-wise automatic term rewriting rules in this class. */ @@ -342,29 +371,16 @@ ex expairseq::conjugate() const return *this; } ex result = thisexpairseq(newepv ? *newepv : seq, x); - if (newepv) { - delete newepv; - } + delete newepv; return result; } -bool expairseq::is_polynomial(const ex & var) const -{ - if (!is_exactly_a(*this) && !is_exactly_a(*this)) - return basic::is_polynomial(var); - for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) { - if (!(i->rest).is_polynomial(var)) - return false; - } - return true; -} - -bool expairseq::match(const ex & pattern, lst & repl_lst) const +bool expairseq::match(const ex & pattern, exmap & repl_lst) const { // This differs from basic::match() because we want "a+b+c+d" to // match "d+*+b" with "*" being "a+c", and we want to honor commutativity - if (this->tinfo() == ex_to(pattern).tinfo()) { + if (typeid(*this) == typeid(ex_to(pattern))) { // Check whether global wildcard (one that matches the "rest of the // expression", like "*" above) is present @@ -395,20 +411,10 @@ 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 @@ -426,11 +432,11 @@ found: ; for (size_t i=0; ipush_back(split_ex_to_pair(ops[i])); ex rest = thisexpairseq(vp, default_overall_coeff()); - for (lst::const_iterator it = repl_lst.begin(); it != repl_lst.end(); ++it) { - if (it->op(0).is_equal(global_wildcard)) - return rest.is_equal(it->op(1)); + for (exmap::const_iterator it = repl_lst.begin(); it != repl_lst.end(); ++it) { + if (it->first.is_equal(global_wildcard)) + return rest.is_equal(it->second); } - repl_lst.append(global_wildcard == rest); + repl_lst[global_wildcard] = rest; return true; } else { @@ -447,7 +453,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, (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 @@ -593,7 +599,7 @@ unsigned expairseq::return_type() const unsigned expairseq::calchash() const { - unsigned v = golden_ratio_hash((p_int)this->tinfo()); + unsigned v = make_hash_seed(typeid(*this)); epvector::const_iterator i = seq.begin(); const epvector::const_iterator end = seq.end(); while (i != end) { @@ -642,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(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 @@ -771,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(); @@ -780,8 +786,8 @@ 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 - if(is_a(lh)) - { + 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)); @@ -806,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) { @@ -867,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); @@ -922,7 +928,7 @@ 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_exactly_a(e)) { @@ -987,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); @@ -999,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 @@ -1025,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; } @@ -1039,35 +1049,25 @@ void expairseq::make_flat(const exvector &v) seq.reserve(v.size()+noperands-nexpairseqs); // copy elements and split off numerical part - exvector dummy_indices; + 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 newfactor; - if(is_a(*cit)) - { - exvector dummies_of_factor = get_all_dummy_indices(*cit); - sort(dummies_of_factor.begin(), dummies_of_factor.end(), ex_is_less()); - newfactor = rename_dummy_indices_uniquely(dummy_indices, dummies_of_factor, *cit); - subseqref = &(ex_to(newfactor)); - exvector new_dummy_indices; - set_union(dummy_indices.begin(), dummy_indices.end(), dummies_of_factor.begin(), dummies_of_factor.end(), std::back_insert_iterator(new_dummy_indices), ex_is_less()); - dummy_indices.swap(new_dummy_indices); - } - else - subseqref = &ex_to(*cit); - combine_overall_coeff(subseqref->overall_coeff); - epvector::const_iterator cit_s = subseqref->seq.begin(); - while (cit_s!=subseqref->seq.end()) { + 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; } } 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; } @@ -1075,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; @@ -1083,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(); @@ -1114,9 +1121,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; } @@ -1419,7 +1432,7 @@ bool expairseq::has_coeff_0() 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 @@ -1624,68 +1637,6 @@ std::auto_ptr expairseq::evalchildren(int level) const return std::auto_ptr(0); // signalling nothing has changed } -class safe_inserter -{ - public: - safe_inserter(const ex&, const bool disable_renaming=false); - std::auto_ptr getseq(){return epv;} - void insert_old_pair(const expair &p) - { - epv->push_back(p); - } - void insert_new_pair(const expair &p, const ex &orig_ex); - private: - std::auto_ptr epv; - bool dodummies; - exvector dummy_indices; - void update_dummy_indices(const exvector&); -}; - -safe_inserter::safe_inserter(const ex&e, const bool disable_renaming) - :epv(new epvector) -{ - epv->reserve(e.nops()); - dodummies=is_a(e); - if(disable_renaming) - dodummies=false; - if(dodummies) { - dummy_indices = get_all_dummy_indices_safely(e); - sort(dummy_indices.begin(), dummy_indices.end(), ex_is_less()); - } -} - -void safe_inserter::update_dummy_indices(const exvector &v) -{ - exvector new_dummy_indices; - set_union(dummy_indices.begin(), dummy_indices.end(), v.begin(), v.end(), - std::back_insert_iterator(new_dummy_indices), ex_is_less()); - dummy_indices.swap(new_dummy_indices); -} - -void safe_inserter::insert_new_pair(const expair &p, const ex &orig_ex) -{ - if(!dodummies) { - epv->push_back(p); - return; - } - exvector dummies_of_factor = get_all_dummy_indices_safely(p.rest); - if(dummies_of_factor.size() == 0) { - epv->push_back(p); - return; - } - sort(dummies_of_factor.begin(), dummies_of_factor.end(), ex_is_less()); - exvector dummies_of_orig_ex = get_all_dummy_indices_safely(orig_ex); - sort(dummies_of_orig_ex.begin(), dummies_of_orig_ex.end(), ex_is_less()); - exvector new_dummy_indices; - new_dummy_indices.reserve(dummy_indices.size()); - set_difference(dummy_indices.begin(), dummy_indices.end(), dummies_of_orig_ex.begin(), dummies_of_orig_ex.end(), - std::back_insert_iterator(new_dummy_indices), ex_is_less()); - dummy_indices.swap(new_dummy_indices); - ex newfactor = rename_dummy_indices_uniquely(dummy_indices, dummies_of_factor, p.rest); - update_dummy_indices(dummies_of_factor); - epv -> push_back(expair(newfactor, p.coeff)); -} - /** Member-wise substitute in this sequence. * * @see expairseq::subs() @@ -1720,27 +1671,22 @@ std::auto_ptr expairseq::subschildren(const exmap & m, unsigned option if (!are_ex_trivially_equal(orig_ex, subsed_ex)) { // Something changed, copy seq, subs and return it - safe_inserter s(*this, options & subs_options::no_index_renaming); + std::auto_ptr s(new epvector); + s->reserve(seq.size()); // Copy parts of seq which are known not to have changed - for(epvector::const_iterator i=seq.begin(); i!=cit; ++i) - s.insert_old_pair(*i); + s->insert(s->begin(), seq.begin(), cit); // Copy first changed element - s.insert_new_pair(split_ex_to_pair(subsed_ex), orig_ex); + s->push_back(split_ex_to_pair(subsed_ex)); ++cit; // Copy rest while (cit != last) { - ex orig_ex = recombine_pair_to_ex(*cit); - ex subsed_ex = orig_ex.subs(m, options); - if(are_ex_trivially_equal(orig_ex, subsed_ex)) - s.insert_old_pair(*cit); - else - s.insert_new_pair(split_ex_to_pair(subsed_ex), orig_ex); + s->push_back(split_ex_to_pair(recombine_pair_to_ex(*cit).subs(m, options))); ++cit; } - return s.getseq(); + return s; } ++cit; @@ -1756,27 +1702,22 @@ std::auto_ptr expairseq::subschildren(const exmap & m, unsigned option if (!are_ex_trivially_equal(cit->rest, subsed_ex)) { // Something changed, copy seq, subs and return it - safe_inserter s(*this, options & subs_options::no_index_renaming); + std::auto_ptr s(new epvector); + s->reserve(seq.size()); // Copy parts of seq which are known not to have changed - for(epvector::const_iterator i=seq.begin(); i!=cit; ++i) - s.insert_old_pair(*i); + s->insert(s->begin(), seq.begin(), cit); // Copy first changed element - s.insert_new_pair(combine_ex_with_coeff_to_pair(subsed_ex, cit->coeff), cit->rest); + s->push_back(combine_ex_with_coeff_to_pair(subsed_ex, cit->coeff)); ++cit; // Copy rest while (cit != last) { - const ex &orig_ex = cit->rest; - const ex &subsed_ex = cit->rest.subs(m, options); - if(are_ex_trivially_equal(orig_ex, subsed_ex)) - s.insert_old_pair(*cit); - else - s.insert_new_pair(combine_ex_with_coeff_to_pair(subsed_ex, cit->coeff), orig_ex); + s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(m, options), cit->coeff)); ++cit; } - return s.getseq(); + return s; } ++cit;