* Implementation of GiNaC's sums of expressions. */
/*
- * GiNaC Copyright (C) 1999-2006 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2010 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
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include <iostream>
-#include <stdexcept>
-
#include "add.h"
#include "mul.h"
#include "archive.h"
#include "utils.h"
#include "clifford.h"
#include "ncmul.h"
+#include "compiler.h"
+
+#include <iostream>
+#include <limits>
+#include <stdexcept>
+#include <string>
namespace GiNaC {
add::add()
{
- tinfo_key = &add::tinfo_static;
}
//////////
add::add(const ex & lh, const ex & rh)
{
- tinfo_key = &add::tinfo_static;
overall_coeff = _ex0;
construct_from_2_ex(lh,rh);
GINAC_ASSERT(is_canonical());
add::add(const exvector & v)
{
- tinfo_key = &add::tinfo_static;
overall_coeff = _ex0;
construct_from_exvector(v);
GINAC_ASSERT(is_canonical());
add::add(const epvector & v)
{
- tinfo_key = &add::tinfo_static;
overall_coeff = _ex0;
construct_from_epvector(v);
GINAC_ASSERT(is_canonical());
add::add(const epvector & v, const ex & oc)
{
- tinfo_key = &add::tinfo_static;
overall_coeff = oc;
construct_from_epvector(v);
GINAC_ASSERT(is_canonical());
add::add(std::auto_ptr<epvector> vp, const ex & oc)
{
- tinfo_key = &add::tinfo_static;
GINAC_ASSERT(vp.get()!=0);
overall_coeff = oc;
construct_from_epvector(*vp);
// archiving
//////////
-DEFAULT_ARCHIVING(add)
+GINAC_BIND_UNARCHIVER(add);
//////////
// functions overriding virtual functions from base classes
if (precedence() <= level)
c.s << "(";
- // Print arguments, separated by "+"
+ // Print arguments, separated by "+" or "-"
epvector::const_iterator it = seq.begin(), itend = seq.end();
+ char separator = ' ';
while (it != itend) {
- // If the coefficient is -1, it is replaced by a single minus sign
- if (it->coeff.is_equal(_ex1)) {
- it->rest.print(c, precedence());
- } else if (it->coeff.is_equal(_ex_1)) {
- c.s << "-";
- it->rest.print(c, precedence());
- } else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num1_p)) {
+ // If the coefficient is negative, separator is "-"
+ if (it->coeff.is_equal(_ex_1) ||
+ ex_to<numeric>(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());
- c.s << "/";
- ex_to<numeric>(it->coeff).denom().print(c, precedence());
- } else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p)) {
- c.s << "-";
+ } else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num1_p) ||
+ ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p))
+ {
it->rest.print(c, precedence());
- c.s << "/";
+ c.s << '/';
ex_to<numeric>(it->coeff).denom().print(c, precedence());
} else {
it->coeff.print(c, precedence());
- c.s << "*";
+ c.s << '*';
it->rest.print(c, precedence());
}
- // Separator is "+", except if the following expression would have a leading minus sign or the sign is sitting in parenthesis (as in a ctor)
++it;
- if (it != itend
- && (is_a<print_csrc_cl_N>(c) || !it->coeff.info(info_flags::real) // sign inside ctor arguments
- || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(*_num1_p) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative)))))
- c.s << "+";
+ separator = '+';
}
if (!overall_coeff.is_zero()) {
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();
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: {
int add::degree(const ex & s) const
{
- int deg = INT_MIN;
+ int deg = std::numeric_limits<int>::min();
if (!overall_coeff.is_zero())
deg = 0;
int add::ldegree(const ex & s) const
{
- int deg = INT_MAX;
+ int deg = std::numeric_limits<int>::max();
if (!overall_coeff.is_zero())
deg = 0;
epvector::const_iterator i = seq.begin(), end = seq.end();
while (i != end) {
GINAC_ASSERT(!is_exactly_a<add>(i->rest));
- if (is_exactly_a<numeric>(i->rest))
- dbgprint();
- GINAC_ASSERT(!is_exactly_a<numeric>(i->rest));
++i;
}
#endif // def DO_GINAC_ASSERT
} 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
+ epvector::const_iterator last = seq.end();
+ epvector::const_iterator j = seq.begin();
+ int terms_to_collect = 0;
+ while (j != last) {
+ if (unlikely(is_a<numeric>(j->rest)))
+ ++terms_to_collect;
+ ++j;
+ }
+ if (terms_to_collect) {
+ std::auto_ptr<epvector> s(new epvector);
+ s->reserve(seq_size - terms_to_collect);
+ numeric oc = *_num1_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));
+ else
+ s->push_back(*j);
+ ++j;
+ }
+ return (new add(s, ex_to<numeric>(overall_coeff).add_dyn(oc)))
+ ->setflag(status_flags::dynallocated);
+ }
+
return this->hold();
}
epvector v;
v.reserve(seq.size());
for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
- if ((i->coeff).info(info_flags::real))
- v.push_back(expair((i->rest).real_part(), i->coeff));
- else {
+ if ((i->coeff).info(info_flags::real)) {
+ ex rp = (i->rest).real_part();
+ if (!rp.is_zero())
+ v.push_back(expair(rp, i->coeff));
+ } else {
ex rp=recombine_pair_to_ex(*i).real_part();
- v.push_back(split_ex_to_pair(rp));
+ if (!rp.is_zero())
+ v.push_back(split_ex_to_pair(rp));
}
return (new add(v, overall_coeff.real_part()))
-> setflag(status_flags::dynallocated);
epvector v;
v.reserve(seq.size());
for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
- if ((i->coeff).info(info_flags::real))
- v.push_back(expair((i->rest).imag_part(), i->coeff));
- else {
+ if ((i->coeff).info(info_flags::real)) {
+ ex ip = (i->rest).imag_part();
+ if (!ip.is_zero())
+ v.push_back(expair(ip, i->coeff));
+ } else {
ex ip=recombine_pair_to_ex(*i).imag_part();
- v.push_back(split_ex_to_pair(ip));
+ if (!ip.is_zero())
+ v.push_back(split_ex_to_pair(ip));
}
return (new add(v, overall_coeff.imag_part()))
-> setflag(status_flags::dynallocated);
return seq.begin()->rest.return_type();
}
-tinfo_t add::return_type_tinfo() const
+return_type_t add::return_type_tinfo() const
{
if (seq.empty())
- return this;
+ return make_return_type_t<add>();
else
return seq.begin()->rest.return_type_tinfo();
}
git://www.ginac.de / ginac.git / blobdiff