Patch by Stefan Weinzierl that fixes a bug in series expansion.

[ginac.git] / ginac / ncmul.cpp

diff --git a/ginac/ncmul.cpp b/ginac/ncmul.cpp
index efa4af5bce7bc48b7a1e19a5c6aca2cdba49fdac..371232974712aa9d045b46d0c53d02c7346aa5e3 100644 (file)
--- a/ginac/ncmul.cpp
+++ b/ginac/ncmul.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's non-commutative products of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2006 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2007 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
@@ -29,7 +29,6 @@
 #include "add.h"
 #include "mul.h"
 #include "clifford.h"
-#include "color.h"
 #include "matrix.h"
 #include "archive.h"
 #include "indexed.h"
@@ -336,8 +335,11 @@ ex ncmul::eval(int level) const
        exvector assocseq;
        assocseq.reserve(factors);
        cit = evaledseq.begin();
+       make_flat_inserter mf(evaledseq, true);
        while (cit != citend)
-               append_factors(assocseq, *cit++);
+       {       ex factor = mf.handle_factor(*(cit++), 1);
+               append_factors(assocseq, factor);
+       }
        
        // ncmul(x) -> x
        if (assocseq.size()==1) return *(seq.begin());
@@ -399,32 +401,19 @@ ex ncmul::eval(int level) const
 
                size_t assoc_num = assocseq.size();
                exvectorvector evv;
-               std::vector<const basic*> rttinfos;
+               std::vector<tinfo_t> rttinfos;
                evv.reserve(assoc_num);
                rttinfos.reserve(assoc_num);
 
                cit = assocseq.begin(), citend = assocseq.end();
                while (cit != citend) {
-                       const basic* ti = cit->return_type_tinfo();
+                       tinfo_t ti = cit->return_type_tinfo();
                        size_t rtt_num = rttinfos.size();
                        // search type in vector of known types
                        for (i=0; i<rtt_num; ++i) {
-                               tinfo_t tinf = ti->tinfo();
-                               if (tinf == rttinfos[i]->tinfo()) {
-                                       if (tinf == &clifford::tinfo_static) {
-                                               if (((clifford*)ti)->get_representation_label() == ((clifford*)rttinfos[i])->get_representation_label()) {
-                                                       evv[i].push_back(*cit);
-                                                       break;
-                                               }
-                                       } else if (tinf == &color::tinfo_static) {
-                                               if (((color*)ti)->get_representation_label() == ((color*)rttinfos[i])->get_representation_label()) {
-                                                       evv[i].push_back(*cit);
-                                                       break;
-                                               }
-                                       } else {
-                                               evv[i].push_back(*cit);
-                                               break;
-                                       }
+                               if(ti == rttinfos[i]) {
+                                       evv[i].push_back(*cit);
+                                       break;
                                }
                        }
                        if (i >= rtt_num) {
@@ -509,7 +498,7 @@ ex ncmul::conjugate() const
                return exprseq::conjugate();
        }
 
-       if (return_type_tinfo()->tinfo() != &clifford::tinfo_static) {
+       if (!is_clifford_tinfo(return_type_tinfo())) {
                return exprseq::conjugate();
        }
 
@@ -522,6 +511,16 @@ ex ncmul::conjugate() const
        return (new ncmul(ev, true))->setflag(status_flags::dynallocated).eval();
 }
 
+ex ncmul::real_part() const
+{
+       return basic::real_part();
+}
+
+ex ncmul::imag_part() const
+{
+       return basic::imag_part();
+}
+
 // protected
 
 /** Implementation of ex::diff() for a non-commutative product. It applies
@@ -569,23 +568,8 @@ unsigned ncmul::return_type() const
                }
                if ((rt == return_types::noncommutative) && (!all_commutative)) {
                        // another nc element found, compare type_infos
-                       if (noncommutative_element->return_type_tinfo()->tinfo() == &clifford::tinfo_static) {
-                               if (i->return_type_tinfo()->tinfo() != &clifford::tinfo_static ||
-                                   ((clifford*)(noncommutative_element->return_type_tinfo()))->get_representation_label() !=
-                                   ((clifford*)(i->return_type_tinfo()))->get_representation_label()) {
-                                       // diffent types -> mul is ncc
-                                       return return_types::noncommutative_composite;
-                               }
-                       } else if (noncommutative_element->return_type_tinfo()->tinfo() == &color::tinfo_static) {
-                               if (i->return_type_tinfo()->tinfo() != &color::tinfo_static ||
-                                   ((color*)(noncommutative_element->return_type_tinfo()))->get_representation_label() !=
-                                   ((color*)(i->return_type_tinfo()))->get_representation_label()) {
-                                       // diffent types -> mul is ncc
+                       if(noncommutative_element->return_type_tinfo() != i->return_type_tinfo())
                                        return return_types::noncommutative_composite;
-                               }
-                       } else if (noncommutative_element->return_type_tinfo()->tinfo() != i->return_type_tinfo()->tinfo()) {
-                                       return return_types::noncommutative_composite;
-                       }
                }
                ++i;
        }
@@ -594,7 +578,7 @@ unsigned ncmul::return_type() const
        return all_commutative ? return_types::commutative : return_types::noncommutative;
 }
    
-const basic* ncmul::return_type_tinfo() const
+tinfo_t ncmul::return_type_tinfo() const
 {
        if (seq.empty())
                return this;