X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=cfcfa16d0cb8401d222e36c7a4ce45bcf56f09cf;hp=56fcba68fda4489dc60ef2f32629f76f7be2aff8;hb=6d383491ac7fdc612ebc15778a2db01dbc5660d6;hpb=e5362a33f72613b324b3714524a8c2e5f7b7f46f diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index 56fcba68..cfcfa16d 100644 --- a/ginac/expairseq.cpp +++ b/ginac/expairseq.cpp @@ -30,13 +30,11 @@ #include "debugmsg.h" #include "utils.h" -#ifndef NO_NAMESPACE_GINAC -namespace GiNaC { -#endif // ndef NO_NAMESPACE_GINAC +#if EXPAIRSEQ_USE_HASHTAB +#include +#endif // EXPAIRSEQ_USE_HASHTAB -#ifdef EXPAIRSEQ_USE_HASHTAB -#error "FIXME: expair_needs_further_processing not yet implemented for hashtabs, sorry. A.F." -#endif // def EXPAIRSEQ_USE_HASHTAB +namespace GiNaC { GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(expairseq, basic) @@ -47,25 +45,25 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_NO_CTORS(expairseq, basic) class epp_is_less { public: - bool operator()(const epp & lh, const epp & rh) const + bool operator()(const epp &lh, const epp &rh) const { return (*lh).is_less(*rh); } }; ////////// -// default constructor, destructor, copy constructor assignment operator and helpers +// default ctor, dtor, copy ctor assignment operator and helpers ////////// // public -expairseq::expairseq(const expairseq & other) +expairseq::expairseq(const expairseq &other) { - debugmsg("expairseq copy constructor",LOGLEVEL_CONSTRUCT); + debugmsg("expairseq copy ctor",LOGLEVEL_CONSTRUCT); copy(other); } -const expairseq & expairseq::operator=(const expairseq & other) +const expairseq &expairseq::operator=(const expairseq &other) { debugmsg("expairseq operator=",LOGLEVEL_ASSIGNMENT); if (this != &other) { @@ -77,18 +75,19 @@ const expairseq & expairseq::operator=(const expairseq & other) // protected -void expairseq::copy(const expairseq & other) +/** For use by copy ctor and assignment operator. */ +void expairseq::copy(const expairseq &other) { inherited::copy(other); - seq=other.seq; - overall_coeff=other.overall_coeff; -#ifdef EXPAIRSEQ_USE_HASHTAB + seq = other.seq; + overall_coeff = other.overall_coeff; +#if EXPAIRSEQ_USE_HASHTAB // copy hashtab - hashtabsize=other.hashtabsize; + hashtabsize = other.hashtabsize; if (hashtabsize!=0) { - hashmask=other.hashmask; + hashmask = other.hashmask; hashtab.resize(hashtabsize); - epvector::const_iterator osb=other.seq.begin(); + epvector::const_iterator osb = other.seq.begin(); for (unsigned i=0; irest); n.add_ex("coeff", i->coeff); - i++; + ++i; } n.add_ex("overall_coeff", overall_coeff); } @@ -202,13 +190,13 @@ void expairseq::archive(archive_node &n) const // public -basic * expairseq::duplicate() const +basic *expairseq::duplicate() const { debugmsg("expairseq duplicate",LOGLEVEL_DUPLICATE); return new expairseq(*this); } -void expairseq::print(std::ostream & os, unsigned upper_precedence) const +void expairseq::print(std::ostream &os, unsigned upper_precedence) const { debugmsg("expairseq print",LOGLEVEL_PRINT); os << "[["; @@ -216,11 +204,10 @@ void expairseq::print(std::ostream & os, unsigned upper_precedence) const os << "]]"; } -void expairseq::printraw(std::ostream & os) const +void expairseq::printraw(std::ostream &os) const { debugmsg("expairseq printraw",LOGLEVEL_PRINT); - - os << "expairseq("; + os << class_name() << "("; for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { os << "("; (*cit).rest.printraw(os); @@ -231,7 +218,7 @@ void expairseq::printraw(std::ostream & os) const os << ")"; } -void expairseq::printtree(std::ostream & os, unsigned indent) const +void expairseq::printtree(std::ostream &os, unsigned indent) const { debugmsg("expairseq printtree",LOGLEVEL_PRINT); @@ -243,9 +230,8 @@ void expairseq::printtree(std::ostream & os, unsigned indent) const for (unsigned i=0; i0) { os << std::string(indent+delta_indent,' ') << "bin " << i << " with entries "; for (epplist::const_iterator it=hashtab[i].begin(); - it!=hashtab[i].end(); ++it) { + it!=hashtab[i].end(); ++it) { os << *it-seq.begin() << " "; - this_bin_fill++; + ++this_bin_fill; } os << std::endl; cum_fill += this_bin_fill; cum_fill_sq += this_bin_fill*this_bin_fill; } - if (this_bin_fill0) fact *= k; - double prob = pow(lambda,k)/fact*exp(-lambda); + if (k>0) + fact *= k; + double prob = std::pow(lambda,k)/fact * std::exp(-lambda); cum_prob += prob; os << std::string(indent+delta_indent,' ') << "bins with " << k << " entries: " << int(1000.0*count[k]/hashtabsize)/10.0 << "% (expected: " @@ -304,7 +291,7 @@ void expairseq::printtree(std::ostream & os, unsigned indent) const os << std::string(indent+delta_indent,' ') << "average fill: " << (1.0*cum_fill)/hashtabsize << " (should be equal to " << (1.0*seq.size())/hashtabsize << ")" << std::endl; -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB } bool expairseq::info(unsigned inf) const @@ -314,37 +301,34 @@ bool expairseq::info(unsigned inf) const unsigned expairseq::nops() const { - if (overall_coeff.is_equal(default_overall_coeff())) { + if (overall_coeff.is_equal(default_overall_coeff())) return seq.size(); - } - return seq.size()+1; + else + return seq.size()+1; } ex expairseq::op(int i) const { - if (unsigned(i)hold(); - } - + return (new expairseq(vp,overall_coeff))->setflag(status_flags::dynallocated | status_flags::evaluated); } @@ -359,47 +343,45 @@ ex expairseq::normal(lst &sym_lst, lst &repl_lst, int level) const return n.bp->basic::normal(sym_lst,repl_lst,level); } -ex expairseq::subs(const lst & ls, const lst & lr) const +ex expairseq::subs(const lst &ls, const lst &lr) const { - epvector * vp=subschildren(ls,lr); - if (vp==0) { + epvector *vp = subschildren(ls,lr); + if (vp==0) return *this; - } + return thisexpairseq(vp,overall_coeff); } // protected -/** Implementation of ex::diff() for an expairseq. It differentiates all elements of the - * sequence. +/** Implementation of ex::diff() for an expairseq. + * It differentiates all elements of the sequence. * @see ex::diff */ -ex expairseq::derivative(const symbol & s) const +ex expairseq::derivative(const symbol &s) const { return thisexpairseq(diffchildren(s),overall_coeff); } -int expairseq::compare_same_type(const basic & other) const +int expairseq::compare_same_type(const basic &other) const { GINAC_ASSERT(is_of_type(other, expairseq)); - const expairseq & o = static_cast(const_cast(other)); - + const expairseq &o = static_cast(const_cast(other)); + int cmpval; // compare number of elements - if (seq.size() != o.seq.size()) { + if (seq.size() != o.seq.size()) return (seq.size()0) { - const epplist & eppl1=hashtab[i]; - const epplist & eppl2=o.hashtab[i]; - epplist::const_iterator it1=eppl1.begin(); - epplist::const_iterator it2=eppl2.begin(); + const epplist &eppl1 = hashtab[i]; + const epplist &eppl2 = o.hashtab[i]; + epplist::const_iterator it1 = eppl1.begin(); + epplist::const_iterator it2 = eppl2.begin(); while (it1!=eppl1.end()) { - cmpval=(*(*it1)).compare(*(*it2)); - if (cmpval!=0) return cmpval; + cmpval = (*(*it1)).compare(*(*it2)); + if (cmpval!=0) + return cmpval; ++it1; ++it2; } @@ -443,35 +425,37 @@ int expairseq::compare_same_type(const basic & other) const } return 0; // equal -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB } -bool expairseq::is_equal_same_type(const basic & other) const +bool expairseq::is_equal_same_type(const basic &other) const { - const expairseq & o=dynamic_cast(const_cast(other)); - + const expairseq &o = dynamic_cast(const_cast(other)); + // compare number of elements - if (seq.size() != o.seq.size()) return false; - + if (seq.size()!=o.seq.size()) + return false; + // compare overall_coeff - if (!overall_coeff.is_equal(o.overall_coeff)) return false; - -#ifdef EXPAIRSEQ_USE_HASHTAB + if (!overall_coeff.is_equal(o.overall_coeff)) + return false; + +#if EXPAIRSEQ_USE_HASHTAB // compare number of elements in each hashtab entry if (hashtabsize!=o.hashtabsize) { - cout << "this:" << std::endl; - printtree(cout,0); - cout << "other:" << std::endl; - other.printtree(cout,0); + std::cout << "this:" << std::endl; + printtree(std::cout,0); + std::cout << "other:" << std::endl; + other.printtree(std::cout,0); } GINAC_ASSERT(hashtabsize==o.hashtabsize); if (hashtabsize==0) { -#endif // def EXPAIRSEQ_USE_HASHTAB - epvector::const_iterator cit1=seq.begin(); - epvector::const_iterator cit2=o.seq.begin(); - epvector::const_iterator last1=seq.end(); +#endif // EXPAIRSEQ_USE_HASHTAB + epvector::const_iterator cit1 = seq.begin(); + epvector::const_iterator cit2 = o.seq.begin(); + epvector::const_iterator last1 = seq.end(); while (cit1!=last1) { if (!(*cit1).is_equal(*cit2)) return false; @@ -480,21 +464,22 @@ bool expairseq::is_equal_same_type(const basic & other) const } return true; -#ifdef EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB } - + for (unsigned i=0; i0) { - const epplist & eppl1=hashtab[i]; - const epplist & eppl2=o.hashtab[i]; - epplist::const_iterator it1=eppl1.begin(); - epplist::const_iterator it2=eppl2.begin(); + const epplist &eppl1 = hashtab[i]; + const epplist &eppl2 = o.hashtab[i]; + epplist::const_iterator it1 = eppl1.begin(); + epplist::const_iterator it2 = eppl2.begin(); while (it1!=eppl1.end()) { if (!(*(*it1)).is_equal(*(*it2))) return false; ++it1; @@ -502,9 +487,9 @@ bool expairseq::is_equal_same_type(const basic & other) const } } } - + return true; -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB } unsigned expairseq::return_type(void) const @@ -514,33 +499,39 @@ unsigned expairseq::return_type(void) const unsigned expairseq::calchash(void) const { - unsigned v=golden_ratio_hash(tinfo()); - epvector::const_iterator last=seq.end(); - for (epvector::const_iterator cit=seq.begin(); cit!=last; ++cit) { -#ifndef EXPAIRSEQ_USE_HASHTAB - v=rotate_left_31(v); // rotation would spoil commutativity -#endif // ndef EXPAIRSEQ_USE_HASHTAB - v ^= (*cit).rest.gethash(); + unsigned v = golden_ratio_hash(tinfo()); + for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { +#if !EXPAIRSEQ_USE_HASHTAB + v = rotate_left_31(v); // rotation would spoil commutativity +#endif // EXPAIRSEQ_USE_HASHTAB + v ^= cit->rest.gethash(); +#if !EXPAIRSEQ_USE_HASHTAB + v = rotate_left_31(v); + v ^= cit->coeff.gethash(); +#endif // EXPAIRSEQ_USE_HASHTAB } - + v ^= overall_coeff.gethash(); - v=v & 0x7FFFFFFFU; + v &= 0x7FFFFFFFU; // store calculated hash value only if object is already evaluated - if (flags & status_flags::evaluated) { + if (flags &status_flags::evaluated) { setflag(status_flags::hash_calculated); - hashvalue=v; + hashvalue = v; } - + return v; } ex expairseq::expand(unsigned options) const { - epvector * vp = expandchildren(options); + epvector *vp = expandchildren(options); if (vp==0) { + // the terms have not changed, so it is safe to declare this expanded + setflag(status_flags::expanded); return *this; } + return thisexpairseq(vp,overall_coeff); } @@ -550,17 +541,25 @@ ex expairseq::expand(unsigned options) const // protected -ex expairseq::thisexpairseq(const epvector & v, const ex & oc) const +/** Create an object of this type. + * This method works similar to a constructor. It is useful because expairseq + * has (at least) two possible different semantics but we want to inherit + * methods thus avoiding code duplication. Sometimes a method in expairseq + * has to create a new one of the same semantics, which cannot be done by a + * 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 { return expairseq(v,oc); } -ex expairseq::thisexpairseq(epvector * vp, const ex & oc) const +ex expairseq::thisexpairseq(epvector *vp, const ex &oc) const { return expairseq(vp,oc); } -void expairseq::printpair(std::ostream & os, const expair & p, unsigned upper_precedence) const +void expairseq::printpair(std::ostream &os, const expair &p, unsigned upper_precedence) const { os << "[["; p.rest.bp->print(os,precedence); @@ -569,11 +568,12 @@ void expairseq::printpair(std::ostream & os, const expair & p, unsigned upper_pr os << "]]"; } -void expairseq::printseq(std::ostream & os, char delim, +void expairseq::printseq(std::ostream &os, char delim, unsigned this_precedence, unsigned upper_precedence) const { - if (this_precedence<=upper_precedence) os << "("; + if (this_precedence<=upper_precedence) + os << "("; epvector::const_iterator it,it_last; it_last=seq.end(); --it_last; @@ -582,27 +582,33 @@ void expairseq::printseq(std::ostream & os, char delim, os << delim; } printpair(os,*it,this_precedence); - if (!overall_coeff.is_equal(default_overall_coeff())) { + if (!overall_coeff.is_equal(default_overall_coeff())) os << delim << overall_coeff; - } - if (this_precedence<=upper_precedence) os << ")"; -} -expair expairseq::split_ex_to_pair(const ex & e) const + if (this_precedence<=upper_precedence) + os << ")"; +} + + +/** Form an expair from an ex, using the corresponding semantics. + * @see expairseq::recombine_pair_to_ex() */ +expair expairseq::split_ex_to_pair(const ex &e) const { return expair(e,_ex1()); } -expair expairseq::combine_ex_with_coeff_to_pair(const ex & e, - const ex & c) const + +expair expairseq::combine_ex_with_coeff_to_pair(const ex &e, + const ex &c) const { GINAC_ASSERT(is_ex_exactly_of_type(c,numeric)); - + return expair(e,c); } -expair expairseq::combine_pair_with_coeff_to_pair(const expair & p, - const ex & c) const + +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)); @@ -610,13 +616,19 @@ expair expairseq::combine_pair_with_coeff_to_pair(const expair & p, return expair(p.rest,ex_to_numeric(p.coeff).mul_dyn(ex_to_numeric(c))); } -ex expairseq::recombine_pair_to_ex(const expair & p) const + +/** Form an ex out of an expair, using the corresponding semantics. + * @see expairseq::split_ex_to_pair() */ +ex expairseq::recombine_pair_to_ex(const expair &p) const { return lst(p.rest,p.coeff); } bool expairseq::expair_needs_further_processing(epp it) { +#if EXPAIRSEQ_USE_HASHTAB + //# error "FIXME: expair_needs_further_processing not yet implemented for hashtabs, sorry. A.F." +#endif // EXPAIRSEQ_USE_HASHTAB return false; } @@ -625,14 +637,14 @@ ex expairseq::default_overall_coeff(void) const return _ex0(); } -void expairseq::combine_overall_coeff(const ex & c) +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)); overall_coeff = ex_to_numeric(overall_coeff).add_dyn(ex_to_numeric(c)); } -void expairseq::combine_overall_coeff(const ex & c1, const ex & c2) +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)); @@ -641,80 +653,80 @@ void expairseq::combine_overall_coeff(const ex & c1, const ex & c2) add_dyn(ex_to_numeric(c1).mul(ex_to_numeric(c2))); } -bool expairseq::can_make_flat(const expair & p) const +bool expairseq::can_make_flat(const expair &p) const { return true; } - + ////////// // non-virtual functions in this class ////////// -void expairseq::construct_from_2_ex_via_exvector(const ex & lh, const ex & rh) +void expairseq::construct_from_2_ex_via_exvector(const ex &lh, const ex &rh) { exvector v; v.reserve(2); v.push_back(lh); v.push_back(rh); construct_from_exvector(v); -#ifdef EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB GINAC_ASSERT((hashtabsize==0)||(hashtabsize>=minhashtabsize)); GINAC_ASSERT(hashtabsize==calc_hashtabsize(seq.size())); -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB } -void expairseq::construct_from_2_ex(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()) { -#ifdef EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB unsigned totalsize = ex_to_expairseq(lh).seq.size() + ex_to_expairseq(rh).seq.size(); if (calc_hashtabsize(totalsize)!=0) { construct_from_2_ex_via_exvector(lh,rh); } else { -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB construct_from_2_expairseq(ex_to_expairseq(lh), ex_to_expairseq(rh)); -#ifdef EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB } -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB return; } else { -#ifdef EXPAIRSEQ_USE_HASHTAB - unsigned totalsize=ex_to_expairseq(lh).seq.size()+1; - if (calc_hashtabsize(totalsize) != 0) { +#if EXPAIRSEQ_USE_HASHTAB + unsigned totalsize = ex_to_expairseq(lh).seq.size()+1; + if (calc_hashtabsize(totalsize)!=0) { construct_from_2_ex_via_exvector(lh, rh); } else { -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB construct_from_expairseq_ex(ex_to_expairseq(lh), rh); -#ifdef EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB } -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB return; } } else if (rh.bp->tinfo()==tinfo()) { -#ifdef EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB unsigned totalsize=ex_to_expairseq(rh).seq.size()+1; if (calc_hashtabsize(totalsize)!=0) { construct_from_2_ex_via_exvector(lh,rh); } else { -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB construct_from_expairseq_ex(ex_to_expairseq(rh),lh); -#ifdef EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB } -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB return; } - -#ifdef EXPAIRSEQ_USE_HASHTAB + +#if EXPAIRSEQ_USE_HASHTAB if (calc_hashtabsize(2)!=0) { construct_from_2_ex_via_exvector(lh,rh); return; } - hashtabsize=0; -#endif // def EXPAIRSEQ_USE_HASHTAB + hashtabsize = 0; +#endif // EXPAIRSEQ_USE_HASHTAB if (is_ex_exactly_of_type(lh,numeric)) { if (is_ex_exactly_of_type(rh,numeric)) { @@ -729,10 +741,10 @@ void expairseq::construct_from_2_ex(const ex & lh, const ex & rh) combine_overall_coeff(rh); seq.push_back(split_ex_to_pair(lh)); } else { - expair p1=split_ex_to_pair(lh); - expair p2=split_ex_to_pair(rh); - - int cmpval=p1.rest.compare(p2.rest); + expair p1 = split_ex_to_pair(lh); + expair p2 = split_ex_to_pair(rh); + + int cmpval = p1.rest.compare(p2.rest); if (cmpval==0) { p1.coeff=ex_to_numeric(p1.coeff).add_dyn(ex_to_numeric(p2.coeff)); if (!ex_to_numeric(p1.coeff).is_zero()) { @@ -754,26 +766,26 @@ void expairseq::construct_from_2_ex(const ex & lh, const ex & rh) } } -void expairseq::construct_from_2_expairseq(const expairseq & s1, - const expairseq & s2) +void expairseq::construct_from_2_expairseq(const expairseq &s1, + const expairseq &s2) { combine_overall_coeff(s1.overall_coeff); combine_overall_coeff(s2.overall_coeff); - epvector::const_iterator first1=s1.seq.begin(); - epvector::const_iterator last1=s1.seq.end(); - epvector::const_iterator first2=s2.seq.begin(); - epvector::const_iterator last2=s2.seq.end(); + epvector::const_iterator first1 = s1.seq.begin(); + epvector::const_iterator last1 = s1.seq.end(); + epvector::const_iterator first2 = s2.seq.begin(); + epvector::const_iterator last2 = s2.seq.end(); seq.reserve(s1.seq.size()+s2.seq.size()); bool needs_further_processing=false; while (first1!=last1 && first2!=last2) { - int cmpval=(*first1).rest.compare((*first2).rest); + int cmpval = (*first1).rest.compare((*first2).rest); if (cmpval==0) { // combine terms - const numeric & newcoeff = ex_to_numeric((*first1).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)); @@ -800,39 +812,39 @@ void expairseq::construct_from_2_expairseq(const expairseq & s1, seq.push_back(*first2); ++first2; } - + if (needs_further_processing) { - epvector v=seq; + epvector v = seq; seq.clear(); construct_from_epvector(v); } } -void expairseq::construct_from_expairseq_ex(const expairseq & s, - const ex & e) +void expairseq::construct_from_expairseq_ex(const expairseq &s, + const ex &e) { combine_overall_coeff(s.overall_coeff); if (is_ex_exactly_of_type(e,numeric)) { combine_overall_coeff(e); - seq=s.seq; + seq = s.seq; return; } - - epvector::const_iterator first=s.seq.begin(); - epvector::const_iterator last=s.seq.end(); - expair p=split_ex_to_pair(e); - + + epvector::const_iterator first = s.seq.begin(); + epvector::const_iterator last = s.seq.end(); + expair p = split_ex_to_pair(e); + seq.reserve(s.seq.size()+1); - bool p_pushed=0; - + bool p_pushed = false; + bool needs_further_processing=false; - + // merge p into s.seq while (first!=last) { int cmpval=(*first).rest.compare(p.rest); if (cmpval==0) { // combine terms - const numeric & newcoeff = ex_to_numeric((*first).coeff). + const numeric &newcoeff = ex_to_numeric((*first).coeff). add(ex_to_numeric(p.coeff)); if (!newcoeff.is_zero()) { seq.push_back(expair((*first).rest,newcoeff)); @@ -841,18 +853,18 @@ void expairseq::construct_from_expairseq_ex(const expairseq & s, } } ++first; - p_pushed=1; + p_pushed = true; break; } else if (cmpval<0) { seq.push_back(*first); ++first; } else { seq.push_back(p); - p_pushed=1; + p_pushed = true; break; } } - + if (p_pushed) { // while loop exited because p was pushed, now push rest of s.seq while (first!=last) { @@ -865,13 +877,13 @@ void expairseq::construct_from_expairseq_ex(const expairseq & s, } if (needs_further_processing) { - epvector v=seq; + epvector v = seq; seq.clear(); construct_from_epvector(v); } } -void expairseq::construct_from_exvector(const exvector & v) +void expairseq::construct_from_exvector(const exvector &v) { // simplifications: +(a,+(b,c),d) -> +(a,b,c,d) (associativity) // +(d,b,c,a) -> +(a,b,c,d) (canonicalization) @@ -879,15 +891,16 @@ void expairseq::construct_from_exvector(const exvector & v) // (same for (+,*) -> (*,^) make_flat(v); -#ifdef EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB combine_same_terms(); #else canonicalize(); combine_same_terms_sorted_seq(); -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB + return; } -void expairseq::construct_from_epvector(const epvector & v) +void expairseq::construct_from_epvector(const epvector &v) { // simplifications: +(a,+(b,c),d) -> +(a,b,c,d) (associativity) // +(d,b,c,a) -> +(a,b,c,d) (canonicalization) @@ -895,93 +908,93 @@ void expairseq::construct_from_epvector(const epvector & v) // (same for (+,*) -> (*,^) make_flat(v); -#ifdef EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB combine_same_terms(); #else canonicalize(); combine_same_terms_sorted_seq(); -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB + return; } -void expairseq::make_flat(const exvector & v) +/** Combine this expairseq with argument exvector. + * It cares for associativity as well as for special handling of numerics. */ +void expairseq::make_flat(const exvector &v) { - exvector::const_iterator cit, citend = v.end(); - + exvector::const_iterator cit; + // count number of operands which are of same expairseq derived type // and their cumulative number of operands - int nexpairseqs=0; - int noperands=0; - cit=v.begin(); - while (cit!=citend) { - if (cit->bp->tinfo()==tinfo()) { - nexpairseqs++; - noperands+=ex_to_expairseq(*cit).seq.size(); + int nexpairseqs = 0; + int noperands = 0; + + cit = v.begin(); + while (cit!=v.end()) { + if (cit->bp->tinfo()==this->tinfo()) { + ++nexpairseqs; + noperands += ex_to_expairseq(*cit).seq.size(); } ++cit; } - + // reserve seq and coeffseq which will hold all operands seq.reserve(v.size()+noperands-nexpairseqs); - + // copy elements and split off numerical part - cit=v.begin(); - while (cit!=citend) { - if (cit->bp->tinfo()==tinfo()) { - const expairseq & subseqref=ex_to_expairseq(*cit); + cit = v.begin(); + while (cit!=v.end()) { + if (cit->bp->tinfo()==this->tinfo()) { + const expairseq &subseqref = ex_to_expairseq(*cit); combine_overall_coeff(subseqref.overall_coeff); - epvector::const_iterator cit_s=subseqref.seq.begin(); + epvector::const_iterator cit_s = subseqref.seq.begin(); while (cit_s!=subseqref.seq.end()) { seq.push_back(*cit_s); ++cit_s; } } else { - if (is_ex_exactly_of_type(*cit,numeric)) { + if (is_ex_exactly_of_type(*cit,numeric)) combine_overall_coeff(*cit); - } else { + else seq.push_back(split_ex_to_pair(*cit)); - } } ++cit; } - - /* - cout << "after make flat" << std::endl; - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - (*cit).printraw(cout); - } - cout << std::endl; - */ + + return; } -void expairseq::make_flat(const epvector & v) +/** 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) { - epvector::const_iterator cit, citend = v.end(); - + epvector::const_iterator cit; + // count number of operands which are of same expairseq derived type // and their cumulative number of operands - int nexpairseqs=0; - int noperands=0; - + int nexpairseqs = 0; + int noperands = 0; + cit = v.begin(); - while (cit!=citend) { - if (cit->rest.bp->tinfo()==tinfo()) { - nexpairseqs++; + while (cit!=v.end()) { + if (cit->rest.bp->tinfo()==this->tinfo()) { + ++nexpairseqs; noperands += ex_to_expairseq((*cit).rest).seq.size(); } ++cit; } - + // reserve seq and coeffseq which will hold all operands seq.reserve(v.size()+noperands-nexpairseqs); - + // copy elements and split off numerical part cit = v.begin(); - while (cit!=citend) { - if ((cit->rest.bp->tinfo()==tinfo())&&can_make_flat(*cit)) { - const expairseq & subseqref=ex_to_expairseq((*cit).rest); + while (cit!=v.end()) { + if (cit->rest.bp->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), ex_to_numeric((*cit).coeff)); - epvector::const_iterator cit_s=subseqref.seq.begin(); + epvector::const_iterator cit_s = subseqref.seq.begin(); while (cit_s!=subseqref.seq.end()) { seq.push_back(expair((*cit_s).rest, ex_to_numeric((*cit_s).coeff).mul_dyn(ex_to_numeric((*cit).coeff)))); @@ -990,218 +1003,103 @@ void expairseq::make_flat(const epvector & v) ++cit_s; } } else { - if ((*cit).is_numeric_with_coeff_1()) { - combine_overall_coeff((*cit).rest); - //if (is_ex_exactly_of_type((*cit).rest,numeric)) { - // combine_overall_coeff(recombine_pair_to_ex(*cit)); - } else { + if (cit->is_canonical_numeric()) + combine_overall_coeff(cit->rest); + else seq.push_back(*cit); - } } ++cit; } + return; } -epvector * expairseq::bubblesort(epvector::iterator itbegin, epvector::iterator itend) -{ - unsigned n=itend-itbegin; - - epvector * sp=new epvector; - sp->reserve(n); - - epvector::iterator last=itend-1; - for (epvector::iterator it1=itbegin; it1!=last; ++it1) { - for (epvector::iterator it2=it1+1; it2!=itend; ++it2) { - if ((*it2).rest.compare((*it1).rest)<0) { - iter_swap(it1,it2); - } - } - sp->push_back(*it1); - } - sp->push_back(*last); - return sp; -} - -epvector * expairseq::mergesort(epvector::iterator itbegin, epvector::iterator itend) -{ - unsigned n=itend-itbegin; - /* - if (n==1) { - epvector * sp=new epvector; - sp->push_back(*itbegin); - return sp; - } - */ - if (n<16) return bubblesort(itbegin, itend); - unsigned m=n/2; - - epvector * s1p=mergesort(itbegin, itbegin+m); - epvector * s2p=mergesort(itbegin+m, itend); - - epvector * sp=new epvector; - sp->reserve(s1p->size()+s2p->size()); - - epvector::iterator first1=s1p->begin(); - epvector::iterator last1=s1p->end(); - - epvector::iterator first2=s2p->begin(); - epvector::iterator last2=s2p->end(); - - while (first1 != last1 && first2 != last2) { - if ((*first1).rest.compare((*first2).rest)<0) { - sp->push_back(*first1); - ++first1; - } else { - sp->push_back(*first2); - ++first2; - } - } - - if (first1 != last1) { - while (first1 != last1) { - sp->push_back(*first1); - ++first1; - } - } else { - while (first2 != last2) { - sp->push_back(*first2); - ++first2; - } - } - - delete s1p; - delete s2p; - - return sp; -} - +/** Brings this expairseq into a sorted (canonical) form. */ void expairseq::canonicalize(void) { // canonicalize sort(seq.begin(),seq.end(),expair_is_less()); - /* - sort(seq.begin(),seq.end(),expair_is_less_old()); - if (seq.size()>1) { - if (is_ex_exactly_of_type((*(seq.begin())).rest,numeric)) { - sort(seq.begin(),seq.end(),expair_is_less()); - } else { - epvector::iterator last_numeric=seq.end(); - do { - last_numeric--; - } while (is_ex_exactly_of_type((*last_numeric).rest,numeric)); - last_numeric++; - sort(last_numeric,seq.end(),expair_is_less()); - } - } - */ - - /* - epvector * sorted_seqp=mergesort(seq.begin(),seq.end()); - epvector::iterator last=sorted_seqp->end(); - epvector::iterator it2=seq.begin(); - for (epvector::iterator it1=sorted_seqp->begin(); it1!=last; ++it1, ++it2) { - iter_swap(it1,it2); - } - delete sorted_seqp; - */ - - /* - cout << "after canonicalize" << std::endl; - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - (*cit).printraw(cout); - } - cout << std::endl; - cout.flush(); - */ + return; } + +/** Compact a presorted expairseq by combining all matching expairs to one + * each. On an add object, this is responsible for 2*x+3*x+y -> 5*x+y, for + * instance. */ void expairseq::combine_same_terms_sorted_seq(void) { - bool needs_further_processing=false; + bool needs_further_processing = false; - // combine same terms, drop term with coeff 0 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; + 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_numeric((*itin1).coeff). add_dyn(ex_to_numeric((*itin2).coeff)); - if (expair_needs_further_processing(itin1)) { + if (expair_needs_further_processing(itin1)) needs_further_processing = true; - } - must_copy=true; + must_copy = true; } else { if (!ex_to_numeric((*itin1).coeff).is_zero()) { - if (must_copy) { - *itout=*itin1; - } + if (must_copy) + *itout = *itin1; ++itout; } - itin1=itin2; + itin1 = itin2; } ++itin2; } if (!ex_to_numeric((*itin1).coeff).is_zero()) { - if (must_copy) { - *itout=*itin1; - } + if (must_copy) + *itout = *itin1; ++itout; } - if (itout!=last) { + if (itout!=last) seq.erase(itout,last); - } } - - /* - cout << "after combine" << std::endl; - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - (*cit).printraw(cout); - } - cout << std::endl; - cout.flush(); - */ if (needs_further_processing) { - epvector v=seq; + epvector v = seq; seq.clear(); construct_from_epvector(v); } + return; } -#ifdef EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB unsigned expairseq::calc_hashtabsize(unsigned sz) const { unsigned size; unsigned nearest_power_of_2 = 1 << log2(sz); - // if (nearest_power_of_2 < maxhashtabsize/hashtabfactor) { - // size=nearest_power_of_2*hashtabfactor; - size=nearest_power_of_2/hashtabfactor; - if (size=0); GINAC_ASSERT((hashindex & touched, - unsigned & number_of_zeroes) +void expairseq::build_hashtab_and_combine(epvector::iterator &first_numeric, + epvector::iterator &last_non_zero, + vector &touched, + unsigned &number_of_zeroes) { epp current=seq.begin(); @@ -1318,13 +1216,14 @@ void expairseq::build_hashtab_and_combine(epvector::iterator & first_numeric, iter_swap(current,first_numeric); } else { // calculate hashindex - unsigned currenthashindex=calc_hashindex((*current).rest); + unsigned currenthashindex = calc_hashindex((*current).rest); // test if there is already a matching expair in the hashtab-list - epplist & eppl=hashtab[currenthashindex]; - epplist::iterator epplit=eppl.begin(); + epplist &eppl=hashtab[currenthashindex]; + epplist::iterator epplit = eppl.begin(); while (epplit!=eppl.end()) { - if ((*current).rest.is_equal((*(*epplit)).rest)) break; + if ((*current).rest.is_equal((*(*epplit)).rest)) + break; ++epplit; } if (epplit==eppl.end()) { @@ -1348,27 +1247,27 @@ void expairseq::build_hashtab_and_combine(epvector::iterator & first_numeric, } } } -} +} -void expairseq::drop_coeff_0_terms(epvector::iterator & first_numeric, - epvector::iterator & last_non_zero, - vector & touched, - unsigned & number_of_zeroes) +void expairseq::drop_coeff_0_terms(epvector::iterator &first_numeric, + epvector::iterator &last_non_zero, + vector &touched, + unsigned &number_of_zeroes) { // move terms with coeff 0 to end and remove them from hashtab // check only those elements which have been touched - epp current=seq.begin(); - unsigned i=0; + epp current = seq.begin(); + unsigned i = 0; while (current!=first_numeric) { if (!touched[i]) { ++current; ++i; - } else if (!ex_to_numeric((*current).coeff).is_equal(_num0())) { + } else if (!ex_to_numeric((*current).coeff).is_zero()) { ++current; ++i; } else { remove_hashtab_entry(current); - + // move element to the end, unless it is already at the end if (current!=last_non_zero) { iter_swap(current,last_non_zero); @@ -1377,12 +1276,11 @@ void expairseq::drop_coeff_0_terms(epvector::iterator & first_numeric, if (numeric_swapped) iter_swap(first_numeric,current); epvector::iterator changed_entry; - if (numeric_swapped) { - changed_entry=first_numeric; - } else { - changed_entry=last_non_zero; - } - + if (numeric_swapped) + changed_entry = first_numeric; + else + changed_entry = last_non_zero; + --last_non_zero; ++number_of_zeroes; @@ -1390,7 +1288,7 @@ void expairseq::drop_coeff_0_terms(epvector::iterator & first_numeric, // change entry in hashtab which referred to first_numeric or last_non_zero to current move_hashtab_entry(changed_entry,current); - touched[current-seq.begin()]=touched[changed_entry-seq.begin()]; + touched[current-seq.begin()] = touched[changed_entry-seq.begin()]; } } else { --first_numeric; @@ -1402,12 +1300,14 @@ void expairseq::drop_coeff_0_terms(epvector::iterator & first_numeric, GINAC_ASSERT(i==current-seq.begin()); } +/** True if one of the coeffs vanishes, otherwise false. + * This would be an invariant violation, so this should only be used for + * debugging purposes. */ bool expairseq::has_coeff_0(void) const { for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - if ((*cit).coeff.is_equal(_ex0())) { + if ((*cit).coeff.is_zero()) return true; - } } return false; } @@ -1416,9 +1316,9 @@ void expairseq::add_numerics_to_hashtab(epvector::iterator first_numeric, epvector::const_iterator last_non_zero) { if (first_numeric==seq.end()) return; // no numerics - - epvector::iterator current=first_numeric; - epvector::const_iterator last=last_non_zero+1; + + epvector::iterator current = first_numeric; + epvector::const_iterator last = last_non_zero+1; while (current!=last) { sorted_insert(hashtab[hashmask],current); ++current; @@ -1430,33 +1330,33 @@ void expairseq::combine_same_terms(void) // combine same terms, drop term with coeff 0, move numerics to end // calculate size of hashtab - hashtabsize=calc_hashtabsize(seq.size()); - + hashtabsize = calc_hashtabsize(seq.size()); + // hashtabsize is a power of 2 - hashmask=hashtabsize-1; - + hashmask = hashtabsize-1; + // allocate hashtab hashtab.clear(); hashtab.resize(hashtabsize); - + if (hashtabsize==0) { canonicalize(); combine_same_terms_sorted_seq(); GINAC_ASSERT(!has_coeff_0()); return; } - + // iterate through seq, move numerics to end, // fill hashtab and combine same terms - epvector::iterator first_numeric=seq.end(); - epvector::iterator last_non_zero=seq.end()-1; - + epvector::iterator first_numeric = seq.end(); + epvector::iterator last_non_zero = seq.end()-1; + vector touched; touched.reserve(seq.size()); for (unsigned i=0; i0) return 1; // not canoncalized -#endif // def EXPAIRSEQ_USE_HASHTAB +#endif // EXPAIRSEQ_USE_HASHTAB epvector::const_iterator it = seq.begin(); epvector::const_iterator it_last = it; @@ -1540,18 +1443,24 @@ bool expairseq::is_canonical() const return 1; } + +/** Member-wise expand the expairs in this sequence. + * + * @see expairseq::expand() + * @return pointer to epvector containing expanded pairs or zero pointer, + * if no members were changed. */ epvector * expairseq::expandchildren(unsigned options) const { epvector::const_iterator last = seq.end(); epvector::const_iterator cit = seq.begin(); while (cit!=last) { - const ex & expanded_ex=(*cit).rest.expand(options); + const ex &expanded_ex = (*cit).rest.expand(options); if (!are_ex_trivially_equal((*cit).rest,expanded_ex)) { - + // something changed, copy seq, eval and return it - epvector *s=new epvector; + epvector *s = new epvector; s->reserve(seq.size()); - + // copy parts of seq which are known not to have changed epvector::const_iterator cit2 = seq.begin(); while (cit2!=cit) { @@ -1573,33 +1482,38 @@ epvector * expairseq::expandchildren(unsigned options) const ++cit; } - return 0; // nothing has changed + return 0; // signalling nothing has changed } - + + +/** Member-wise evaluate the expairs in this sequence. + * + * @see expairseq::eval() + * @return pointer to epvector containing evaluated pairs or zero pointer, + * if no members were changed. */ epvector * expairseq::evalchildren(int level) const { // returns a NULL pointer if nothing had to be evaluated // returns a pointer to a newly created epvector otherwise // (which has to be deleted somewhere else) - if (level==1) { + if (level==1) return 0; - } - if (level == -max_recursion_level) { + + if (level == -max_recursion_level) throw(std::runtime_error("max recursion level reached")); - } - + --level; epvector::const_iterator last=seq.end(); epvector::const_iterator cit=seq.begin(); while (cit!=last) { - const ex & evaled_ex=(*cit).rest.eval(level); + const ex &evaled_ex = (*cit).rest.eval(level); if (!are_ex_trivially_equal((*cit).rest,evaled_ex)) { - + // something changed, copy seq, eval and return it epvector *s = new epvector; s->reserve(seq.size()); - + // copy parts of seq which are known not to have changed epvector::const_iterator cit2=seq.begin(); while (cit2!=cit) { @@ -1621,14 +1535,19 @@ epvector * expairseq::evalchildren(int level) const ++cit; } - return 0; // nothing has changed + return 0; // signalling nothing has changed } + +/** Member-wise evaluate numerically all expairs in this sequence. + * + * @see expairseq::evalf() + * @return epvector with all entries evaluated numerically. */ epvector expairseq::evalfchildren(int level) const { if (level==1) return seq; - + if (level==-max_recursion_level) throw(std::runtime_error("max recursion level reached")); @@ -1643,17 +1562,22 @@ epvector expairseq::evalfchildren(int level) const return s; } + +/** Member-wise normalize all expairs in this sequence. + * + * @see expairseq::normal() + * @return epvector with all entries normalized. */ epvector expairseq::normalchildren(int level) const { if (level==1) return seq; - if (level == -max_recursion_level) + if (level==-max_recursion_level) throw(std::runtime_error("max recursion level reached")); - + epvector s; s.reserve(seq.size()); - + --level; for (epvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) { s.push_back(combine_ex_with_coeff_to_pair((*it).rest.normal(level), @@ -1662,11 +1586,16 @@ epvector expairseq::normalchildren(int level) const return s; } -epvector expairseq::diffchildren(const symbol & y) const + +/** Member-wise differentiate all expairs in this sequence. + * + * @see expairseq::diff() + * @return epvector with all entries differentiated. */ +epvector expairseq::diffchildren(const symbol &y) const { epvector s; s.reserve(seq.size()); - + for (epvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) { s.push_back(combine_ex_with_coeff_to_pair((*it).rest.diff(y), (*it).coeff)); @@ -1674,25 +1603,31 @@ epvector expairseq::diffchildren(const symbol & y) const return s; } -epvector * expairseq::subschildren(const lst & ls, const lst & lr) const + +/** Member-wise substitute in this sequence. + * + * @see expairseq::subs() + * @return pointer to epvector containing pairs after application of subs or zero + * pointer, if no members were changed. */ +epvector * expairseq::subschildren(const lst &ls, const lst &lr) const { // returns a NULL pointer if nothing had to be substituted // returns a pointer to a newly created epvector otherwise // (which has to be deleted somewhere else) GINAC_ASSERT(ls.nops()==lr.nops()); - epvector::const_iterator last=seq.end(); - epvector::const_iterator cit=seq.begin(); + epvector::const_iterator last = seq.end(); + epvector::const_iterator cit = seq.begin(); while (cit!=last) { - const ex & subsed_ex=(*cit).rest.subs(ls,lr); + const ex &subsed_ex=(*cit).rest.subs(ls,lr); if (!are_ex_trivially_equal((*cit).rest,subsed_ex)) { // something changed, copy seq, subs and return it - epvector *s=new epvector; + epvector *s = new epvector; s->reserve(seq.size()); // copy parts of seq which are known not to have changed - epvector::const_iterator cit2=seq.begin(); + epvector::const_iterator cit2 = seq.begin(); while (cit2!=cit) { s->push_back(*cit2); ++cit2; @@ -1712,7 +1647,7 @@ epvector * expairseq::subschildren(const lst & ls, const lst & lr) const ++cit; } - return 0; // nothing has changed + return 0; // signalling nothing has changed } ////////// @@ -1721,14 +1656,12 @@ epvector * expairseq::subschildren(const lst & ls, const lst & lr) const // protected -unsigned expairseq::precedence=10; +unsigned expairseq::precedence = 10; -#ifdef EXPAIRSEQ_USE_HASHTAB -unsigned expairseq::maxhashtabsize=0x4000000U; -unsigned expairseq::minhashtabsize=0x1000U; -unsigned expairseq::hashtabfactor=1; -#endif // def EXPAIRSEQ_USE_HASHTAB +#if EXPAIRSEQ_USE_HASHTAB +unsigned expairseq::maxhashtabsize = 0x4000000U; +unsigned expairseq::minhashtabsize = 0x1000U; +unsigned expairseq::hashtabfactor = 1; +#endif // EXPAIRSEQ_USE_HASHTAB -#ifndef NO_NAMESPACE_GINAC } // namespace GiNaC -#endif // ndef NO_NAMESPACE_GINAC