* Implementation of sequences of expression pairs. */
/*
- * GiNaC Copyright (C) 1999-2003 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)
+expairseq::expairseq(const epvector &v, const ex &oc, bool do_index_renaming)
+ : inherited(&expairseq::tinfo_static), overall_coeff(oc)
{
GINAC_ASSERT(is_a<numeric>(oc));
- construct_from_epvector(v);
+ construct_from_epvector(v, do_index_renaming);
GINAC_ASSERT(is_canonical());
}
-expairseq::expairseq(std::auto_ptr<epvector> vp, const ex &oc)
- : inherited(TINFO_expairseq), overall_coeff(oc)
+expairseq::expairseq(std::auto_ptr<epvector> vp, const ex &oc, bool do_index_renaming)
+ : inherited(&expairseq::tinfo_static), overall_coeff(oc)
{
- GINAC_ASSERT(vp!=0);
+ GINAC_ASSERT(vp.get()!=0);
GINAC_ASSERT(is_a<numeric>(oc));
- construct_from_epvector(*vp);
+ construct_from_epvector(*vp, do_index_renaming);
GINAC_ASSERT(is_canonical());
}
ex expairseq::map(map_function &f) const
{
std::auto_ptr<epvector> v(new epvector);
- v->reserve(seq.size());
+ v->reserve(seq.size()+1);
epvector::const_iterator cit = seq.begin(), last = seq.end();
while (cit != last) {
}
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<numeric>(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. */
return (new expairseq(vp, overall_coeff))->setflag(status_flags::dynallocated | status_flags::evaluated);
}
+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);
+ if (newepv) {
+ delete newepv;
+ }
+ 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
{
std::auto_ptr<epvector> vp = subschildren(m, options);
if (vp.get())
- return ex_to<basic>(thisexpairseq(vp, overall_coeff));
+ return ex_to<basic>(thisexpairseq(vp, overall_coeff, true));
else if ((options & subs_options::algebraic) && is_exactly_a<mul>(*this))
return static_cast<const mul *>(this)->algebraic_subs_mul(m, options);
else
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) {
* 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<epvector> vp, const ex &oc) const
+ex expairseq::thisexpairseq(std::auto_ptr<epvector> 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
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).
#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
seq.reserve(v.size()+noperands-nexpairseqs);
// copy elements and split off numerical part
+ make_flat_inserter mf(v, this->tinfo() == &mul::tinfo_static);
cit = v.begin();
while (cit!=v.end()) {
if (ex_to<basic>(*cit).tinfo()==this->tinfo()) {
- const expairseq &subseqref = ex_to<expairseq>(*cit);
+ ex newfactor = mf.handle_factor(*cit, _ex1);
+ const expairseq &subseqref = ex_to<expairseq>(newfactor);
combine_overall_coeff(subseqref.overall_coeff);
epvector::const_iterator cit_s = subseqref.seq.begin();
while (cit_s!=subseqref.seq.end()) {
} else {
if (is_exactly_a<numeric>(*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;
}
/** 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;
// 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<basic>(cit->rest).tinfo()==this->tinfo() &&
this->can_make_flat(*cit)) {
- const expairseq &subseqref = ex_to<expairseq>(cit->rest);
+ ex newrest = mf.handle_factor(cit->rest, cit->coeff);
+ const expairseq &subseqref = ex_to<expairseq>(newrest);
combine_overall_coeff(ex_to<numeric>(subseqref.overall_coeff),
ex_to<numeric>(cit->coeff));
epvector::const_iterator cit_s = subseqref.seq.begin();
}
} 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;
}
return std::auto_ptr<epvector>(0); // signalling nothing has changed
}
-
/** Member-wise substitute in this sequence.
*
* @see expairseq::subs()
// 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;
git://www.ginac.de / ginac.git / blobdiff