Fixed bug in taking real and imaginary part.

[ginac.git] / ginac / add.cpp

diff --git a/ginac/add.cpp b/ginac/add.cpp
index 74e639aebe27e0d003740c23ea5cc3278999cbbb..353b4a7744079ec1d73549454746a5a36eaf632f 100644 (file)
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's sums of expressions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2005 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
@@ -47,7 +47,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(add, expairseq,
 
 add::add()
 {
-       tinfo_key = TINFO_add;
+       tinfo_key = &add::tinfo_static;
 }
 
 //////////
@@ -58,7 +58,7 @@ add::add()
 
 add::add(const ex & lh, const ex & rh)
 {
-       tinfo_key = TINFO_add;
+       tinfo_key = &add::tinfo_static;
        overall_coeff = _ex0;
        construct_from_2_ex(lh,rh);
        GINAC_ASSERT(is_canonical());
@@ -66,7 +66,7 @@ add::add(const ex & lh, const ex & rh)
 
 add::add(const exvector & v)
 {
-       tinfo_key = TINFO_add;
+       tinfo_key = &add::tinfo_static;
        overall_coeff = _ex0;
        construct_from_exvector(v);
        GINAC_ASSERT(is_canonical());
@@ -74,7 +74,7 @@ add::add(const exvector & v)
 
 add::add(const epvector & v)
 {
-       tinfo_key = TINFO_add;
+       tinfo_key = &add::tinfo_static;
        overall_coeff = _ex0;
        construct_from_epvector(v);
        GINAC_ASSERT(is_canonical());
@@ -82,7 +82,7 @@ add::add(const epvector & v)
 
 add::add(const epvector & v, const ex & oc)
 {
-       tinfo_key = TINFO_add;
+       tinfo_key = &add::tinfo_static;
        overall_coeff = oc;
        construct_from_epvector(v);
        GINAC_ASSERT(is_canonical());
@@ -90,7 +90,7 @@ add::add(const epvector & v, const ex & oc)
 
 add::add(std::auto_ptr<epvector> vp, const ex & oc)
 {
-       tinfo_key = TINFO_add;
+       tinfo_key = &add::tinfo_static;
        GINAC_ASSERT(vp.get()!=0);
        overall_coeff = oc;
        construct_from_epvector(*vp);
@@ -424,6 +424,42 @@ ex add::conjugate() const
        return *this;
 }
 
+ex add::real_part() const
+{
+       epvector v;
+       v.reserve(seq.size());
+       for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
+               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();
+                       if (!rp.is_zero())
+                               v.push_back(split_ex_to_pair(rp));
+               }
+       return (new add(v, overall_coeff.real_part()))
+               -> setflag(status_flags::dynallocated);
+}
+
+ex add::imag_part() const
+{
+       epvector v;
+       v.reserve(seq.size());
+       for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
+               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();
+                       if (!ip.is_zero())
+                               v.push_back(split_ex_to_pair(ip));
+               }
+       return (new add(v, overall_coeff.imag_part()))
+               -> setflag(status_flags::dynallocated);
+}
+
 ex add::eval_ncmul(const exvector & v) const
 {
        if (seq.empty())
@@ -465,20 +501,22 @@ unsigned add::return_type() const
                return seq.begin()->rest.return_type();
 }
 
-unsigned add::return_type_tinfo() const
+tinfo_t add::return_type_tinfo() const
 {
        if (seq.empty())
-               return tinfo_key;
+               return this;
        else
                return seq.begin()->rest.return_type_tinfo();
 }
 
-ex add::thisexpairseq(const epvector & v, const ex & oc) const
+// Note: do_index_renaming is ignored because it makes no sense for an add.
+ex add::thisexpairseq(const epvector & v, const ex & oc, bool do_index_renaming) const
 {
        return (new add(v,oc))->setflag(status_flags::dynallocated);
 }
 
-ex add::thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc) const
+// Note: do_index_renaming is ignored because it makes no sense for an add.
+ex add::thisexpairseq(std::auto_ptr<epvector> vp, const ex & oc, bool do_index_renaming) const
 {
        return (new add(vp,oc))->setflag(status_flags::dynallocated);
 }