From 1531cd76f7b2159647bfddb0d9e9cc9b2a98b94e Mon Sep 17 00:00:00 2001 From: Chris Dams Date: Mon, 19 Feb 2007 17:01:38 +0000 Subject: [PATCH 1/1] Fixed bug in taking real and imaginary part. --- ginac/add.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/ginac/add.cpp b/ginac/add.cpp index c2aeae6d..353b4a77 100644 --- a/ginac/add.cpp +++ b/ginac/add.cpp @@ -429,11 +429,14 @@ 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)) - v.push_back(expair((i->rest).real_part(), i->coeff)); - else { + 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(); - v.push_back(split_ex_to_pair(rp)); + if (!rp.is_zero()) + v.push_back(split_ex_to_pair(rp)); } return (new add(v, overall_coeff.real_part())) -> setflag(status_flags::dynallocated); @@ -444,11 +447,14 @@ 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)) - v.push_back(expair((i->rest).imag_part(), i->coeff)); - else { + 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(); - v.push_back(split_ex_to_pair(ip)); + if (!ip.is_zero()) + v.push_back(split_ex_to_pair(ip)); } return (new add(v, overall_coeff.imag_part())) -> setflag(status_flags::dynallocated); -- 2.44.0