Fixed initialization order bug (references to flyweights removed!) [C.Dams].

[ginac.git] / ginac / add.cpp

diff --git a/ginac/add.cpp b/ginac/add.cpp
index 6969a8626de3aeccf09ab0a428d094cc8db74ca0..0ece092f655219d3b09cfb60d78f61b587b039a9 100644 (file)
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -29,6 +29,8 @@
 #include "operators.h"
 #include "matrix.h"
 #include "utils.h"
+#include "clifford.h"
+#include "ncmul.h"
 
 namespace GiNaC {
 
@@ -131,8 +133,8 @@ void add::print_add(const print_context & c, const char *openbrace, const char *
                        if (coeff.csgn() == -1) c.s << '-';
                        first = false;
                }
-               if (!coeff.is_equal(_num1) &&
-                   !coeff.is_equal(_num_1)) {
+               if (!coeff.is_equal(*_num1_p) &&
+                   !coeff.is_equal(*_num_1_p)) {
                        if (coeff.is_rational()) {
                                if (coeff.is_negative())
                                        (-coeff).print(c);
@@ -179,11 +181,11 @@ void add::do_print_csrc(const print_csrc & c, unsigned level) const
                } 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)) {
+               } else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num1_p)) {
                        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)) {
+               } else if (ex_to<numeric>(it->coeff).numer().is_equal(*_num_1_p)) {
                        c.s << "-";
                        it->rest.print(c, precedence());
                        c.s << "/";
@@ -198,7 +200,7 @@ void add::do_print_csrc(const print_csrc & c, unsigned level) const
                ++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) && is_exactly_a<numeric>(it->rest) && it->rest.info(info_flags::negative)))))
+                 || !(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 << "+";
        }
        
@@ -291,17 +293,31 @@ int add::ldegree(const ex & s) const
 ex add::coeff(const ex & s, int n) const
 {
        std::auto_ptr<epvector> coeffseq(new epvector);
+       std::auto_ptr<epvector> coeffseq_cliff(new epvector);
+       char 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 (!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));
+                                       nonscalar = true;
+                               }
+                       }
                        coeffseq->push_back(combine_ex_with_coeff_to_pair(restcoeff, i->coeff));
+               }
                ++i;
        }
 
-       return (new add(coeffseq, n==0 ? overall_coeff : _ex0))->setflag(status_flags::dynallocated);
+       return (new add(nonscalar ? coeffseq_cliff : coeffseq,
+                       n==0 ? overall_coeff : _ex0))->setflag(status_flags::dynallocated);
 }
 
 /** Perform automatic term rewriting rules in this class.  In the following
@@ -515,7 +531,7 @@ expair add::combine_pair_with_coeff_to_pair(const expair & p,
        GINAC_ASSERT(is_exactly_a<numeric>(c));
 
        if (is_exactly_a<numeric>(p.rest)) {
-               GINAC_ASSERT(ex_to<numeric>(p.coeff).is_equal(_num1)); // should be normalized
+               GINAC_ASSERT(ex_to<numeric>(p.coeff).is_equal(*_num1_p)); // should be normalized
                return expair(ex_to<numeric>(p.rest).mul_dyn(ex_to<numeric>(c)),_ex1);
        }
 
@@ -524,7 +540,7 @@ expair add::combine_pair_with_coeff_to_pair(const expair & p,
        
 ex add::recombine_pair_to_ex(const expair & p) const
 {
-       if (ex_to<numeric>(p.coeff).is_equal(_num1))
+       if (ex_to<numeric>(p.coeff).is_equal(*_num1_p))
                return p.rest;
        else
                return (new mul(p.rest,p.coeff))->setflag(status_flags::dynallocated);