X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.cpp;h=279933d3ecb3f907e1940e4ebeee83357aefb0c1;hp=17faae2c60244e76a2cdfd8f998d1294facf68fa;hb=3a63743e24046766b37c3d1bd38605542ee0a536;hpb=c8ba9c6cf819792cbf88d25b324406b67d5cc49a diff --git a/ginac/add.cpp b/ginac/add.cpp index 17faae2c..279933d3 100644 --- a/ginac/add.cpp +++ b/ginac/add.cpp @@ -27,7 +27,6 @@ #include "mul.h" #include "matrix.h" #include "archive.h" -#include "debugmsg.h" #include "utils.h" namespace GiNaC { @@ -35,12 +34,11 @@ namespace GiNaC { GINAC_IMPLEMENT_REGISTERED_CLASS(add, expairseq) ////////// -// default constructor, destructor, copy constructor assignment operator and helpers +// default ctor, dtor, copy ctor, assignment operator and helpers ////////// add::add() { - debugmsg("add default constructor",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_add; } @@ -55,34 +53,30 @@ DEFAULT_DESTROY(add) add::add(const ex & lh, const ex & rh) { - debugmsg("add constructor from ex,ex",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_add; - overall_coeff = _ex0(); + overall_coeff = _ex0; construct_from_2_ex(lh,rh); GINAC_ASSERT(is_canonical()); } add::add(const exvector & v) { - debugmsg("add constructor from exvector",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_add; - overall_coeff = _ex0(); + overall_coeff = _ex0; construct_from_exvector(v); GINAC_ASSERT(is_canonical()); } add::add(const epvector & v) { - debugmsg("add constructor from epvector",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_add; - overall_coeff = _ex0(); + overall_coeff = _ex0; construct_from_epvector(v); GINAC_ASSERT(is_canonical()); } add::add(const epvector & v, const ex & oc) { - debugmsg("add constructor from epvector,ex",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_add; overall_coeff = oc; construct_from_epvector(v); @@ -91,7 +85,6 @@ add::add(const epvector & v, const ex & oc) add::add(epvector * vp, const ex & oc) { - debugmsg("add constructor from epvector *,ex",LOGLEVEL_CONSTRUCT); tinfo_key = TINFO_add; GINAC_ASSERT(vp!=0); overall_coeff = oc; @@ -107,20 +100,18 @@ add::add(epvector * vp, const ex & oc) DEFAULT_ARCHIVING(add) ////////// -// functions overriding virtual functions from bases classes +// functions overriding virtual functions from base classes ////////// // public void add::print(const print_context & c, unsigned level) const { - debugmsg("add print", LOGLEVEL_PRINT); - - if (is_of_type(c, print_tree)) { + if (is_a(c)) { inherited::print(c, level); - } else if (is_of_type(c, print_csrc)) { + } else if (is_a(c)) { if (precedence() <= level) c.s << "("; @@ -130,45 +121,57 @@ void add::print(const print_context & c, unsigned level) const while (it != itend) { // If the coefficient is -1, it is replaced by a single minus sign - if (it->coeff.compare(_num1()) == 0) { - it->rest.bp->print(c, precedence()); - } else if (it->coeff.compare(_num_1()) == 0) { + if (it->coeff.compare(_num1) == 0) { + it->rest.print(c, precedence()); + } else if (it->coeff.compare(_num_1) == 0) { c.s << "-"; - it->rest.bp->print(c, precedence()); - } else if (ex_to_numeric(it->coeff).numer().compare(_num1()) == 0) { - it->rest.bp->print(c, precedence()); + it->rest.print(c, precedence()); + } else if (ex_to(it->coeff).numer().compare(_num1) == 0) { + it->rest.print(c, precedence()); c.s << "/"; - ex_to_numeric(it->coeff).denom().print(c, precedence()); - } else if (ex_to_numeric(it->coeff).numer().compare(_num_1()) == 0) { + ex_to(it->coeff).denom().print(c, precedence()); + } else if (ex_to(it->coeff).numer().compare(_num_1) == 0) { c.s << "-"; - it->rest.bp->print(c, precedence()); + it->rest.print(c, precedence()); c.s << "/"; - ex_to_numeric(it->coeff).denom().print(c, precedence()); + ex_to(it->coeff).denom().print(c, precedence()); } else { - it->coeff.bp->print(c, precedence()); + it->coeff.print(c, precedence()); c.s << "*"; - it->rest.bp->print(c, precedence()); + it->rest.print(c, precedence()); } // Separator is "+", except if the following expression would have a leading minus sign - it++; - if (it != itend && !(it->coeff.compare(_num0()) < 0 || (it->coeff.compare(_num1()) == 0 && is_ex_exactly_of_type(it->rest, numeric) && it->rest.compare(_num0()) < 0))) + ++it; + if (it != itend && !(it->coeff.compare(_num0) < 0 || (it->coeff.compare(_num1) == 0 && is_exactly_a(it->rest) && it->rest.compare(_num0) < 0))) c.s << "+"; } if (!overall_coeff.is_zero()) { if (overall_coeff.info(info_flags::positive)) c.s << '+'; - overall_coeff.bp->print(c, precedence()); + overall_coeff.print(c, precedence()); } - + if (precedence() <= level) c.s << ")"; + } else if (is_a(c)) { + + c.s << class_name() << '('; + unsigned end = nops(); + if (end) + op(0).print(c); + for (unsigned i=1; i(c)) c.s << "{("; else c.s << "("; @@ -179,7 +182,7 @@ void add::print(const print_context & c, unsigned level) const // First print the overall numeric coefficient, if present if (!overall_coeff.is_zero()) { - if (!is_of_type(c, print_tree)) + if (!is_a(c)) overall_coeff.print(c, 0); else overall_coeff.print(c, precedence()); @@ -189,15 +192,15 @@ void add::print(const print_context & c, unsigned level) const // Then proceed with the remaining factors epvector::const_iterator it = seq.begin(), itend = seq.end(); while (it != itend) { - coeff = ex_to_numeric(it->coeff); + coeff = ex_to(it->coeff); if (!first) { if (coeff.csgn() == -1) c.s << '-'; else c.s << '+'; } else { if (coeff.csgn() == -1) c.s << '-'; first = false; } - if (!coeff.is_equal(_num1()) && - !coeff.is_equal(_num_1())) { + if (!coeff.is_equal(_num1) && + !coeff.is_equal(_num_1)) { if (coeff.is_rational()) { if (coeff.is_negative()) (-coeff).print(c); @@ -209,17 +212,17 @@ void add::print(const print_context & c, unsigned level) const else coeff.print(c, precedence()); } - if (is_of_type(c, print_latex)) + if (is_a(c)) c.s << ' '; else c.s << '*'; } it->rest.print(c, precedence()); - it++; + ++it; } if (precedence() <= level) { - if (is_of_type(c, print_latex)) + if (is_a(c)) c.s << ")}"; else c.s << ")"; @@ -236,16 +239,20 @@ bool add::info(unsigned inf) const case info_flags::rational_polynomial: case info_flags::crational_polynomial: case info_flags::rational_function: { - for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) { + epvector::const_iterator i = seq.begin(), end = seq.end(); + while (i != end) { if (!(recombine_pair_to_ex(*i).info(inf))) return false; + ++i; } return overall_coeff.info(inf); } case info_flags::algebraic: { - for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) { + epvector::const_iterator i = seq.begin(), end = seq.end(); + while (i != end) { if ((recombine_pair_to_ex(*i).info(inf))) return true; + ++i; } return false; } @@ -256,14 +263,16 @@ bool add::info(unsigned inf) const int add::degree(const ex & s) const { int deg = INT_MIN; - if (!overall_coeff.is_equal(_ex0())) + if (!overall_coeff.is_zero()) deg = 0; - int cur_deg; - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - cur_deg = (*cit).rest.degree(s); - if (cur_deg>deg) + // Find maximum of degrees of individual terms + epvector::const_iterator i = seq.begin(), end = seq.end(); + while (i != end) { + int cur_deg = i->rest.degree(s); + if (cur_deg > deg) deg = cur_deg; + ++i; } return deg; } @@ -271,52 +280,60 @@ int add::degree(const ex & s) const int add::ldegree(const ex & s) const { int deg = INT_MAX; - if (!overall_coeff.is_equal(_ex0())) + if (!overall_coeff.is_zero()) deg = 0; - int cur_deg; - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - cur_deg = (*cit).rest.ldegree(s); - if (cur_degrest.ldegree(s); + if (cur_deg < deg) + deg = cur_deg; + ++i; } return deg; } ex add::coeff(const ex & s, int n) const { - epvector coeffseq; - - epvector::const_iterator it=seq.begin(); - while (it!=seq.end()) { - ex restcoeff = it->rest.coeff(s,n); + epvector *coeffseq = new epvector(); + + // Calculate sum of coefficients in each term + epvector::const_iterator i = seq.begin(), end = seq.end(); + while (i != end) { + ex restcoeff = i->rest.coeff(s, n); if (!restcoeff.is_zero()) - coeffseq.push_back(combine_ex_with_coeff_to_pair(restcoeff,it->coeff)); - ++it; + coeffseq->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff)); + ++i; } - - return (new add(coeffseq, n==0 ? overall_coeff : default_overall_coeff()))->setflag(status_flags::dynallocated); + + return (new add(coeffseq, n==0 ? overall_coeff : _ex0))->setflag(status_flags::dynallocated); } +/** Perform automatic term rewriting rules in this class. In the following + * x stands for a symbolic variables of type ex and c stands for such + * an expression that contain a plain number. + * - +(;c) -> c + * - +(x;1) -> x + * + * @param level cut-off in recursive evaluation */ ex add::eval(int level) const { - // simplifications: +(;c) -> c - // +(x;1) -> x - - debugmsg("add eval",LOGLEVEL_MEMBER_FUNCTION); - - epvector * evaled_seqp = evalchildren(level); - if (evaled_seqp!=0) { + epvector *evaled_seqp = evalchildren(level); + if (evaled_seqp) { // do more evaluation later - return (new add(evaled_seqp,overall_coeff))-> + return (new add(evaled_seqp, overall_coeff))-> setflag(status_flags::dynallocated); } #ifdef DO_GINAC_ASSERT - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - GINAC_ASSERT(!is_ex_exactly_of_type((*cit).rest,add)); - if (is_ex_exactly_of_type((*cit).rest,numeric)) + epvector::const_iterator i = seq.begin(), end = seq.end(); + while (i != end) { + GINAC_ASSERT(!is_exactly_a(i->rest)); + if (is_ex_exactly_of_type(i->rest,numeric)) dbgprint(); - GINAC_ASSERT(!is_ex_exactly_of_type((*cit).rest,numeric)); + GINAC_ASSERT(!is_exactly_a(i->rest)); + ++i; } #endif // def DO_GINAC_ASSERT @@ -327,12 +344,14 @@ ex add::eval(int level) const } int seq_size = seq.size(); - if (seq_size==0) { + if (seq_size == 0) { // +(;c) -> c return overall_coeff; - } else if ((seq_size==1) && overall_coeff.is_equal(_ex0())) { + } else if (seq_size == 1 && overall_coeff.is_zero()) { // +(x;0) -> x return recombine_pair_to_ex(*(seq.begin())); + } else if (!overall_coeff.is_zero() && seq[0].rest.return_type() != return_types::commutative) { + throw (std::logic_error("add::eval(): sum of non-commutative objects has non-zero numeric term")); } return this->hold(); } @@ -354,37 +373,48 @@ ex add::evalm(void) const s->push_back(split_ex_to_pair(m)); if (is_ex_of_type(m, matrix)) { if (first_term) { - sum = ex_to_matrix(m); + sum = ex_to(m); first_term = false; } else - sum = sum.add(ex_to_matrix(m)); + sum = sum.add(ex_to(m)); } else all_matrices = false; - it++; + ++it; } - if (all_matrices) + if (all_matrices) { + delete s; return sum + overall_coeff; - else + } else return (new add(s, overall_coeff))->setflag(status_flags::dynallocated); } ex add::simplify_ncmul(const exvector & v) const { - if (seq.size()==0) { + if (seq.empty()) return inherited::simplify_ncmul(v); - } - return (*seq.begin()).rest.simplify_ncmul(v); + else + return seq.begin()->rest.simplify_ncmul(v); } // protected /** Implementation of ex::diff() for a sum. It differentiates each term. * @see ex::diff */ -ex add::derivative(const symbol & s) const +ex add::derivative(const symbol & y) const { - // D(a+b+c)=D(a)+D(b)+D(c) - return (new add(diffchildren(s)))->setflag(status_flags::dynallocated); + epvector *s = new epvector(); + s->reserve(seq.size()); + + // Only differentiate the "rest" parts of the expairs. This is faster + // than the default implementation in basic::derivative() although + // if performs the same function (differentiate each term). + epvector::const_iterator i = seq.begin(), end = seq.end(); + while (i != end) { + s->push_back(combine_ex_with_coeff_to_pair(i->rest.diff(y), i->coeff)); + ++i; + } + return (new add(s, _ex0))->setflag(status_flags::dynallocated); } int add::compare_same_type(const basic & other) const @@ -399,18 +429,18 @@ bool add::is_equal_same_type(const basic & other) const unsigned add::return_type(void) const { - if (seq.size()==0) { + if (seq.empty()) return return_types::commutative; - } - return (*seq.begin()).rest.return_type(); + else + return seq.begin()->rest.return_type(); } unsigned add::return_type_tinfo(void) const { - if (seq.size()==0) { + if (seq.empty()) return tinfo_key; - } - return (*seq.begin()).rest.return_type_tinfo(); + else + return seq.begin()->rest.return_type_tinfo(); } ex add::thisexpairseq(const epvector & v, const ex & oc) const @@ -426,40 +456,40 @@ ex add::thisexpairseq(epvector * vp, const ex & oc) const expair add::split_ex_to_pair(const ex & e) const { if (is_ex_exactly_of_type(e,mul)) { - const mul &mulref = ex_to_mul(e); - ex numfactor = mulref.overall_coeff; + const mul &mulref(ex_to(e)); + const ex &numfactor = mulref.overall_coeff; mul *mulcopyp = new mul(mulref); - mulcopyp->overall_coeff = _ex1(); + mulcopyp->overall_coeff = _ex1; mulcopyp->clearflag(status_flags::evaluated); mulcopyp->clearflag(status_flags::hash_calculated); mulcopyp->setflag(status_flags::dynallocated); return expair(*mulcopyp,numfactor); } - return expair(e,_ex1()); + return expair(e,_ex1); } expair add::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)); if (is_ex_exactly_of_type(e, mul)) { - const mul &mulref = ex_to_mul(e); - ex numfactor = mulref.overall_coeff; + const mul &mulref(ex_to(e)); + const ex &numfactor = mulref.overall_coeff; mul *mulcopyp = new mul(mulref); - mulcopyp->overall_coeff = _ex1(); + mulcopyp->overall_coeff = _ex1; mulcopyp->clearflag(status_flags::evaluated); mulcopyp->clearflag(status_flags::hash_calculated); mulcopyp->setflag(status_flags::dynallocated); - if (are_ex_trivially_equal(c, _ex1())) + if (are_ex_trivially_equal(c, _ex1)) return expair(*mulcopyp, numfactor); - else if (are_ex_trivially_equal(numfactor, _ex1())) + else if (are_ex_trivially_equal(numfactor, _ex1)) return expair(*mulcopyp, c); else - return expair(*mulcopyp, ex_to_numeric(numfactor).mul_dyn(ex_to_numeric(c))); + return expair(*mulcopyp, ex_to(numfactor).mul_dyn(ex_to(c))); } else if (is_ex_exactly_of_type(e, numeric)) { - if (are_ex_trivially_equal(c, _ex1())) - return expair(e, _ex1()); - return expair(ex_to_numeric(e).mul_dyn(ex_to_numeric(c)), _ex1()); + if (are_ex_trivially_equal(c, _ex1)) + return expair(e, _ex1); + return expair(ex_to(e).mul_dyn(ex_to(c)), _ex1); } return expair(e, c); } @@ -467,38 +497,34 @@ expair add::combine_ex_with_coeff_to_pair(const ex & e, expair add::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)); if (is_ex_exactly_of_type(p.rest,numeric)) { - GINAC_ASSERT(ex_to_numeric(p.coeff).is_equal(_num1())); // should be normalized - return expair(ex_to_numeric(p.rest).mul_dyn(ex_to_numeric(c)),_ex1()); + GINAC_ASSERT(ex_to(p.coeff).is_equal(_num1)); // should be normalized + return expair(ex_to(p.rest).mul_dyn(ex_to(c)),_ex1); } - return expair(p.rest,ex_to_numeric(p.coeff).mul_dyn(ex_to_numeric(c))); + return expair(p.rest,ex_to(p.coeff).mul_dyn(ex_to(c))); } ex add::recombine_pair_to_ex(const expair & p) const { - if (ex_to_numeric(p.coeff).is_equal(_num1())) + if (ex_to(p.coeff).is_equal(_num1)) return p.rest; else - return p.rest*p.coeff; + return (new mul(p.rest,p.coeff))->setflag(status_flags::dynallocated); } ex add::expand(unsigned options) const { - if (flags & status_flags::expanded) - return *this; - - epvector * vp = expandchildren(options); - if (vp==0) { + epvector *vp = expandchildren(options); + if (vp == NULL) { // the terms have not changed, so it is safe to declare this expanded - setflag(status_flags::expanded); - return *this; + return (options == 0) ? setflag(status_flags::expanded) : *this; } - return (new add(vp,overall_coeff))->setflag(status_flags::expanded | status_flags::dynallocated); + return (new add(vp, overall_coeff))->setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0)); } } // namespace GiNaC