X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fadd.cpp;h=b37ab79def6926ca36c3dc804f068580c10b7b09;hp=a53a1013e7d22e10d2df64cbefb0d27cb0a3f13e;hb=23ec069cf5e221e0da2890208e69b317b7d27e03;hpb=6eca7546c3ef806e01e393255de7c2bdfc011ea8

diff --git a/ginac/add.cpp b/ginac/add.cpp
index a53a1013..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-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
@@ -22,6 +22,7 @@
 
 #include <iostream>
 #include <stdexcept>
+#include <limits>
 
 #include "add.h"
 #include "mul.h"
@@ -47,7 +48,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(add, expairseq,
 
 add::add()
 {
-	tinfo_key = TINFO_add;
+	tinfo_key = &add::tinfo_static;
 }
 
 //////////
@@ -58,7 +59,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 +67,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 +75,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 +83,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 +91,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);
@@ -133,8 +134,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);
@@ -181,11 +182,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 << "/";
@@ -200,7 +201,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 << "+";
 	}
 	
@@ -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;
 	
@@ -401,7 +402,7 @@ ex add::evalm() const
 ex add::conjugate() const
 {
 	exvector *v = 0;
-	for (int i=0; i<nops(); ++i) {
+	for (size_t i=0; i<nops(); ++i) {
 		if (v) {
 			v->push_back(op(i).conjugate());
 			continue;
@@ -412,7 +413,7 @@ ex add::conjugate() const
 			continue;
 		v = new exvector;
 		v->reserve(nops());
-		for (int j=0; j<i; ++j)
+		for (size_t j=0; j<i; ++j)
 			v->push_back(op(j));
 		v->push_back(ccterm);
 	}
@@ -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,20 +502,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);
 }
@@ -531,7 +570,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);
 	}
 
@@ -540,7 +579,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);