X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=296575a8382f770ae26bc714ab9ebb02806bdbe6;hp=4dffafac0806ee747c0004babbcb39aa005ee55b;hb=95ede03f00106be5fb087d76c86ca5c27edb9122;hpb=619d77d2676f7f1a562fb9fefc0ba6754fe2d750 diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index 4dffafac..296575a8 100644 --- a/ginac/expairseq.cpp +++ b/ginac/expairseq.cpp @@ -3,7 +3,7 @@ * Implementation of sequences of expression pairs. */ /* - * GiNaC Copyright (C) 1999-2007 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2010 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,20 +108,20 @@ 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, bool do_index_renaming) - : inherited(&expairseq::tinfo_static), overall_coeff(oc) + : overall_coeff(oc) { GINAC_ASSERT(is_a(oc)); construct_from_epvector(v, do_index_renaming); @@ -128,7 +129,7 @@ expairseq::expairseq(const epvector &v, const ex &oc, bool do_index_renaming) } expairseq::expairseq(std::auto_ptr vp, const ex &oc, bool do_index_renaming) - : inherited(&expairseq::tinfo_static), overall_coeff(oc) + : overall_coeff(oc) { GINAC_ASSERT(vp.get()!=0); GINAC_ASSERT(is_a(oc)); @@ -140,11 +141,9 @@ expairseq::expairseq(std::auto_ptr vp, const ex &oc, bool do_index_ren // 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) { + 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; @@ -176,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 @@ -267,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); } @@ -370,12 +388,12 @@ bool expairseq::is_polynomial(const ex & var) const 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 @@ -406,20 +424,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 @@ -437,11 +445,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 { @@ -604,7 +612,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) { @@ -782,8 +790,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(); @@ -791,8 +799,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)); @@ -817,7 +825,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) { @@ -1036,13 +1044,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; } @@ -1050,10 +1062,10 @@ 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, this->tinfo() == &mul::tinfo_static); + make_flat_inserter mf(v, do_idx_rename); cit = v.begin(); while (cit!=v.end()) { - if (ex_to(*cit).tinfo()==this->tinfo()) { + 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); @@ -1084,15 +1096,20 @@ void expairseq::make_flat(const epvector &v, bool do_index_renaming) // 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); @@ -1101,7 +1118,7 @@ void expairseq::make_flat(const epvector &v, bool 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)) { ex newrest = mf.handle_factor(cit->rest, cit->coeff); const expairseq &subseqref = ex_to(newrest);