X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=f46039d6c231cd34b9a04592591c6423015ea9fd;hp=f49fefcf208495ddf3a9d9d78f8a744bebf36092;hb=dbd9c306a74f1cb258c0d15a346b973b39deaad2;hpb=b6e3c62f240698c7e9ed464c57bb6d92741765ba diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index f49fefcf..f46039d6 100644 --- a/ginac/expairseq.cpp +++ b/ginac/expairseq.cpp @@ -3,7 +3,7 @@ * Implementation of sequences of expression pairs. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2003 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,16 +20,19 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include #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 @@ -38,6 +41,7 @@ namespace GiNaC { + GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(expairseq, basic) ////////// @@ -54,20 +58,18 @@ public: }; ////////// -// 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); @@ -111,14 +113,12 @@ DEFAULT_DESTROY(expairseq) 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()); } @@ -126,7 +126,7 @@ expairseq::expairseq(const exvector &v) : inherited(TINFO_expairseq) 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(oc)); construct_from_epvector(v); GINAC_ASSERT(is_canonical()); } @@ -134,8 +134,8 @@ expairseq::expairseq(const epvector &v, const ex &oc) 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(oc)); construct_from_epvector(*vp); delete vp; GINAC_ASSERT(is_canonical()); @@ -150,7 +150,6 @@ expairseq::expairseq(const archive_node &n, const lst &sym_lst) : inherited(n, s , hashtabsize(0) #endif { - debugmsg("expairseq ctor from archive_node", LOGLEVEL_CONSTRUCT); for (unsigned int i=0; true; i++) { ex rest; ex coeff; @@ -177,21 +176,18 @@ void expairseq::archive(archive_node &n) const 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(c).delta_indent; @@ -300,7 +296,7 @@ ex &expairseq::let_op(int i) 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()); @@ -317,6 +313,7 @@ ex expairseq::map(map_function & f) const 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)) @@ -334,7 +331,7 @@ bool expairseq::match(const ex & pattern, lst & 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 (tinfo() == pattern.bp->tinfo()) { + if (this->tinfo() == ex_to(pattern).tinfo()) { // Check whether global wildcard (one that matches the "rest of the // expression", like "*" above) is present @@ -388,7 +385,7 @@ found: ; ex rest = thisexpairseq(vp, default_overall_coeff()); for (unsigned i=0; ibasic::subs(ls, lr, no_pattern); + return ex_to(thisexpairseq(vp, overall_coeff)); else return basic::subs(ls, lr, no_pattern); } @@ -416,7 +413,7 @@ ex expairseq::subs(const lst &ls, const lst &lr, bool no_pattern) const int expairseq::compare_same_type(const basic &other) const { - GINAC_ASSERT(is_of_type(other, expairseq)); + GINAC_ASSERT(is_a(other)); const expairseq &o = static_cast(other); int cmpval; @@ -551,7 +548,7 @@ unsigned expairseq::return_type(void) const 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 @@ -614,9 +611,9 @@ ex expairseq::thisexpairseq(epvector *vp, const ex &oc) const 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 << "]]"; } @@ -646,14 +643,14 @@ void expairseq::printseq(const print_context & c, char delim, * @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(c)); return expair(e,c); } @@ -662,8 +659,8 @@ expair expairseq::combine_ex_with_coeff_to_pair(const ex &e, 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(p.coeff)); + GINAC_ASSERT(is_exactly_a(c)); return expair(p.rest,ex_to(p.coeff).mul_dyn(ex_to(c))); } @@ -686,21 +683,21 @@ bool expairseq::expair_needs_further_processing(epp it) 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(overall_coeff)); + GINAC_ASSERT(is_exactly_a(c)); overall_coeff = ex_to(overall_coeff).add_dyn(ex_to(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(overall_coeff)); + GINAC_ASSERT(is_exactly_a(c1)); + GINAC_ASSERT(is_exactly_a(c2)); overall_coeff = ex_to(overall_coeff). add_dyn(ex_to(c1).mul(ex_to(c2))); } @@ -730,8 +727,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 (lh.bp->tinfo()==tinfo()) { - if (rh.bp->tinfo()==tinfo()) { + if (ex_to(lh).tinfo()==this->tinfo()) { + if (ex_to(rh).tinfo()==this->tinfo()) { #if EXPAIRSEQ_USE_HASHTAB unsigned totalsize = ex_to(lh).seq.size() + ex_to(rh).seq.size(); @@ -758,7 +755,7 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh) #endif // EXPAIRSEQ_USE_HASHTAB return; } - } else if (rh.bp->tinfo()==tinfo()) { + } else if (ex_to(rh).tinfo()==this->tinfo()) { #if EXPAIRSEQ_USE_HASHTAB unsigned totalsize=ex_to(rh).seq.size()+1; if (calc_hashtabsize(totalsize)!=0) { @@ -798,7 +795,7 @@ void expairseq::construct_from_2_ex(const ex &lh, const ex &rh) int cmpval = p1.rest.compare(p2.rest); if (cmpval==0) { - p1.coeff=ex_to(p1.coeff).add_dyn(ex_to(p2.coeff)); + p1.coeff = ex_to(p1.coeff).add_dyn(ex_to(p2.coeff)); if (!ex_to(p1.coeff).is_zero()) { // no further processing is necessary, since this // one element will usually be recombined in eval() @@ -837,10 +834,10 @@ void expairseq::construct_from_2_expairseq(const expairseq &s1, int cmpval = (*first1).rest.compare((*first2).rest); if (cmpval==0) { // combine terms - const numeric &newcoeff = ex_to((*first1).coeff). - add(ex_to((*first2).coeff)); + const numeric &newcoeff = ex_to(first1->coeff). + add(ex_to(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; } @@ -979,7 +976,7 @@ void expairseq::make_flat(const exvector &v) cit = v.begin(); while (cit!=v.end()) { - if (cit->bp->tinfo()==this->tinfo()) { + if (ex_to(*cit).tinfo()==this->tinfo()) { ++nexpairseqs; noperands += ex_to(*cit).seq.size(); } @@ -992,7 +989,7 @@ void expairseq::make_flat(const exvector &v) // copy elements and split off numerical part cit = v.begin(); while (cit!=v.end()) { - if (cit->bp->tinfo()==this->tinfo()) { + if (ex_to(*cit).tinfo()==this->tinfo()) { const expairseq &subseqref = ex_to(*cit); combine_overall_coeff(subseqref.overall_coeff); epvector::const_iterator cit_s = subseqref.seq.begin(); @@ -1023,7 +1020,7 @@ void expairseq::make_flat(const epvector &v) cit = v.begin(); while (cit!=v.end()) { - if (cit->rest.bp->tinfo()==this->tinfo()) { + if (ex_to(cit->rest).tinfo()==this->tinfo()) { ++nexpairseqs; noperands += ex_to(cit->rest).seq.size(); } @@ -1036,7 +1033,7 @@ void expairseq::make_flat(const epvector &v) // copy elements and split off numerical part cit = v.begin(); while (cit!=v.end()) { - if (cit->rest.bp->tinfo()==this->tinfo() && + if (ex_to(cit->rest).tinfo()==this->tinfo() && this->can_make_flat(*cit)) { const expairseq &subseqref = ex_to(cit->rest); combine_overall_coeff(ex_to(subseqref.overall_coeff), @@ -1062,7 +1059,7 @@ void expairseq::make_flat(const epvector &v) /** 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()); } @@ -1071,42 +1068,43 @@ void expairseq::canonicalize(void) * instance. */ void expairseq::combine_same_terms_sorted_seq(void) { + if (seq.size()<2) + return; + bool needs_further_processing = false; - - if (seq.size()>1) { - epvector::iterator itin1 = seq.begin(); - epvector::iterator itin2 = itin1+1; - epvector::iterator itout = itin1; - epvector::iterator last = seq.end(); - // must_copy will be set to true the first time some combination is - // possible from then on the sequence has changed and must be compacted - bool must_copy = false; - while (itin2!=last) { - if ((*itin1).rest.compare(itin2->rest)==0) { - (*itin1).coeff = ex_to(itin1->coeff). - add_dyn(ex_to(itin2->coeff)); - if (expair_needs_further_processing(itin1)) - needs_further_processing = true; - must_copy = true; - } else { - if (!ex_to(itin1->coeff).is_zero()) { - if (must_copy) - *itout = *itin1; - ++itout; - } - itin1 = itin2; + + epvector::iterator itin1 = seq.begin(); + epvector::iterator itin2 = itin1+1; + epvector::iterator itout = itin1; + epvector::iterator last = seq.end(); + // must_copy will be set to true the first time some combination is + // possible from then on the sequence has changed and must be compacted + bool must_copy = false; + while (itin2!=last) { + if (itin1->rest.compare(itin2->rest)==0) { + itin1->coeff = ex_to(itin1->coeff). + add_dyn(ex_to(itin2->coeff)); + if (expair_needs_further_processing(itin1)) + needs_further_processing = true; + must_copy = true; + } else { + if (!ex_to(itin1->coeff).is_zero()) { + if (must_copy) + *itout = *itin1; + ++itout; } - ++itin2; + itin1 = itin2; } - if (!ex_to(itin1->coeff).is_zero()) { - if (must_copy) - *itout = *itin1; - ++itout; - } - if (itout!=last) - seq.erase(itout,last); + ++itin2; } - + if (!ex_to(itin1->coeff).is_zero()) { + if (must_copy) + *itout = *itin1; + ++itout; + } + if (itout!=last) + seq.erase(itout,last); + if (needs_further_processing) { epvector v = seq; seq.clear(); @@ -1471,7 +1469,7 @@ bool expairseq::is_canonical() const * 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);