X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.cpp;h=ed58730941a3c9d062475ef175b44c023010187d;hp=0c22465a10021e54828d149bdda3502ee1e3e25b;hb=ae6c004bd31e02dda37357d74b641c101b116c73;hpb=4e3a4ac2bcb0837611ea31bc8fc05d84a20c33ac diff --git a/ginac/add.cpp b/ginac/add.cpp index 0c22465a..ed587309 100644 --- a/ginac/add.cpp +++ b/ginac/add.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's sums of expressions. */ /* - * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2015 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 @@ -17,45 +17,39 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include - #include "add.h" #include "mul.h" #include "archive.h" -#include "debugmsg.h" +#include "operators.h" +#include "matrix.h" #include "utils.h" +#include "clifford.h" +#include "ncmul.h" +#include "compiler.h" + +#include +#include +#include +#include namespace GiNaC { -GINAC_IMPLEMENT_REGISTERED_CLASS(add, expairseq) +GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(add, expairseq, + print_func(&add::do_print). + print_func(&add::do_print_latex). + print_func(&add::do_print_csrc). + print_func(&add::do_print_tree). + print_func(&add::do_print_python_repr)) ////////// -// default constructor, destructor, copy constructor assignment operator and helpers +// default constructor ////////// -// public - add::add() { - debugmsg("add default constructor",LOGLEVEL_CONSTRUCT); - tinfo_key = TINFO_add; -} - -// protected - -/** For use by copy ctor and assignment operator. */ -void add::copy(const add & other) -{ - inherited::copy(other); -} - -void add::destroy(bool call_parent) -{ - if (call_parent) inherited::destroy(call_parent); } ////////// @@ -66,48 +60,36 @@ void add::destroy(bool call_parent) 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); GINAC_ASSERT(is_canonical()); } -add::add(epvector * vp, 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; - construct_from_epvector(*vp); - delete vp; + construct_from_epvector(std::move(vp)); GINAC_ASSERT(is_canonical()); } @@ -115,131 +97,120 @@ add::add(epvector * vp, const ex & oc) // archiving ////////// -/** Construct object from archive_node. */ -add::add(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst) -{ - debugmsg("add constructor from archive_node", LOGLEVEL_CONSTRUCT); -} - -/** Unarchive the object. */ -ex add::unarchive(const archive_node &n, const lst &sym_lst) -{ - return (new add(n, sym_lst))->setflag(status_flags::dynallocated); -} - -/** Archive the object. */ -void add::archive(archive_node &n) const -{ - inherited::archive(n); -} +GINAC_BIND_UNARCHIVER(add); ////////// -// functions overriding virtual functions from bases classes +// functions overriding virtual functions from base classes ////////// // public -void add::print(std::ostream & os, unsigned upper_precedence) const +void add::print_add(const print_context & c, const char *openbrace, const char *closebrace, const char *mul_sym, unsigned level) const { - debugmsg("add print",LOGLEVEL_PRINT); - if (precedence<=upper_precedence) os << "("; + if (precedence() <= level) + c.s << openbrace << '('; + numeric coeff; bool first = true; - // first print the overall numeric coefficient, if present: + + // First print the overall numeric coefficient, if present if (!overall_coeff.is_zero()) { - os << overall_coeff; + overall_coeff.print(c, 0); first = false; } - // then proceed with the remaining factors: - for (epvector::const_iterator cit=seq.begin(); cit!=seq.end(); ++cit) { - coeff = ex_to_numeric(cit->coeff); + + // Then proceed with the remaining factors + for (auto & it : seq) { + coeff = ex_to(it.coeff); if (!first) { - if (coeff.csgn()==-1) os << '-'; else os << '+'; + if (coeff.csgn() == -1) c.s << '-'; else c.s << '+'; } else { - if (coeff.csgn()==-1) os << '-'; + if (coeff.csgn() == -1) c.s << '-'; first = false; } - if (!coeff.is_equal(_num1()) && - !coeff.is_equal(_num_1())) { + if (!coeff.is_equal(*_num1_p) && + !coeff.is_equal(*_num_1_p)) { if (coeff.is_rational()) { if (coeff.is_negative()) - os << -coeff; + (-coeff).print(c); else - os << coeff; + coeff.print(c); } else { - if (coeff.csgn()==-1) - (-coeff).print(os, precedence); + if (coeff.csgn() == -1) + (-coeff).print(c, precedence()); else - coeff.print(os, precedence); + coeff.print(c, precedence()); } - os << '*'; + c.s << mul_sym; } - cit->rest.print(os, precedence); + it.rest.print(c, precedence()); } - if (precedence<=upper_precedence) os << ")"; + + if (precedence() <= level) + c.s << ')' << closebrace; } -void add::printraw(std::ostream & os) const +void add::do_print(const print_context & c, unsigned level) const { - debugmsg("add printraw",LOGLEVEL_PRINT); + print_add(c, "", "", "*", level); +} - os << "+("; - for (epvector::const_iterator it=seq.begin(); it!=seq.end(); ++it) { - os << "("; - (*it).rest.bp->printraw(os); - os << ","; - (*it).coeff.bp->printraw(os); - os << "),"; - } - os << ",hash=" << hashvalue << ",flags=" << flags; - os << ")"; +void add::do_print_latex(const print_latex & c, unsigned level) const +{ + print_add(c, "{", "}", " ", level); } -void add::printcsrc(std::ostream & os, unsigned type, unsigned upper_precedence) const +void add::do_print_csrc(const print_csrc & c, unsigned level) const { - debugmsg("add print csrc", LOGLEVEL_PRINT); - if (precedence <= upper_precedence) - os << "("; + if (precedence() <= level) + c.s << "("; - // Print arguments, separated by "+" - epvector::const_iterator it = seq.begin(); - epvector::const_iterator itend = seq.end(); - while (it != itend) { + // Print arguments, separated by "+" or "-" + char separator = ' '; + for (auto & it : seq) { - // If the coefficient is -1, it is replaced by a single minus sign - if (it->coeff.compare(_num1()) == 0) { - it->rest.bp->printcsrc(os, type, precedence); - } else if (it->coeff.compare(_num_1()) == 0) { - os << "-"; - it->rest.bp->printcsrc(os, type, precedence); - } else if (ex_to_numeric(it->coeff).numer().compare(_num1()) == 0) { - it->rest.bp->printcsrc(os, type, precedence); - os << "/"; - ex_to_numeric(it->coeff).denom().printcsrc(os, type, precedence); - } else if (ex_to_numeric(it->coeff).numer().compare(_num_1()) == 0) { - os << "-"; - it->rest.bp->printcsrc(os, type, precedence); - os << "/"; - ex_to_numeric(it->coeff).denom().printcsrc(os, type, precedence); + // If the coefficient is negative, separator is "-" + if (it.coeff.is_equal(_ex_1) || + ex_to(it.coeff).numer().is_equal(*_num_1_p)) + separator = '-'; + c.s << separator; + if (it.coeff.is_equal(_ex1) || it.coeff.is_equal(_ex_1)) { + it.rest.print(c, precedence()); + } else if (ex_to(it.coeff).numer().is_equal(*_num1_p) || + ex_to(it.coeff).numer().is_equal(*_num_1_p)) + { + it.rest.print(c, precedence()); + c.s << '/'; + ex_to(it.coeff).denom().print(c, precedence()); } else { - it->coeff.bp->printcsrc(os, type, precedence); - os << "*"; - it->rest.bp->printcsrc(os, type, precedence); + it.coeff.print(c, precedence()); + c.s << '*'; + 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))) - os << "+"; + separator = '+'; } if (!overall_coeff.is_zero()) { - if (overall_coeff.info(info_flags::positive)) os << '+'; - overall_coeff.bp->printcsrc(os,type,precedence); + if (overall_coeff.info(info_flags::positive) + || is_a(c) || !overall_coeff.info(info_flags::real)) // sign inside ctor argument + c.s << '+'; + overall_coeff.print(c, precedence()); } - - if (precedence <= upper_precedence) - os << ")"; + + if (precedence() <= level) + c.s << ")"; +} + +void add::do_print_python_repr(const print_python_repr & c, unsigned level) const +{ + c.s << class_name() << '('; + op(0).print(c); + for (size_t i=1; i::min(); + 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 + for (auto & i : seq) { + int cur_deg = i.rest.degree(s); + if (cur_deg > deg) deg = cur_deg; } return deg; } -int add::ldegree(const symbol & s) const +int add::ldegree(const ex & s) const { - int deg = INT_MAX; - if (!overall_coeff.is_equal(_ex0())) + int deg = std::numeric_limits::max(); + 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_degsetflag(status_flags::dynallocated); + epvector coeffseq_cliff; + int rl = clifford_max_label(s); + bool do_clifford = (rl != -1); + bool nonscalar = false; + + // Calculate sum of coefficients in each term + for (auto & i : seq) { + ex restcoeff = i.rest.coeff(s, n); + if (!restcoeff.is_zero()) { + if (do_clifford) { + if (clifford_max_label(restcoeff) == -1) { + coeffseq_cliff.push_back(expair(ncmul(restcoeff, dirac_ONE(rl)), i.coeff)); + } else { + coeffseq_cliff.push_back(expair(restcoeff, i.coeff)); + nonscalar = true; + } + } + coeffseq.push_back(expair(restcoeff, i.coeff)); + } } - return (new add(coeffseq))->setflag(status_flags::dynallocated); + + return dynallocate(nonscalar ? std::move(coeffseq_cliff) : std::move(coeffseq), + n==0 ? overall_coeff : _ex0); } +/** 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;0) -> 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) { - // do more evaluation later - 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)) - dbgprint(); - GINAC_ASSERT(!is_ex_exactly_of_type((*cit).rest,numeric)); - } -#endif // def DO_GINAC_ASSERT - - if (flags & status_flags::evaluated) { + if ((level == 1) && (flags & status_flags::evaluated)) { GINAC_ASSERT(seq.size()>0); GINAC_ASSERT(seq.size()>1 || !overall_coeff.is_zero()); return *this; } - + + const epvector evaled = evalchildren(level); + if (unlikely(!evaled.empty())) { + // start over evaluating a new object + return dynallocate(std::move(evaled), overall_coeff); + } + +#ifdef DO_GINAC_ASSERT + for (auto & i : seq) { + GINAC_ASSERT(!is_exactly_a(i.rest)); + } +#endif // def DO_GINAC_ASSERT + 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")); } + + // if any terms in the sum still are purely numeric, then they are more + // appropriately collected into the overall coefficient + int terms_to_collect = 0; + for (auto & it : seq) { + if (unlikely(is_a(it.rest))) + ++terms_to_collect; + } + if (terms_to_collect) { + epvector s; + s.reserve(seq_size - terms_to_collect); + numeric oc = *_num1_p; + for (auto & it : seq) { + if (unlikely(is_a(it.rest))) + oc = oc.mul(ex_to(it.rest)).mul(ex_to(it.coeff)); + else + s.push_back(it); + } + return dynallocate(std::move(s), ex_to(overall_coeff).add_dyn(oc)); + } + return this->hold(); } -exvector add::get_indices(void) const -{ - // FIXME: all terms in the sum should have the same indices (compatible - // tensors) however this is not checked, since there is no function yet - // which compares indices (idxvector can be unsorted) - if (seq.size()==0) { - return exvector(); +ex add::evalm() const +{ + // Evaluate children first and add up all matrices. Stop if there's one + // term that is not a matrix. + epvector s; + s.reserve(seq.size()); + + bool all_matrices = true; + bool first_term = true; + matrix sum; + + for (auto & it : seq) { + const ex &m = recombine_pair_to_ex(it).evalm(); + s.push_back(split_ex_to_pair(m)); + if (is_a(m)) { + if (first_term) { + sum = ex_to(m); + first_term = false; + } else + sum = sum.add(ex_to(m)); + } else + all_matrices = false; } - return (seq.begin())->rest.get_indices(); -} -ex add::simplify_ncmul(const exvector & v) const + if (all_matrices) + return sum + overall_coeff; + else + return dynallocate(std::move(s), overall_coeff); +} + +ex add::conjugate() const { - if (seq.size()==0) { - return inherited::simplify_ncmul(v); + std::unique_ptr v(nullptr); + for (size_t i=0; ipush_back(op(i).conjugate()); + continue; + } + ex term = op(i); + ex ccterm = term.conjugate(); + if (are_ex_trivially_equal(term, ccterm)) + continue; + v.reset(new exvector); + v->reserve(nops()); + for (size_t j=0; jpush_back(op(j)); + v->push_back(ccterm); } - return (*seq.begin()).rest.simplify_ncmul(v); + if (v) { + return add(std::move(*v)); + } + return *this; +} + +ex add::real_part() const +{ + epvector v; + v.reserve(seq.size()); + for (auto & it : seq) + if (it.coeff.info(info_flags::real)) { + ex rp = it.rest.real_part(); + if (!rp.is_zero()) + v.push_back(expair(rp, it.coeff)); + } else { + ex rp = recombine_pair_to_ex(it).real_part(); + if (!rp.is_zero()) + v.push_back(split_ex_to_pair(rp)); + } + return dynallocate(std::move(v), overall_coeff.real_part()); +} + +ex add::imag_part() const +{ + epvector v; + v.reserve(seq.size()); + for (auto & it : seq) + if (it.coeff.info(info_flags::real)) { + ex ip = it.rest.imag_part(); + if (!ip.is_zero()) + v.push_back(expair(ip, it.coeff)); + } else { + ex ip = recombine_pair_to_ex(it).imag_part(); + if (!ip.is_zero()) + v.push_back(split_ex_to_pair(ip)); + } + return dynallocate(std::move(v), overall_coeff.imag_part()); +} + +ex add::eval_ncmul(const exvector & v) const +{ + if (seq.empty()) + return inherited::eval_ncmul(v); + else + return seq.begin()->rest.eval_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; + 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). + for (auto & it : seq) + s.push_back(expair(it.rest.diff(y), it.coeff)); + + return dynallocate(std::move(s), _ex0); } int add::compare_same_type(const basic & other) const @@ -388,121 +501,104 @@ int add::compare_same_type(const basic & other) const return inherited::compare_same_type(other); } -bool add::is_equal_same_type(const basic & other) const +unsigned add::return_type() const { - return inherited::is_equal_same_type(other); -} - -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 + +return_type_t add::return_type_tinfo() const { - if (seq.size()==0) { - return tinfo_key; - } - return (*seq.begin()).rest.return_type_tinfo(); + if (seq.empty()) + return make_return_type_t(); + else + return seq.begin()->rest.return_type_tinfo(); } -ex add::thisexpairseq(const epvector & v, const ex & oc) const +// Note: do_index_renaming is ignored because it makes no sense for an add. +ex add::thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming) const { - return (new add(v,oc))->setflag(status_flags::dynallocated); + return dynallocate(v, oc); } -ex add::thisexpairseq(epvector * vp, const ex & oc) const +// Note: do_index_renaming is ignored because it makes no sense for an add. +ex add::thisexpairseq(epvector && vp, const ex & oc, bool do_index_renaming) const { - return (new add(vp,oc))->setflag(status_flags::dynallocated); + return dynallocate(std::move(vp), oc); } 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; - mul *mulcopyp = new mul(mulref); - mulcopyp->overall_coeff = _ex1(); - mulcopyp->clearflag(status_flags::evaluated); - mulcopyp->clearflag(status_flags::hash_calculated); - mulcopyp->setflag(status_flags::dynallocated); - return expair(*mulcopyp,numfactor); + if (is_exactly_a(e)) { + const mul &mulref(ex_to(e)); + const ex &numfactor = mulref.overall_coeff; + if (numfactor.is_equal(_ex1)) + return expair(e, _ex1); + mul & mulcopy = dynallocate(mulref); + mulcopy.overall_coeff = _ex1; + mulcopy.clearflag(status_flags::evaluated | status_flags::hash_calculated); + return expair(mulcopy, 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)); - if (is_ex_exactly_of_type(e, mul)) { - const mul &mulref = ex_to_mul(e); - ex numfactor = mulref.overall_coeff; - mul *mulcopyp = new mul(mulref); - 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())) - return expair(*mulcopyp, numfactor); - else if (are_ex_trivially_equal(numfactor, _ex1())) - return expair(*mulcopyp, c); + const ex & c) const +{ + GINAC_ASSERT(is_exactly_a(c)); + if (is_exactly_a(e)) { + const mul &mulref(ex_to(e)); + const ex &numfactor = mulref.overall_coeff; + if (likely(numfactor.is_equal(_ex1))) + return expair(e, c); + mul & mulcopy = dynallocate(mulref); + mulcopy.overall_coeff = _ex1; + mulcopy.clearflag(status_flags::evaluated | status_flags::hash_calculated); + if (c.is_equal(_ex1)) + return expair(mulcopy, numfactor); else - return expair(*mulcopyp, ex_to_numeric(numfactor).mul_dyn(ex_to_numeric(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()); + return expair(mulcopy, ex_to(numfactor).mul_dyn(ex_to(c))); + } else if (is_exactly_a(e)) { + if (c.is_equal(_ex1)) + return expair(e, _ex1); + if (e.is_equal(_ex1)) + return expair(c, _ex1); + return expair(ex_to(e).mul_dyn(ex_to(c)), _ex1); } return expair(e, c); } expair add::combine_pair_with_coeff_to_pair(const expair & p, - const ex & c) const + 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()); + if (is_exactly_a(p.rest)) { + GINAC_ASSERT(ex_to(p.coeff).is_equal(*_num1_p)); // 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_p)) return p.rest; else - return p.rest*p.coeff; + return dynallocate(p.rest, p.coeff); } ex add::expand(unsigned options) const { - if (flags & status_flags::expanded) - return *this; - - 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 (new add(vp,overall_coeff))->setflag(status_flags::expanded | status_flags::dynallocated); -} - -////////// -// static member variables -////////// + epvector expanded = expandchildren(options); + if (expanded.empty()) + return (options == 0) ? setflag(status_flags::expanded) : *this; -// protected - -unsigned add::precedence = 40; + return dynallocate(std::move(expanded), overall_coeff).setflag(options == 0 ? status_flags::expanded : 0); +} } // namespace GiNaC