under certain conditions, power::expand_add_2() could produce non-canonical
[ginac.git] / ginac / add.cpp
index bdcd49999a59182538517f877625197813e4b14f..1c995aa7f74d9f36f0b98bba4d9173789aa6b1d8 100644 (file)
@@ -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-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
@@ -27,7 +27,6 @@
 #include "mul.h"
 #include "matrix.h"
 #include "archive.h"
-#include "debugmsg.h"
 #include "utils.h"
 
 namespace GiNaC {
@@ -35,12 +34,11 @@ namespace GiNaC {
 GINAC_IMPLEMENT_REGISTERED_CLASS(add, expairseq)
 
 //////////
-// default constructor, destructor, copy constructor assignment operator and helpers
+// default ctor, dtor, copy ctor, assignment operator and helpers
 //////////
 
 add::add()
 {
-       debugmsg("add default constructor",LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_add;
 }
 
@@ -55,7 +53,6 @@ DEFAULT_DESTROY(add)
 
 add::add(const ex & lh, const ex & rh)
 {
-       debugmsg("add constructor from ex,ex",LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_add;
        overall_coeff = _ex0;
        construct_from_2_ex(lh,rh);
@@ -64,7 +61,6 @@ add::add(const ex & lh, const ex & rh)
 
 add::add(const exvector & v)
 {
-       debugmsg("add constructor from exvector",LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_add;
        overall_coeff = _ex0;
        construct_from_exvector(v);
@@ -73,7 +69,6 @@ add::add(const exvector & v)
 
 add::add(const epvector & v)
 {
-       debugmsg("add constructor from epvector",LOGLEVEL_CONSTRUCT);
        tinfo_key = TINFO_add;
        overall_coeff = _ex0;
        construct_from_epvector(v);
@@ -82,7 +77,6 @@ add::add(const epvector & v)
 
 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);
@@ -91,7 +85,6 @@ add::add(const epvector & v, 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;
@@ -114,8 +107,6 @@ DEFAULT_ARCHIVING(add)
 
 void add::print(const print_context & c, unsigned level) const
 {
-       debugmsg("add print", LOGLEVEL_PRINT);
-
        if (is_a<print_tree>(c)) {
 
                inherited::print(c, level);
@@ -130,16 +121,16 @@ void add::print(const print_context & c, unsigned level) const
                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 << "/";
@@ -150,21 +141,34 @@ void add::print(const print_context & c, unsigned level) const
                                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());
                }
-       
+               
                if (precedence() <= level)
                        c.s << ")";
 
+       } else if (is_a<print_python_repr>(c)) {
+
+               c.s << class_name() << '(';
+               op(0).print(c);
+               for (unsigned i=1; i<nops(); ++i) {
+                       c.s << ',';
+                       op(i).print(c);
+               }
+               c.s << ')';
+
        } else {
 
                if (precedence() <= level) {
@@ -316,8 +320,6 @@ ex add::coeff(const ex & s, int n) const
  *  @param level cut-off in recursive evaluation */
 ex add::eval(int level) const
 {
-       debugmsg("add eval",LOGLEVEL_MEMBER_FUNCTION);
-       
        epvector *evaled_seqp = evalchildren(level);
        if (evaled_seqp) {
                // do more evaluation later
@@ -378,7 +380,7 @@ ex add::evalm(void) const
                                sum = sum.add(ex_to<matrix>(m));
                } else
                        all_matrices = false;
-               it++;
+               ++it;
        }
 
        if (all_matrices) {
@@ -456,7 +458,7 @@ 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;
+               const ex &numfactor = mulref.overall_coeff;
                mul *mulcopyp = new mul(mulref);
                mulcopyp->overall_coeff = _ex1;
                mulcopyp->clearflag(status_flags::evaluated);
@@ -473,7 +475,7 @@ expair add::combine_ex_with_coeff_to_pair(const ex & e,
        GINAC_ASSERT(is_exactly_a<numeric>(c));
        if (is_ex_exactly_of_type(e, mul)) {
                const mul &mulref(ex_to<mul>(e));
-               ex numfactor = mulref.overall_coeff;
+               const ex &numfactor = mulref.overall_coeff;
                mul *mulcopyp = new mul(mulref);
                mulcopyp->overall_coeff = _ex1;
                mulcopyp->clearflag(status_flags::evaluated);
@@ -512,7 +514,7 @@ ex add::recombine_pair_to_ex(const expair & p) const
        if (ex_to<numeric>(p.coeff).is_equal(_num1))
                return p.rest;
        else
-               return p.rest*p.coeff;
+               return (new mul(p.rest,p.coeff))->setflag(status_flags::dynallocated);
 }
 
 ex add::expand(unsigned options) const
@@ -522,7 +524,7 @@ ex add::expand(unsigned options) 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));
 }