* Implementation of sequences of expression pairs. */
/*
- * GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2006 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
*
* 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 <iostream>
#include "expairseq.h"
#include "lst.h"
+#include "add.h"
#include "mul.h"
#include "power.h"
#include "relational.h"
#include "archive.h"
#include "operators.h"
#include "utils.h"
+#include "indexed.h"
#if EXPAIRSEQ_USE_HASHTAB
#include <cmath>
// public
-expairseq::expairseq() : inherited(TINFO_expairseq)
+expairseq::expairseq() : inherited(&expairseq::tinfo_static)
#if EXPAIRSEQ_USE_HASHTAB
, hashtabsize(0)
#endif // EXPAIRSEQ_USE_HASHTAB
// 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)
+ : inherited(&expairseq::tinfo_static), overall_coeff(oc)
{
GINAC_ASSERT(is_a<numeric>(oc));
construct_from_epvector(v);
}
expairseq::expairseq(std::auto_ptr<epvector> vp, const ex &oc)
- : inherited(TINFO_expairseq), overall_coeff(oc)
+ : inherited(&expairseq::tinfo_static), overall_coeff(oc)
{
GINAC_ASSERT(vp.get()!=0);
GINAC_ASSERT(is_a<numeric>(oc));
return result;
}
+bool expairseq::is_polynomial(const ex & var) const
+{
+ if (!is_exactly_a<add>(*this) && !is_exactly_a<mul>(*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
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
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) {
construct_from_2_ex_via_exvector(lh,rh);
} else {
#endif // EXPAIRSEQ_USE_HASHTAB
- construct_from_2_expairseq(ex_to<expairseq>(lh),
- ex_to<expairseq>(rh));
+ if(is_a<mul>(lh))
+ {
+ ex newrh=rename_dummy_indices_uniquely(lh, rh);
+ construct_from_2_expairseq(ex_to<expairseq>(lh),
+ ex_to<expairseq>(newrh));
+ }
+ else
+ construct_from_2_expairseq(ex_to<expairseq>(lh),
+ ex_to<expairseq>(rh));
#if EXPAIRSEQ_USE_HASHTAB
}
#endif // EXPAIRSEQ_USE_HASHTAB
while (first1!=last1 && first2!=last2) {
int cmpval = (*first1).rest.compare((*first2).rest);
+
if (cmpval==0) {
// combine terms
const numeric &newcoeff = ex_to<numeric>(first1->coeff).
seq.reserve(v.size()+noperands-nexpairseqs);
// copy elements and split off numerical part
+ exvector dummy_indices;
cit = v.begin();
while (cit!=v.end()) {
if (ex_to<basic>(*cit).tinfo()==this->tinfo()) {
- const expairseq &subseqref = ex_to<expairseq>(*cit);
- combine_overall_coeff(subseqref.overall_coeff);
- epvector::const_iterator cit_s = subseqref.seq.begin();
- while (cit_s!=subseqref.seq.end()) {
+ const expairseq *subseqref;
+ ex newfactor;
+ if(is_a<mul>(*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<expairseq>(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<exvector>(new_dummy_indices), ex_is_less());
+ dummy_indices.swap(new_dummy_indices);
+ }
+ else
+ subseqref = &ex_to<expairseq>(*cit);
+ 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;
}
return std::auto_ptr<epvector>(0); // signalling nothing has changed
}
+class safe_inserter
+{
+ public:
+ safe_inserter(const ex&, const bool disable_renaming=false);
+ std::auto_ptr<epvector> 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<epvector> 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<mul>(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<exvector>(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<exvector>(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.
*
if (!are_ex_trivially_equal(orig_ex, subsed_ex)) {
// Something changed, copy seq, subs and return it
- std::auto_ptr<epvector> s(new epvector);
- s->reserve(seq.size());
+ safe_inserter s(*this, options & subs_options::no_index_renaming);
// Copy parts of seq which are known not to have changed
- s->insert(s->begin(), seq.begin(), cit);
+ for(epvector::const_iterator i=seq.begin(); i!=cit; ++i)
+ s.insert_old_pair(*i);
// Copy first changed element
- s->push_back(split_ex_to_pair(subsed_ex));
+ s.insert_new_pair(split_ex_to_pair(subsed_ex), orig_ex);
++cit;
// Copy rest
while (cit != last) {
- s->push_back(split_ex_to_pair(recombine_pair_to_ex(*cit).subs(m, options)));
+ 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);
++cit;
}
- return s;
+ return s.getseq();
}
++cit;
if (!are_ex_trivially_equal(cit->rest, subsed_ex)) {
// Something changed, copy seq, subs and return it
- std::auto_ptr<epvector> s(new epvector);
- s->reserve(seq.size());
+ safe_inserter s(*this, options & subs_options::no_index_renaming);
// Copy parts of seq which are known not to have changed
- s->insert(s->begin(), seq.begin(), cit);
+ for(epvector::const_iterator i=seq.begin(); i!=cit; ++i)
+ s.insert_old_pair(*i);
// Copy first changed element
- s->push_back(combine_ex_with_coeff_to_pair(subsed_ex, cit->coeff));
+ s.insert_new_pair(combine_ex_with_coeff_to_pair(subsed_ex, cit->coeff), cit->rest);
++cit;
// Copy rest
while (cit != last) {
- s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(m, options),
- cit->coeff));
+ 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);
++cit;
}
- return s;
+ return s.getseq();
}
++cit;
git://www.ginac.de / ginac.git / blobdiff