#include "power.h"
#include "relational.h"
#include "wildcard.h"
-#include "print.h"
#include "archive.h"
#include "operators.h"
#include "utils.h"
namespace GiNaC {
-GINAC_IMPLEMENT_REGISTERED_CLASS(expairseq, basic)
+GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(expairseq, basic,
+ print_func<print_context>(&expairseq::do_print).
+ print_func<print_tree>(&expairseq::do_print_tree))
+
//////////
// helper classes
GINAC_ASSERT(is_canonical());
}
-expairseq::expairseq(epvector *vp, const ex &oc)
+expairseq::expairseq(std::auto_ptr<epvector> vp, const ex &oc)
: inherited(TINFO_expairseq), overall_coeff(oc)
{
GINAC_ASSERT(vp!=0);
GINAC_ASSERT(is_a<numeric>(oc));
construct_from_epvector(*vp);
- delete vp;
GINAC_ASSERT(is_canonical());
}
// public
-void expairseq::print(const print_context &c, unsigned level) const
+void expairseq::do_print(const print_context & c, unsigned level) const
{
- if (is_a<print_tree>(c)) {
-
- unsigned delta_indent = static_cast<const print_tree &>(c).delta_indent;
-
- c.s << std::string(level, ' ') << class_name()
- << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
- << ", nops=" << nops()
- << std::endl;
- size_t num = seq.size();
- for (size_t i=0; i<num; ++i) {
- seq[i].rest.print(c, level + delta_indent);
- seq[i].coeff.print(c, level + delta_indent);
- if (i != num - 1)
- c.s << std::string(level + delta_indent, ' ') << "-----" << std::endl;
- }
- if (!overall_coeff.is_equal(default_overall_coeff())) {
- c.s << std::string(level + delta_indent, ' ') << "-----" << std::endl
- << std::string(level + delta_indent, ' ') << "overall_coeff" << std::endl;
- overall_coeff.print(c, level + delta_indent);
- }
- c.s << std::string(level + delta_indent,' ') << "=====" << std::endl;
+ c.s << "[[";
+ printseq(c, ',', precedence(), level);
+ c.s << "]]";
+}
+
+void expairseq::do_print_tree(const print_tree & c, unsigned level) const
+{
+ c.s << std::string(level, ' ') << class_name() << " @" << this
+ << std::hex << ", hash=0x" << hashvalue << ", flags=0x" << flags << std::dec
+ << ", nops=" << nops()
+ << std::endl;
+ size_t num = seq.size();
+ for (size_t i=0; i<num; ++i) {
+ seq[i].rest.print(c, level + c.delta_indent);
+ seq[i].coeff.print(c, level + c.delta_indent);
+ if (i != num - 1)
+ c.s << std::string(level + c.delta_indent, ' ') << "-----" << std::endl;
+ }
+ if (!overall_coeff.is_equal(default_overall_coeff())) {
+ c.s << std::string(level + c.delta_indent, ' ') << "-----" << std::endl
+ << std::string(level + c.delta_indent, ' ') << "overall_coeff" << std::endl;
+ overall_coeff.print(c, level + c.delta_indent);
+ }
+ c.s << std::string(level + c.delta_indent,' ') << "=====" << std::endl;
#if EXPAIRSEQ_USE_HASHTAB
- c.s << std::string(level + delta_indent,' ')
- << "hashtab size " << hashtabsize << std::endl;
- if (hashtabsize == 0) return;
+ c.s << std::string(level + c.delta_indent,' ')
+ << "hashtab size " << hashtabsize << std::endl;
+ if (hashtabsize == 0) return;
#define MAXCOUNT 5
- unsigned count[MAXCOUNT+1];
- for (int i=0; i<MAXCOUNT+1; ++i)
- count[i] = 0;
- unsigned this_bin_fill;
- unsigned cum_fill_sq = 0;
- unsigned cum_fill = 0;
- for (unsigned i=0; i<hashtabsize; ++i) {
- this_bin_fill = 0;
- if (hashtab[i].size() > 0) {
- c.s << std::string(level + delta_indent, ' ')
- << "bin " << i << " with entries ";
- for (epplist::const_iterator it=hashtab[i].begin();
- it!=hashtab[i].end(); ++it) {
- c.s << *it-seq.begin() << " ";
- ++this_bin_fill;
- }
- c.s << std::endl;
- cum_fill += this_bin_fill;
- cum_fill_sq += this_bin_fill*this_bin_fill;
+ unsigned count[MAXCOUNT+1];
+ for (int i=0; i<MAXCOUNT+1; ++i)
+ count[i] = 0;
+ unsigned this_bin_fill;
+ unsigned cum_fill_sq = 0;
+ unsigned cum_fill = 0;
+ for (unsigned i=0; i<hashtabsize; ++i) {
+ this_bin_fill = 0;
+ if (hashtab[i].size() > 0) {
+ c.s << std::string(level + c.delta_indent, ' ')
+ << "bin " << i << " with entries ";
+ for (epplist::const_iterator it=hashtab[i].begin();
+ it!=hashtab[i].end(); ++it) {
+ c.s << *it-seq.begin() << " ";
+ ++this_bin_fill;
}
- if (this_bin_fill<MAXCOUNT)
- ++count[this_bin_fill];
- else
- ++count[MAXCOUNT];
+ c.s << std::endl;
+ cum_fill += this_bin_fill;
+ cum_fill_sq += this_bin_fill*this_bin_fill;
}
- unsigned fact = 1;
- double cum_prob = 0;
- double lambda = (1.0*seq.size()) / hashtabsize;
- for (int k=0; k<MAXCOUNT; ++k) {
- if (k>0)
- fact *= k;
- double prob = std::pow(lambda,k)/fact * std::exp(-lambda);
- cum_prob += prob;
- c.s << std::string(level + delta_indent, ' ') << "bins with " << k << " entries: "
- << int(1000.0*count[k]/hashtabsize)/10.0 << "% (expected: "
- << int(prob*1000)/10.0 << ")" << std::endl;
- }
- c.s << std::string(level + delta_indent, ' ') << "bins with more entries: "
- << int(1000.0*count[MAXCOUNT]/hashtabsize)/10.0 << "% (expected: "
- << int((1-cum_prob)*1000)/10.0 << ")" << std::endl;
-
- c.s << std::string(level + delta_indent, ' ') << "variance: "
- << 1.0/hashtabsize*cum_fill_sq-(1.0/hashtabsize*cum_fill)*(1.0/hashtabsize*cum_fill)
- << std::endl;
- c.s << std::string(level + delta_indent, ' ') << "average fill: "
- << (1.0*cum_fill)/hashtabsize
- << " (should be equal to " << (1.0*seq.size())/hashtabsize << ")" << std::endl;
-#endif // EXPAIRSEQ_USE_HASHTAB
-
- } else {
- c.s << "[[";
- printseq(c, ',', precedence(), level);
- c.s << "]]";
+ if (this_bin_fill<MAXCOUNT)
+ ++count[this_bin_fill];
+ else
+ ++count[MAXCOUNT];
+ }
+ unsigned fact = 1;
+ double cum_prob = 0;
+ double lambda = (1.0*seq.size()) / hashtabsize;
+ for (int k=0; k<MAXCOUNT; ++k) {
+ if (k>0)
+ fact *= k;
+ double prob = std::pow(lambda,k)/fact * std::exp(-lambda);
+ cum_prob += prob;
+ c.s << std::string(level + c.delta_indent, ' ') << "bins with " << k << " entries: "
+ << int(1000.0*count[k]/hashtabsize)/10.0 << "% (expected: "
+ << int(prob*1000)/10.0 << ")" << std::endl;
}
+ c.s << std::string(level + c.delta_indent, ' ') << "bins with more entries: "
+ << int(1000.0*count[MAXCOUNT]/hashtabsize)/10.0 << "% (expected: "
+ << int((1-cum_prob)*1000)/10.0 << ")" << std::endl;
+
+ c.s << std::string(level + c.delta_indent, ' ') << "variance: "
+ << 1.0/hashtabsize*cum_fill_sq-(1.0/hashtabsize*cum_fill)*(1.0/hashtabsize*cum_fill)
+ << std::endl;
+ c.s << std::string(level + c.delta_indent, ' ') << "average fill: "
+ << (1.0*cum_fill)/hashtabsize
+ << " (should be equal to " << (1.0*seq.size())/hashtabsize << ")" << std::endl;
+#endif // EXPAIRSEQ_USE_HASHTAB
}
bool expairseq::info(unsigned inf) const
ex expairseq::map(map_function &f) const
{
- epvector *v = new epvector;
+ std::auto_ptr<epvector> v(new epvector);
v->reserve(seq.size());
epvector::const_iterator cit = seq.begin(), last = seq.end();
if ((level==1) && (flags &status_flags::evaluated))
return *this;
- epvector *vp = evalchildren(level);
- if (vp==0)
+ std::auto_ptr<epvector> vp = evalchildren(level);
+ if (vp.get() == 0)
return this->hold();
- return (new expairseq(vp,overall_coeff))->setflag(status_flags::dynallocated | status_flags::evaluated);
+ return (new expairseq(vp, overall_coeff))->setflag(status_flags::dynallocated | status_flags::evaluated);
}
bool expairseq::match(const ex & pattern, lst & repl_lst) const
// it has already been matched before, in which case the matches
// must be equal)
size_t num = ops.size();
- epvector *vp = new epvector();
+ std::auto_ptr<epvector> vp(new epvector);
vp->reserve(num);
for (size_t i=0; i<num; i++)
vp->push_back(split_ex_to_pair(ops[i]));
return inherited::match(pattern, repl_lst);
}
-ex expairseq::subs(const lst &ls, const lst &lr, unsigned options) const
+ex expairseq::subs(const exmap & m, unsigned options) const
{
- epvector *vp = subschildren(ls, lr, options);
- if (vp)
+ std::auto_ptr<epvector> vp = subschildren(m, options);
+ if (vp.get())
return ex_to<basic>(thisexpairseq(vp, overall_coeff));
- else if ((options & subs_options::subs_algebraic) && is_exactly_a<mul>(*this))
- return static_cast<const mul *>(this)->algebraic_subs_mul(ls, lr, options);
+ else if ((options & subs_options::algebraic) && is_exactly_a<mul>(*this))
+ return static_cast<const mul *>(this)->algebraic_subs_mul(m, options);
else
- return subs_one_level(ls, lr, options);
+ return subs_one_level(m, options);
}
// protected
ex expairseq::expand(unsigned options) const
{
- epvector *vp = expandchildren(options);
- if (vp == NULL) {
+ std::auto_ptr<epvector> vp = expandchildren(options);
+ if (vp.get())
+ return thisexpairseq(vp, overall_coeff);
+ else {
// The terms have not changed, so it is safe to declare this expanded
return (options == 0) ? setflag(status_flags::expanded) : *this;
- } else
- return thisexpairseq(vp, overall_coeff);
+ }
}
//////////
* definition. */
ex expairseq::thisexpairseq(const epvector &v, const ex &oc) const
{
- return expairseq(v,oc);
+ return expairseq(v, oc);
}
-ex expairseq::thisexpairseq(epvector *vp, const ex &oc) const
+ex expairseq::thisexpairseq(std::auto_ptr<epvector> vp, const ex &oc) const
{
- return expairseq(vp,oc);
+ return expairseq(vp, oc);
}
void expairseq::printpair(const print_context & c, const expair & p, unsigned upper_precedence) const
* @see expairseq::expand()
* @return pointer to epvector containing expanded pairs or zero pointer,
* if no members were changed. */
-epvector * expairseq::expandchildren(unsigned options) const
+std::auto_ptr<epvector> expairseq::expandchildren(unsigned options) const
{
const epvector::const_iterator last = seq.end();
epvector::const_iterator cit = seq.begin();
if (!are_ex_trivially_equal(cit->rest,expanded_ex)) {
// something changed, copy seq, eval and return it
- epvector *s = new epvector;
+ std::auto_ptr<epvector> s(new epvector);
s->reserve(seq.size());
// copy parts of seq which are known not to have changed
s->push_back(*cit2);
++cit2;
}
+
// copy first changed element
s->push_back(combine_ex_with_coeff_to_pair(expanded_ex,
cit2->coeff));
++cit2;
+
// copy rest
while (cit2!=last) {
s->push_back(combine_ex_with_coeff_to_pair(cit2->rest.expand(options),
++cit;
}
- return 0; // signalling nothing has changed
+ return std::auto_ptr<epvector>(0); // signalling nothing has changed
}
* @see expairseq::eval()
* @return pointer to epvector containing evaluated pairs or zero pointer,
* if no members were changed. */
-epvector * expairseq::evalchildren(int level) const
+std::auto_ptr<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)
- return 0;
+ return std::auto_ptr<epvector>(0);
if (level == -max_recursion_level)
throw(std::runtime_error("max recursion level reached"));
if (!are_ex_trivially_equal(cit->rest,evaled_ex)) {
// something changed, copy seq, eval and return it
- epvector *s = new epvector;
+ std::auto_ptr<epvector> s(new epvector);
s->reserve(seq.size());
// copy parts of seq which are known not to have changed
s->push_back(*cit2);
++cit2;
}
+
// copy first changed element
s->push_back(combine_ex_with_coeff_to_pair(evaled_ex,
cit2->coeff));
++cit2;
+
// copy rest
while (cit2!=last) {
s->push_back(combine_ex_with_coeff_to_pair(cit2->rest.eval(level),
++cit;
}
- return 0; // signalling nothing has changed
+ return std::auto_ptr<epvector>(0); // signalling nothing has changed
}
* @see expairseq::subs()
* @return pointer to epvector containing pairs after application of subs,
* or NULL pointer if no members were changed. */
-epvector * expairseq::subschildren(const lst &ls, const lst &lr, unsigned options) const
+std::auto_ptr<epvector> expairseq::subschildren(const exmap & m, unsigned options) const
{
- GINAC_ASSERT(ls.nops()==lr.nops());
-
- // The substitution is "complex" when any of the objects to be substituted
- // is a product or power. In this case we have to recombine the pairs
- // because the numeric coefficients may be part of the search pattern.
- bool complex_subs = false;
- for (lst::const_iterator it = ls.begin(); it != ls.end(); ++it) {
- if (is_exactly_a<mul>(*it) || is_exactly_a<power>(*it)) {
- complex_subs = true;
- break;
+ // When any of the objects to be substituted is a product or power
+ // we have to recombine the pairs because the numeric coefficients may
+ // be part of the search pattern.
+ if (!(options & (subs_options::pattern_is_product | subs_options::pattern_is_not_product))) {
+
+ // Search the list of substitutions and cache our findings
+ for (exmap::const_iterator it = m.begin(); it != m.end(); ++it) {
+ if (is_exactly_a<mul>(it->first) || is_exactly_a<power>(it->first)) {
+ options |= subs_options::pattern_is_product;
+ break;
+ }
}
+ if (!(options & subs_options::pattern_is_product))
+ options |= subs_options::pattern_is_not_product;
}
- if (complex_subs) {
+ if (options & subs_options::pattern_is_product) {
// Substitute in the recombined pairs
epvector::const_iterator cit = seq.begin(), last = seq.end();
while (cit != last) {
const ex &orig_ex = recombine_pair_to_ex(*cit);
- const ex &subsed_ex = orig_ex.subs(ls, lr, options);
+ const ex &subsed_ex = orig_ex.subs(m, options);
if (!are_ex_trivially_equal(orig_ex, subsed_ex)) {
// Something changed, copy seq, subs and return it
- epvector *s = new epvector;
+ std::auto_ptr<epvector> s(new epvector);
s->reserve(seq.size());
// Copy parts of seq which are known not to have changed
// Copy rest
while (cit != last) {
- s->push_back(split_ex_to_pair(recombine_pair_to_ex(*cit).subs(ls, lr, options)));
+ s->push_back(split_ex_to_pair(recombine_pair_to_ex(*cit).subs(m, options)));
++cit;
}
return s;
epvector::const_iterator cit = seq.begin(), last = seq.end();
while (cit != last) {
- const ex &subsed_ex = cit->rest.subs(ls, lr, options);
+ const ex &subsed_ex = cit->rest.subs(m, options);
if (!are_ex_trivially_equal(cit->rest, subsed_ex)) {
// Something changed, copy seq, subs and return it
- epvector *s = new epvector;
+ std::auto_ptr<epvector> s(new epvector);
s->reserve(seq.size());
// Copy parts of seq which are known not to have changed
// Copy rest
while (cit != last) {
- s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(ls, lr, options),
+ s->push_back(combine_ex_with_coeff_to_pair(cit->rest.subs(m, options),
cit->coeff));
++cit;
}
}
// Nothing has changed
- return NULL;
+ return std::auto_ptr<epvector>(0);
}
//////////
git://www.ginac.de / ginac.git / blobdiff