X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.cpp;h=b37ab79def6926ca36c3dc804f068580c10b7b09;hp=88024bdf29a6028b0a86ca6dab400bb3ead7d86f;hb=d2de9f5307c47adb2df13359002d987653c38a6a;hpb=3ac17e18ada69428fe170c10abcc5f33a30f0676

diff --git a/ginac/add.cpp b/ginac/add.cpp
index 88024bdf..b37ab79d 100644
--- a/ginac/add.cpp
+++ b/ginac/add.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's sums 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
@@ -22,6 +22,7 @@
 
 #include <iostream>
 #include <stdexcept>
+#include <limits>
 
 #include "add.h"
 #include "mul.h"
@@ -258,7 +259,7 @@ bool add::info(unsigned inf) const
 
 int add::degree(const ex & s) const
 {
-	int deg = INT_MIN;
+	int deg = std::numeric_limits<int>::min();
 	if (!overall_coeff.is_zero())
 		deg = 0;
 	
@@ -275,7 +276,7 @@ int add::degree(const ex & s) const
 
 int add::ldegree(const ex & s) const
 {
-	int deg = INT_MAX;
+	int deg = std::numeric_limits<int>::max();
 	if (!overall_coeff.is_zero())
 		deg = 0;
 	
@@ -424,6 +425,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,7 +502,7 @@ unsigned add::return_type() const
 		return seq.begin()->rest.return_type();
 }
 
-const basic* add::return_type_tinfo() const
+tinfo_t add::return_type_tinfo() const
 {
 	if (seq.empty())
 		return this;
@@ -473,12 +510,14 @@ const basic* add::return_type_tinfo() const
 		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);
 }