X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.cpp;h=74c8d815ca1a6fe0fd197138a86b18c0f8ab8232;hp=7f7215440e6d5be712b2b0f93357cf7637644026;hb=1b8bcb06;hpb=def26469ff96228c66e877bb5594e7d9a24b638f diff --git a/ginac/add.cpp b/ginac/add.cpp index 7f721544..74c8d815 100644 --- a/ginac/add.cpp +++ b/ginac/add.cpp @@ -3,7 +3,7 @@ * Implementation of GiNaC's sums of expressions. */ /* - * GiNaC Copyright (C) 1999-2008 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 @@ -20,11 +20,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include -#include -#include -#include - #include "add.h" #include "mul.h" #include "archive.h" @@ -33,6 +28,12 @@ #include "utils.h" #include "clifford.h" #include "ncmul.h" +#include "compiler.h" + +#include +#include +#include +#include namespace GiNaC { @@ -85,11 +86,10 @@ add::add(const epvector & v, const ex & oc) GINAC_ASSERT(is_canonical()); } -add::add(std::auto_ptr vp, const ex & oc) +add::add(epvector && vp, const ex & oc) { - GINAC_ASSERT(vp.get()!=0); overall_coeff = oc; - construct_from_epvector(*vp); + construct_from_epvector(std::move(vp)); GINAC_ASSERT(is_canonical()); } @@ -97,7 +97,7 @@ add::add(std::auto_ptr vp, const ex & oc) // archiving ////////// -DEFAULT_ARCHIVING(add) +GINAC_BIND_UNARCHIVER(add); ////////// // functions overriding virtual functions from base classes @@ -120,9 +120,8 @@ void add::print_add(const print_context & c, const char *openbrace, const char * } // Then proceed with the remaining factors - epvector::const_iterator it = seq.begin(), itend = seq.end(); - while (it != itend) { - coeff = ex_to(it->coeff); + for (auto & it : seq) { + coeff = ex_to(it.coeff); if (!first) { if (coeff.csgn() == -1) c.s << '-'; else c.s << '+'; } else { @@ -144,8 +143,7 @@ void add::print_add(const print_context & c, const char *openbrace, const char * } c.s << mul_sym; } - it->rest.print(c, precedence()); - ++it; + it.rest.print(c, precedence()); } if (precedence() <= level) @@ -168,30 +166,28 @@ void add::do_print_csrc(const print_csrc & c, unsigned level) const c.s << "("; // Print arguments, separated by "+" or "-" - epvector::const_iterator it = seq.begin(), itend = seq.end(); char separator = ' '; - while (it != itend) { + for (auto & it : seq) { // If the coefficient is negative, separator is "-" - if (it->coeff.is_equal(_ex_1) || - ex_to(it->coeff).numer().is_equal(*_num_1_p)) + 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)) + 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()); + it.rest.print(c, precedence()); c.s << '/'; - ex_to(it->coeff).denom().print(c, precedence()); + ex_to(it.coeff).denom().print(c, precedence()); } else { - it->coeff.print(c, precedence()); + it.coeff.print(c, precedence()); c.s << '*'; - it->rest.print(c, precedence()); + it.rest.print(c, precedence()); } - ++it; separator = '+'; } @@ -224,14 +220,24 @@ bool add::info(unsigned inf) const case info_flags::integer_polynomial: case info_flags::cinteger_polynomial: case info_flags::rational_polynomial: + case info_flags::real: + case info_flags::rational: + case info_flags::integer: + case info_flags::crational: + case info_flags::cinteger: + case info_flags::positive: + case info_flags::nonnegative: + case info_flags::posint: + case info_flags::nonnegint: + case info_flags::even: case info_flags::crational_polynomial: case info_flags::rational_function: { - epvector::const_iterator i = seq.begin(), end = seq.end(); - while (i != end) { - if (!(recombine_pair_to_ex(*i).info(inf))) + for (auto & i : seq) { + if (!(recombine_pair_to_ex(i).info(inf))) return false; - ++i; } + if (overall_coeff.is_zero() && (inf == info_flags::positive || inf == info_flags::posint)) + return true; return overall_coeff.info(inf); } case info_flags::algebraic: { @@ -247,6 +253,16 @@ bool add::info(unsigned inf) const return inherited::info(inf); } +bool add::is_polynomial(const ex & var) const +{ + for (auto & i : seq) { + if (!i.rest.is_polynomial(var)) { + return false; + } + } + return true; +} + int add::degree(const ex & s) const { int deg = std::numeric_limits::min(); @@ -254,12 +270,10 @@ int add::degree(const ex & s) const deg = 0; // 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); + for (auto & i : seq) { + int cur_deg = i.rest.degree(s); if (cur_deg > deg) deg = cur_deg; - ++i; } return deg; } @@ -271,43 +285,39 @@ int add::ldegree(const ex & s) const deg = 0; // Find minimum of degrees of individual terms - epvector::const_iterator i = seq.begin(), end = seq.end(); - while (i != end) { - int cur_deg = i->rest.ldegree(s); + for (auto & i : seq) { + int cur_deg = i.rest.ldegree(s); if (cur_deg < deg) deg = cur_deg; - ++i; } return deg; } ex add::coeff(const ex & s, int n) const { - std::auto_ptr coeffseq(new epvector); - std::auto_ptr coeffseq_cliff(new epvector); - char rl = clifford_max_label(s); + epvector coeffseq; + epvector coeffseq_cliff; + int rl = clifford_max_label(s); bool do_clifford = (rl != -1); bool nonscalar = false; // 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()) { - if (do_clifford) { - if (clifford_max_label(restcoeff) == -1) { - coeffseq_cliff->push_back(combine_ex_with_coeff_to_pair(ncmul(restcoeff, dirac_ONE(rl)), i->coeff)); + 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(combine_ex_with_coeff_to_pair(ncmul(restcoeff, dirac_ONE(rl)), i.coeff)); } else { - coeffseq_cliff->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff)); + coeffseq_cliff.push_back(combine_ex_with_coeff_to_pair(restcoeff, i.coeff)); nonscalar = true; - } + } } - coeffseq->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff)); + coeffseq.push_back(combine_ex_with_coeff_to_pair(restcoeff, i.coeff)); } - ++i; } - return (new add(nonscalar ? coeffseq_cliff : coeffseq, + return (new add(nonscalar ? std::move(coeffseq_cliff) : std::move(coeffseq), n==0 ? overall_coeff : _ex0))->setflag(status_flags::dynallocated); } @@ -320,21 +330,16 @@ ex add::coeff(const ex & s, int n) const * @param level cut-off in recursive evaluation */ ex add::eval(int level) const { - std::auto_ptr evaled_seqp = evalchildren(level); - if (evaled_seqp.get()) { + epvector evaled = evalchildren(level); + if (!evaled.empty()) { // do more evaluation later - return (new add(evaled_seqp, overall_coeff))-> - setflag(status_flags::dynallocated); + return (new add(std::move(evaled), overall_coeff))-> + setflag(status_flags::dynallocated); } - + #ifdef DO_GINAC_ASSERT - epvector::const_iterator i = seq.begin(), end = seq.end(); - while (i != end) { - GINAC_ASSERT(!is_exactly_a(i->rest)); - if (is_exactly_a(i->rest)) - dbgprint(); - GINAC_ASSERT(!is_exactly_a(i->rest)); - ++i; + for (auto & i : seq) { + GINAC_ASSERT(!is_exactly_a(i.rest)); } #endif // def DO_GINAC_ASSERT @@ -354,6 +359,28 @@ ex add::eval(int level) const } 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 (new add(std::move(s), ex_to(overall_coeff).add_dyn(oc))) + ->setflag(status_flags::dynallocated); + } + return this->hold(); } @@ -361,17 +388,16 @@ ex add::evalm() const { // Evaluate children first and add up all matrices. Stop if there's one // term that is not a matrix. - std::auto_ptr s(new epvector); - s->reserve(seq.size()); + epvector s; + s.reserve(seq.size()); bool all_matrices = true; bool first_term = true; matrix sum; - epvector::const_iterator it = seq.begin(), itend = seq.end(); - while (it != itend) { - const ex &m = recombine_pair_to_ex(*it).evalm(); - s->push_back(split_ex_to_pair(m)); + 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); @@ -380,18 +406,17 @@ ex add::evalm() const sum = sum.add(ex_to(m)); } else all_matrices = false; - ++it; } if (all_matrices) return sum + overall_coeff; else - return (new add(s, overall_coeff))->setflag(status_flags::dynallocated); + return (new add(std::move(s), overall_coeff))->setflag(status_flags::dynallocated); } ex add::conjugate() const { - exvector *v = 0; + std::unique_ptr v(nullptr); for (size_t i=0; ipush_back(op(i).conjugate()); @@ -401,16 +426,14 @@ ex add::conjugate() const ex ccterm = term.conjugate(); if (are_ex_trivially_equal(term, ccterm)) continue; - v = new exvector; + v.reset(new exvector); v->reserve(nops()); for (size_t j=0; jpush_back(op(j)); v->push_back(ccterm); } if (v) { - ex result = add(*v); - delete v; - return result; + return add(std::move(*v)); } return *this; } @@ -419,17 +442,17 @@ ex add::real_part() const { epvector v; v.reserve(seq.size()); - for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) - if ((i->coeff).info(info_flags::real)) { - ex rp = (i->rest).real_part(); + 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, i->coeff)); + v.push_back(expair(rp, it.coeff)); } else { - ex rp=recombine_pair_to_ex(*i).real_part(); + ex rp = recombine_pair_to_ex(it).real_part(); if (!rp.is_zero()) v.push_back(split_ex_to_pair(rp)); } - return (new add(v, overall_coeff.real_part())) + return (new add(std::move(v), overall_coeff.real_part())) -> setflag(status_flags::dynallocated); } @@ -437,17 +460,17 @@ ex add::imag_part() const { epvector v; v.reserve(seq.size()); - for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) - if ((i->coeff).info(info_flags::real)) { - ex ip = (i->rest).imag_part(); + 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, i->coeff)); + v.push_back(expair(ip, it.coeff)); } else { - ex ip=recombine_pair_to_ex(*i).imag_part(); + ex ip = recombine_pair_to_ex(it).imag_part(); if (!ip.is_zero()) v.push_back(split_ex_to_pair(ip)); } - return (new add(v, overall_coeff.imag_part())) + return (new add(std::move(v), overall_coeff.imag_part())) -> setflag(status_flags::dynallocated); } @@ -465,18 +488,16 @@ ex add::eval_ncmul(const exvector & v) const * @see ex::diff */ ex add::derivative(const symbol & y) const { - std::auto_ptr s(new epvector); - s->reserve(seq.size()); + 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). - 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); + for (auto & it : seq) + s.push_back(combine_ex_with_coeff_to_pair(it.rest.diff(y), it.coeff)); + + return (new add(std::move(s), _ex0))->setflag(status_flags::dynallocated); } int add::compare_same_type(const basic & other) const @@ -507,9 +528,9 @@ ex add::thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming) } // Note: do_index_renaming is ignored because it makes no sense for an add. -ex add::thisexpairseq(std::auto_ptr vp, const ex & oc, bool do_index_renaming) const +ex add::thisexpairseq(epvector && vp, const ex & oc, bool do_index_renaming) const { - return (new add(vp,oc))->setflag(status_flags::dynallocated); + return (new add(std::move(vp), oc))->setflag(status_flags::dynallocated); } expair add::split_ex_to_pair(const ex & e) const @@ -528,7 +549,7 @@ expair add::split_ex_to_pair(const ex & e) const } expair add::combine_ex_with_coeff_to_pair(const ex & e, - const ex & c) const + const ex & c) const { GINAC_ASSERT(is_exactly_a(c)); if (is_exactly_a(e)) { @@ -554,7 +575,7 @@ 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 + const ex & c) const { GINAC_ASSERT(is_exactly_a(p.coeff)); GINAC_ASSERT(is_exactly_a(c)); @@ -566,7 +587,7 @@ expair add::combine_pair_with_coeff_to_pair(const expair & p, 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(p.coeff).is_equal(*_num1_p)) @@ -577,13 +598,12 @@ ex add::recombine_pair_to_ex(const expair & p) const ex add::expand(unsigned options) const { - std::auto_ptr vp = expandchildren(options); - if (vp.get() == 0) { - // the terms have not changed, so it is safe to declare this expanded + epvector expanded = expandchildren(options); + if (expanded.empty()) return (options == 0) ? setflag(status_flags::expanded) : *this; - } - return (new add(vp, overall_coeff))->setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0)); + return (new add(std::move(expanded), overall_coeff))->setflag(status_flags::dynallocated | + (options == 0 ? status_flags::expanded : 0)); } } // namespace GiNaC