X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fexpairseq.cpp;h=1fa592e7ec158f411887f8eb56dfb4043bc53362;hp=360c7b97fcc45840afcb9bc1b885055fd25c46be;hb=a6bb52b00bf185271774e7d56215923700a3ec40;hpb=24fe247f9ed16114a765a01c593fec5c4a2f591c diff --git a/ginac/expairseq.cpp b/ginac/expairseq.cpp index 360c7b97..1fa592e7 100644 --- a/ginac/expairseq.cpp +++ b/ginac/expairseq.cpp @@ -23,13 +23,16 @@ #include #include #include +#include #include "expairseq.h" #include "lst.h" #include "debugmsg.h" #include "utils.h" +#ifndef NO_GINAC_NAMESPACE namespace GiNaC { +#endif // ndef NO_GINAC_NAMESPACE #ifdef EXPAIRSEQ_USE_HASHTAB #error "FIXME: expair_needs_further_processing not yet implemented for hashtabs, sorry. A.F." @@ -162,6 +165,104 @@ basic * expairseq::duplicate() const return new expairseq(*this); } +void expairseq::print(ostream & os, unsigned upper_precedence) const +{ + debugmsg("expairseq print",LOGLEVEL_PRINT); + os << "[["; + printseq(os,',',precedence,upper_precedence); + os << "]]"; +} + +void expairseq::printraw(ostream & os) const +{ + debugmsg("expairseq printraw",LOGLEVEL_PRINT); + + os << "expairseq("; + for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { + os << "("; + (*cit).rest.printraw(os); + os << ","; + (*cit).coeff.printraw(os); + os << "),"; + } + os << ")"; +} + +void expairseq::printtree(ostream & os, unsigned indent) const +{ + debugmsg("expairseq printtree",LOGLEVEL_PRINT); + + os << string(indent,' ') << "type=" << typeid(*this).name() + << ", hash=" << hashvalue << " (0x" << hex << hashvalue << dec << ")" + << ", flags=" << flags + << ", nops=" << nops() << endl; + for (unsigned i=0; i0) { + os << string(indent+delta_indent,' ') + << "bin " << i << " with entries "; + for (epplist::const_iterator it=hashtab[i].begin(); + it!=hashtab[i].end(); ++it) { + os << *it-seq.begin() << " "; + this_bin_fill++; + } + os << 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); + cum_prob += prob; + os << string(indent+delta_indent,' ') << "bins with " << k << " entries: " + << int(1000.0*count[k]/hashtabsize)/10.0 << "% (expected: " + << int(prob*1000)/10.0 << ")" << endl; + } + os << string(indent+delta_indent,' ') << "bins with more entries: " + << int(1000.0*count[MAXCOUNT]/hashtabsize)/10.0 << "% (expected: " + << int((1-cum_prob)*1000)/10.0 << ")" << endl; + + os << string(indent+delta_indent,' ') << "variance: " + << 1.0/hashtabsize*cum_fill_sq-(1.0/hashtabsize*cum_fill)*(1.0/hashtabsize*cum_fill) + << endl; + os << string(indent+delta_indent,' ') << "average fill: " + << (1.0*cum_fill)/hashtabsize + << " (should be equal to " << (1.0*seq.size())/hashtabsize << ")" << endl; +#endif // def EXPAIRSEQ_USE_HASHTAB +} + bool expairseq::info(unsigned inf) const { return basic::info(inf); @@ -409,9 +510,36 @@ ex expairseq::thisexpairseq(epvector * vp, ex const & oc) const return expairseq(vp,oc); } +void expairseq::printpair(ostream & os, expair const & p, unsigned upper_precedence) const +{ + os << "[["; + p.rest.bp->print(os,precedence); + os << ","; + p.coeff.bp->print(os,precedence); + os << "]]"; +} + +void expairseq::printseq(ostream & os, char delim, unsigned this_precedence, + unsigned upper_precedence) const +{ + if (this_precedence<=upper_precedence) os << "("; + epvector::const_iterator it,it_last; + it_last=seq.end(); + --it_last; + for (it=seq.begin(); it!=it_last; ++it) { + printpair(os,*it,this_precedence); + os << delim; + } + printpair(os,*it,this_precedence); + if (!overall_coeff.is_equal(default_overall_coeff())) { + os << delim << overall_coeff; + } + if (this_precedence<=upper_precedence) os << ")"; +} + expair expairseq::split_ex_to_pair(ex const & e) const { - return expair(e,exONE()); + return expair(e,_ex1()); } expair expairseq::combine_ex_with_coeff_to_pair(ex const & e, @@ -443,7 +571,7 @@ bool expairseq::expair_needs_further_processing(epp it) ex expairseq::default_overall_coeff(void) const { - return exZERO(); + return _ex0(); } void expairseq::combine_overall_coeff(ex const & c) @@ -1186,7 +1314,7 @@ void expairseq::drop_coeff_0_terms(epvector::iterator & first_numeric, if (!touched[i]) { ++current; ++i; - } else if (!ex_to_numeric((*current).coeff).is_equal(numZERO())) { + } else if (!ex_to_numeric((*current).coeff).is_equal(_num0())) { ++current; ++i; } else { @@ -1228,7 +1356,7 @@ void expairseq::drop_coeff_0_terms(epvector::iterator & first_numeric, bool expairseq::has_coeff_0(void) const { for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - if ((*cit).coeff.is_equal(exZERO())) { + if ((*cit).coeff.is_equal(_ex0())) { return true; } } @@ -1419,7 +1547,7 @@ epvector * expairseq::evalchildren(int level) const ex const & evaled_ex=(*cit).rest.eval(level); if (!are_ex_trivially_equal((*cit).rest,evaled_ex)) { - // something changed, copy seq, eval and return it + // something changed, copy seq, eval and return it epvector *s=new epvector; s->reserve(seq.size()); @@ -1502,17 +1630,18 @@ epvector * expairseq::subschildren(lst const & ls, lst const & 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(); while (cit!=last) { ex const & 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; s->reserve(seq.size()); - + // copy parts of seq which are known not to have changed epvector::const_iterator cit2=seq.begin(); while (cit2!=cit) { @@ -1528,7 +1657,7 @@ epvector * expairseq::subschildren(lst const & ls, lst const & lr) const s->push_back(combine_ex_with_coeff_to_pair((*cit2).rest.subs(ls,lr), (*cit2).coeff)); ++cit2; - } + } return s; } ++cit; @@ -1537,75 +1666,6 @@ epvector * expairseq::subschildren(lst const & ls, lst const & lr) const return 0; // nothing has changed } -/* -epvector expairseq::subschildren(lst const & ls, lst const & lr) const -{ - epvector s; - s.reserve(seq.size()); - - for (epvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) { - s.push_back(split_ex_to_pair((*it).rest.subs(ls,lr),(*it).coeff)); - } - return s; -} -*/ - -/* -void expairseq::sort(epviter first, epviter last, expair_is_less comp) -{ - if (first != last) { - introsort_loop(first, last, lg(last - first) * 2, comp); - __final_insertion_sort(first, last, comp); - } -} - -ptrdiff_t expairseq::lg(ptrdiff_t n) -{ - ptrdiff_t k; - for (k = 0; n > 1; n >>= 1) ++k; - return k; -} - -void expairseq::introsort_loop(epviter first, epviter last, - ptrdiff_t depth_limit, expair_is_less comp) -{ - while (last - first > stl_threshold) { - if (depth_limit == 0) { - partial_sort(first, last, last, comp); - return; - } - --depth_limit; - epviter cut = unguarded_partition(first, last, - expair(__median(*first, *(first + (last - first)/2), - *(last - 1), comp)), comp); - introsort_loop(cut, last, depth_limit, comp); - last = cut; - } -} - -epviter expairseq::unguarded_partition(epviter first, epviter last, - expair pivot, expair_is_less comp) -{ - while (1) { - while (comp(*first, pivot)) ++first; - --last; - while (comp(pivot, *last)) --last; - if (!(first < last)) return first; - iter_swap(first, last); - ++first; - } -} - -void expairseq::partial_sort(epviter first, epviter middle, epviter last, - expair_is_less comp) { - make_heap(first, middle, comp); - for (RandomAccessIterator i = middle; i < last; ++i) - if (comp(*i, *first)) - __pop_heap(first, middle, i, T(*i), comp, distance_type(first)); - sort_heap(first, middle, comp); -} -*/ - ////////// // static member variables ////////// @@ -1627,4 +1687,6 @@ unsigned expairseq::hashtabfactor=1; const expairseq some_expairseq; type_info const & typeid_expairseq=typeid(some_expairseq); +#ifndef NO_GINAC_NAMESPACE } // namespace GiNaC +#endif // ndef NO_GINAC_NAMESPACE