* Implementation of sequences of expression pairs. */
/*
- * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2002 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#include <iostream>
#include <algorithm>
#include <string>
#include <stdexcept>
#include "expairseq.h"
#include "lst.h"
+#include "mul.h"
+#include "power.h"
#include "relational.h"
+#include "wildcard.h"
#include "print.h"
#include "archive.h"
-#include "debugmsg.h"
#include "utils.h"
#if EXPAIRSEQ_USE_HASHTAB
namespace GiNaC {
+
GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(expairseq, basic)
//////////
};
//////////
-// default ctor, dtor, copy ctor assignment operator and helpers
+// default ctor, dtor, copy ctor, assignment operator and helpers
//////////
// public
expairseq::expairseq(const expairseq &other)
{
- debugmsg("expairseq copy ctor",LOGLEVEL_CONSTRUCT);
copy(other);
}
const expairseq &expairseq::operator=(const expairseq &other)
{
- debugmsg("expairseq operator=",LOGLEVEL_ASSIGNMENT);
if (this != &other) {
destroy(true);
copy(other);
expairseq::expairseq(const ex &lh, const ex &rh) : inherited(TINFO_expairseq)
{
- debugmsg("expairseq ctor from ex,ex",LOGLEVEL_CONSTRUCT);
construct_from_2_ex(lh,rh);
GINAC_ASSERT(is_canonical());
}
expairseq::expairseq(const exvector &v) : inherited(TINFO_expairseq)
{
- debugmsg("expairseq ctor from exvector",LOGLEVEL_CONSTRUCT);
construct_from_exvector(v);
GINAC_ASSERT(is_canonical());
}
expairseq::expairseq(const epvector &v, const ex &oc)
: inherited(TINFO_expairseq), overall_coeff(oc)
{
- debugmsg("expairseq ctor from epvector,ex",LOGLEVEL_CONSTRUCT);
+ GINAC_ASSERT(is_a<numeric>(oc));
construct_from_epvector(v);
GINAC_ASSERT(is_canonical());
}
expairseq::expairseq(epvector *vp, const ex &oc)
: inherited(TINFO_expairseq), overall_coeff(oc)
{
- debugmsg("expairseq ctor from epvector *,ex",LOGLEVEL_CONSTRUCT);
GINAC_ASSERT(vp!=0);
+ GINAC_ASSERT(is_a<numeric>(oc));
construct_from_epvector(*vp);
delete vp;
GINAC_ASSERT(is_canonical());
, hashtabsize(0)
#endif
{
- debugmsg("expairseq ctor from archive_node", LOGLEVEL_CONSTRUCT);
for (unsigned int i=0; true; i++) {
ex rest;
ex coeff;
DEFAULT_UNARCHIVE(expairseq)
//////////
-// functions overriding virtual functions from bases classes
+// functions overriding virtual functions from base classes
//////////
// public
basic *expairseq::duplicate() const
{
- debugmsg("expairseq duplicate",LOGLEVEL_DUPLICATE);
return new expairseq(*this);
}
-void expairseq::print(const print_context & c, unsigned level) const
+void expairseq::print(const print_context &c, unsigned level) const
{
- debugmsg("expairseq print",LOGLEVEL_PRINT);
-
if (is_of_type(c, print_tree)) {
unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
throw(std::logic_error("let_op not defined for expairseq and derived classes (add,mul,...)"));
}
-ex expairseq::map(map_function & f) const
+ex expairseq::map(map_function &f) const
{
epvector *v = new epvector;
v->reserve(seq.size());
return thisexpairseq(v, f(overall_coeff));
}
+/** Perform coefficient-wise automatic term rewriting rules in this class. */
ex expairseq::eval(int level) const
{
if ((level==1) && (flags &status_flags::evaluated))
// 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 (tinfo() == pattern.bp->tinfo()) {
+ if (this->tinfo() == ex_to<basic>(pattern).tinfo()) {
// Check whether global wildcard (one that matches the "rest of the
// expression", like "*" above) is present
ex rest = thisexpairseq(vp, default_overall_coeff());
for (unsigned i=0; i<repl_lst.nops(); i++) {
if (repl_lst.op(i).op(0).is_equal(global_wildcard))
- return rest.is_equal(*repl_lst.op(i).op(1).bp);
+ return rest.is_equal(repl_lst.op(i).op(1));
}
repl_lst.append(global_wildcard == rest);
return true;
{
epvector *vp = subschildren(ls, lr, no_pattern);
if (vp)
- return thisexpairseq(vp, overall_coeff).bp->basic::subs(ls, lr, no_pattern);
+ return ex_to<basic>(thisexpairseq(vp, overall_coeff));
else
return basic::subs(ls, lr, no_pattern);
}
int expairseq::compare_same_type(const basic &other) const
{
- GINAC_ASSERT(is_of_type(other, expairseq));
+ GINAC_ASSERT(is_a<expairseq>(other));
const expairseq &o = static_cast<const expairseq &>(other);
int cmpval;
unsigned expairseq::calchash(void) const
{
- unsigned v = golden_ratio_hash(tinfo());
+ unsigned v = golden_ratio_hash(this->tinfo());
epvector::const_iterator i = seq.begin(), end = seq.end();
while (i != end) {
#if !EXPAIRSEQ_USE_HASHTAB
void expairseq::printpair(const print_context & c, const expair & p, unsigned upper_precedence) const
{
c.s << "[[";
- p.rest.bp->print(c, precedence());
+ p.rest.print(c, precedence());
c.s << ",";
- p.coeff.bp->print(c, precedence());
+ p.coeff.print(c, precedence());
c.s << "]]";
}
* @see expairseq::recombine_pair_to_ex() */
expair expairseq::split_ex_to_pair(const ex &e) const
{
- return expair(e,_ex1());
+ return expair(e,_ex1);
}
expair expairseq::combine_ex_with_coeff_to_pair(const ex &e,
const ex &c) const
{
- GINAC_ASSERT(is_ex_exactly_of_type(c,numeric));
+ GINAC_ASSERT(is_exactly_a<numeric>(c));
return expair(e,c);
}
expair expairseq::combine_pair_with_coeff_to_pair(const expair &p,
const ex &c) const
{
- GINAC_ASSERT(is_ex_exactly_of_type(p.coeff,numeric));
- GINAC_ASSERT(is_ex_exactly_of_type(c,numeric));
+ GINAC_ASSERT(is_exactly_a<numeric>(p.coeff));
+ GINAC_ASSERT(is_exactly_a<numeric>(c));
return expair(p.rest,ex_to<numeric>(p.coeff).mul_dyn(ex_to<numeric>(c)));
}
ex expairseq::default_overall_coeff(void) const
{
- return _ex0();
+ return _ex0;
}
void expairseq::combine_overall_coeff(const ex &c)
{
- GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric));
- GINAC_ASSERT(is_ex_exactly_of_type(c,numeric));
+ GINAC_ASSERT(is_exactly_a<numeric>(overall_coeff));
+ GINAC_ASSERT(is_exactly_a<numeric>(c));
overall_coeff = ex_to<numeric>(overall_coeff).add_dyn(ex_to<numeric>(c));
}
void expairseq::combine_overall_coeff(const ex &c1, const ex &c2)
{
- GINAC_ASSERT(is_ex_exactly_of_type(overall_coeff,numeric));
- GINAC_ASSERT(is_ex_exactly_of_type(c1,numeric));
- GINAC_ASSERT(is_ex_exactly_of_type(c2,numeric));
+ GINAC_ASSERT(is_exactly_a<numeric>(overall_coeff));
+ GINAC_ASSERT(is_exactly_a<numeric>(c1));
+ GINAC_ASSERT(is_exactly_a<numeric>(c2));
overall_coeff = ex_to<numeric>(overall_coeff).
add_dyn(ex_to<numeric>(c1).mul(ex_to<numeric>(c2)));
}
void expairseq::construct_from_2_ex(const ex &lh, const ex &rh)
{
- if (lh.bp->tinfo()==tinfo()) {
- if (rh.bp->tinfo()==tinfo()) {
+ if (ex_to<basic>(lh).tinfo()==this->tinfo()) {
+ if (ex_to<basic>(rh).tinfo()==this->tinfo()) {
#if EXPAIRSEQ_USE_HASHTAB
unsigned totalsize = ex_to<expairseq>(lh).seq.size() +
ex_to<expairseq>(rh).seq.size();
#endif // EXPAIRSEQ_USE_HASHTAB
return;
}
- } else if (rh.bp->tinfo()==tinfo()) {
+ } else if (ex_to<basic>(rh).tinfo()==this->tinfo()) {
#if EXPAIRSEQ_USE_HASHTAB
unsigned totalsize=ex_to<expairseq>(rh).seq.size()+1;
if (calc_hashtabsize(totalsize)!=0) {
int cmpval = p1.rest.compare(p2.rest);
if (cmpval==0) {
- p1.coeff=ex_to<numeric>(p1.coeff).add_dyn(ex_to<numeric>(p2.coeff));
+ p1.coeff = ex_to<numeric>(p1.coeff).add_dyn(ex_to<numeric>(p2.coeff));
if (!ex_to<numeric>(p1.coeff).is_zero()) {
// no further processing is necessary, since this
// one element will usually be recombined in eval()
int cmpval = (*first1).rest.compare((*first2).rest);
if (cmpval==0) {
// combine terms
- const numeric &newcoeff = ex_to<numeric>((*first1).coeff).
- add(ex_to<numeric>((*first2).coeff));
+ const numeric &newcoeff = ex_to<numeric>(first1->coeff).
+ add(ex_to<numeric>(first2->coeff));
if (!newcoeff.is_zero()) {
- seq.push_back(expair((*first1).rest,newcoeff));
+ seq.push_back(expair(first1->rest,newcoeff));
if (expair_needs_further_processing(seq.end()-1)) {
needs_further_processing = true;
}
cit = v.begin();
while (cit!=v.end()) {
- if (cit->bp->tinfo()==this->tinfo()) {
+ if (ex_to<basic>(*cit).tinfo()==this->tinfo()) {
++nexpairseqs;
noperands += ex_to<expairseq>(*cit).seq.size();
}
// copy elements and split off numerical part
cit = v.begin();
while (cit!=v.end()) {
- if (cit->bp->tinfo()==this->tinfo()) {
+ 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();
cit = v.begin();
while (cit!=v.end()) {
- if (cit->rest.bp->tinfo()==this->tinfo()) {
+ if (ex_to<basic>(cit->rest).tinfo()==this->tinfo()) {
++nexpairseqs;
noperands += ex_to<expairseq>(cit->rest).seq.size();
}
// copy elements and split off numerical part
cit = v.begin();
while (cit!=v.end()) {
- if (cit->rest.bp->tinfo()==this->tinfo() &&
+ if (ex_to<basic>(cit->rest).tinfo()==this->tinfo() &&
this->can_make_flat(*cit)) {
const expairseq &subseqref = ex_to<expairseq>(cit->rest);
combine_overall_coeff(ex_to<numeric>(subseqref.overall_coeff),
/** Brings this expairseq into a sorted (canonical) form. */
void expairseq::canonicalize(void)
{
- sort(seq.begin(), seq.end(), expair_is_less());
+ std::sort(seq.begin(), seq.end(), expair_rest_is_less());
}
* if no members were changed. */
epvector * expairseq::expandchildren(unsigned options) const
{
- epvector::const_iterator last = seq.end();
+ const epvector::const_iterator last = seq.end();
epvector::const_iterator cit = seq.begin();
while (cit!=last) {
const ex &expanded_ex = cit->rest.expand(options);
git://www.ginac.de / ginac.git / blobdiff