* Implementation of GiNaC's sums of expressions. */
/*
- * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2002 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
while (it != itend) {
// If the coefficient is -1, it is replaced by a single minus sign
- if (it->coeff.compare(_num1) == 0) {
+ if (it->coeff.is_equal(_ex1)) {
it->rest.print(c, precedence());
- } else if (it->coeff.compare(_num_1) == 0) {
+ } else if (it->coeff.is_equal(_ex_1)) {
c.s << "-";
it->rest.print(c, precedence());
- } else if (ex_to<numeric>(it->coeff).numer().compare(_num1) == 0) {
+ } else if (ex_to<numeric>(it->coeff).numer().is_equal(_num1)) {
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) {
+ } else if (ex_to<numeric>(it->coeff).numer().is_equal(_num_1)) {
c.s << "-";
it->rest.print(c, precedence());
c.s << "/";
it->rest.print(c, precedence());
}
- // Separator is "+", except if the following expression would have a leading minus sign
+ // 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 && !(it->coeff.compare(_num0) < 0 || (it->coeff.compare(_num1) == 0 && is_exactly_a<numeric>(it->rest) && it->rest.compare(_num0) < 0)))
+ if (it != itend
+ && (is_a<print_csrc_cl_N>(c) // sign inside ctor arguments
+ || !(it->coeff.info(info_flags::negative) || (it->coeff.is_equal(_num1) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative)))))
c.s << "+";
}
if (!overall_coeff.is_zero()) {
- if (overall_coeff.info(info_flags::positive))
+ if (overall_coeff.info(info_flags::positive)
+ || is_a<print_csrc_cl_N>(c)) // sign inside ctor argument
c.s << '+';
overall_coeff.print(c, precedence());
}
} else if (is_a<print_python_repr>(c)) {
c.s << class_name() << '(';
- unsigned end = nops();
- if (end)
- op(0).print(c);
- for (unsigned i=1; i<end; ++i) {
+ op(0).print(c);
+ for (unsigned i=1; i<nops(); ++i) {
c.s << ',';
op(i).print(c);
}
* 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
+ * - +(x;0) -> x
*
* @param level cut-off in recursive evaluation */
ex add::eval(int level) const
// the terms have not changed, so it is safe to declare this expanded
return (options == 0) ? setflag(status_flags::expanded) : *this;
}
-
+
return (new add(vp, overall_coeff))->setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0));
}