X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpseries.cpp;h=1e61e0aee18b8066eea85bf1360572a3b3d86074;hp=081cc7178f7f08725d4a0606024fbec921d0f9b3;hb=d0b3e67ddbbe031fefbe3e88e8bf8860424d0d4b;hpb=695f6ae955ec530cded8f21efd5569df39447f76

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index 081cc717..1e61e0ae 100644
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -4,7 +4,7 @@
  *  methods for series expansion. */
 
 /*
- *  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
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #include <numeric>
@@ -51,7 +51,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(pseries, basic,
  *  Default constructor
  */
 
-pseries::pseries() : inherited(TINFO_pseries) { }
+pseries::pseries() : inherited(&pseries::tinfo_static) { }
 
 
 /*
@@ -67,7 +67,7 @@ pseries::pseries() : inherited(TINFO_pseries) { }
  *  @param rel_  expansion variable and point (must hold a relational)
  *  @param ops_  vector of {coefficient, power} pairs (coefficient must not be zero)
  *  @return newly constructed pseries */
-pseries::pseries(const ex &rel_, const epvector &ops_) : basic(TINFO_pseries), seq(ops_)
+pseries::pseries(const ex &rel_, const epvector &ops_) : basic(&pseries::tinfo_static), seq(ops_)
 {
 	GINAC_ASSERT(is_a<relational>(rel_));
 	GINAC_ASSERT(is_a<symbol>(rel_.lhs()));
@@ -82,14 +82,19 @@ pseries::pseries(const ex &rel_, const epvector &ops_) : basic(TINFO_pseries), s
 
 pseries::pseries(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
 {
-	for (unsigned int i=0; true; ++i) {
+	archive_node::archive_node_cit first = n.find_first("coeff");
+	archive_node::archive_node_cit last = n.find_last("power");
+	++last;
+	seq.reserve((last-first)/2);
+
+	for (archive_node::archive_node_cit loc = first; loc < last;) {
 		ex rest;
 		ex coeff;
-		if (n.find_ex("coeff", rest, sym_lst, i) && n.find_ex("power", coeff, sym_lst, i))
-			seq.push_back(expair(rest, coeff));
-		else
-			break;
+		n.find_ex_by_loc(loc++, rest, sym_lst);
+		n.find_ex_by_loc(loc++, coeff, sym_lst);
+		seq.push_back(expair(rest, coeff));
 	}
+
 	n.find_ex("var", var, sym_lst);
 	n.find_ex("point", point, sym_lst);
 }
@@ -412,21 +417,53 @@ ex pseries::evalf(int level) const
 
 ex pseries::conjugate() const
 {
+	if(!var.info(info_flags::real))
+		return conjugate_function(*this).hold();
+
 	epvector * newseq = conjugateepvector(seq);
-	ex newvar = var.conjugate();
 	ex newpoint = point.conjugate();
 
-	if (!newseq	&& are_ex_trivially_equal(newvar, var) && are_ex_trivially_equal(point, newpoint)) {
+	if (!newseq	&& are_ex_trivially_equal(point, newpoint)) {
 		return *this;
 	}
 
-	ex result = (new pseries(newvar==newpoint, newseq ? *newseq : seq))->setflag(status_flags::dynallocated);
+	ex result = (new pseries(var==newpoint, newseq ? *newseq : seq))->setflag(status_flags::dynallocated);
 	if (newseq) {
 		delete newseq;
 	}
 	return result;
 }
 
+ex pseries::real_part() const
+{
+	if(!var.info(info_flags::real))
+		return real_part_function(*this).hold();
+	ex newpoint = point.real_part();
+	if(newpoint != point)
+		return real_part_function(*this).hold();
+
+	epvector v;
+	v.reserve(seq.size());
+	for(epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
+		v.push_back(expair((i->rest).real_part(), i->coeff));
+	return (new pseries(var==point, v))->setflag(status_flags::dynallocated);
+}
+
+ex pseries::imag_part() const
+{
+	if(!var.info(info_flags::real))
+		return imag_part_function(*this).hold();
+	ex newpoint = point.real_part();
+	if(newpoint != point)
+		return imag_part_function(*this).hold();
+
+	epvector v;
+	v.reserve(seq.size());
+	for(epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
+		v.push_back(expair((i->rest).imag_part(), i->coeff));
+	return (new pseries(var==point, v))->setflag(status_flags::dynallocated);
+}
+
 ex pseries::eval_integ() const
 {
 	epvector *newseq = NULL;
@@ -452,6 +489,34 @@ ex pseries::eval_integ() const
 	return *this;
 }
 
+ex pseries::evalm() const
+{
+	// evalm each coefficient
+	epvector newseq;
+	bool something_changed = false;
+	for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) {
+		if (something_changed) {
+			ex newcoeff = i->rest.evalm();
+			if (!newcoeff.is_zero())
+				newseq.push_back(expair(newcoeff, i->coeff));
+		}
+		else {
+			ex newcoeff = i->rest.evalm();
+			if (!are_ex_trivially_equal(newcoeff, i->rest)) {
+				something_changed = true;
+				newseq.reserve(seq.size());
+				std::copy(seq.begin(), i, std::back_inserter<epvector>(newseq));
+				if (!newcoeff.is_zero())
+					newseq.push_back(expair(newcoeff, i->coeff));
+			}
+		}
+	}
+	if (something_changed)
+		return (new pseries(var==point, newseq))->setflag(status_flags::dynallocated);
+	else
+		return *this;
+}
+
 ex pseries::subs(const exmap & m, unsigned options) const
 {
 	// If expansion variable is being substituted, convert the series to a
@@ -1035,7 +1100,10 @@ ex power::series(const relational & r, int order, unsigned options) const
 	}
 	const ex& sym = r.lhs();
 	// find existing minimal degree
-	int real_ldegree = basis.expand().ldegree(sym-r.rhs());
+	ex eb = basis.expand();
+	int real_ldegree = 0;
+	if (eb.info(info_flags::rational_function))
+		real_ldegree = eb.ldegree(sym-r.rhs());
 	if (real_ldegree == 0) {
 		int orderloop = 0;
 		do {