* Implementation of GiNaC's sums of expressions. */
/*
- * GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2016 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
ex add::eval(int level) const
{
std::auto_ptr<epvector> evaled_seqp = evalchildren(level);
- if (evaled_seqp.get()) {
+ if (unlikely(evaled_seqp.get() != 0)) {
// do more evaluation later
return (new add(evaled_seqp, overall_coeff))->
setflag(status_flags::dynallocated);
if (terms_to_collect) {
std::auto_ptr<epvector> s(new epvector);
s->reserve(seq_size - terms_to_collect);
- numeric oc = *_num1_p;
+ numeric oc = *_num0_p;
j = seq.begin();
while (j != last) {
if (unlikely(is_a<numeric>(j->rest)))
- oc = oc.mul(ex_to<numeric>(j->rest)).mul(ex_to<numeric>(j->coeff));
+ oc = oc.add(ex_to<numeric>(j->rest).mul(ex_to<numeric>(j->coeff)));
else
s->push_back(*j);
++j;
if (is_exactly_a<mul>(e)) {
const mul &mulref(ex_to<mul>(e));
const ex &numfactor = mulref.overall_coeff;
+ if (numfactor.is_equal(_ex1))
+ return expair(e, _ex1);
mul *mulcopyp = new mul(mulref);
mulcopyp->overall_coeff = _ex1;
mulcopyp->clearflag(status_flags::evaluated);
if (is_exactly_a<mul>(e)) {
const mul &mulref(ex_to<mul>(e));
const ex &numfactor = mulref.overall_coeff;
+ if (numfactor.is_equal(_ex1))
+ return expair(e, c);
mul *mulcopyp = new mul(mulref);
mulcopyp->overall_coeff = _ex1;
mulcopyp->clearflag(status_flags::evaluated);
mulcopyp->setflag(status_flags::dynallocated);
if (c.is_equal(_ex1))
return expair(*mulcopyp, numfactor);
- else if (numfactor.is_equal(_ex1))
- return expair(*mulcopyp, c);
else
return expair(*mulcopyp, ex_to<numeric>(numfactor).mul_dyn(ex_to<numeric>(c)));
} else if (is_exactly_a<numeric>(e)) {
if (c.is_equal(_ex1))
return expair(e, _ex1);
+ if (e.is_equal(_ex1))
+ return expair(c, _ex1);
return expair(ex_to<numeric>(e).mul_dyn(ex_to<numeric>(c)), _ex1);
}
return expair(e, c);