X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpseries.cpp;h=fbb7583b3bc1b0b10e7c16eacff1b86f5049fc24;hp=9adc8fc4fbd898daa646df026fc8e716a677d8cf;hb=4e3a4ac2bcb0837611ea31bc8fc05d84a20c33ac;hpb=f39f8353dae2542f654c170dc7fb9c97c5f29820

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index 9adc8fc4..fbb7583b 100644
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -35,41 +35,17 @@
 #include "utils.h"
 #include "debugmsg.h"
 
-#ifndef NO_NAMESPACE_GINAC
 namespace GiNaC {
-#endif // ndef NO_NAMESPACE_GINAC
 
 GINAC_IMPLEMENT_REGISTERED_CLASS(pseries, basic)
 
 /*
- *  Default constructor, destructor, copy constructor, assignment operator and helpers
+ *  Default ctor, dtor, copy ctor, assignment operator and helpers
  */
 
 pseries::pseries() : basic(TINFO_pseries)
 {
-	debugmsg("pseries default constructor", LOGLEVEL_CONSTRUCT);
-}
-
-pseries::~pseries()
-{
-	debugmsg("pseries destructor", LOGLEVEL_DESTRUCT);
-	destroy(false);
-}
-
-pseries::pseries(const pseries &other)
-{
-	debugmsg("pseries copy constructor", LOGLEVEL_CONSTRUCT);
-	copy(other);
-}
-
-const pseries &pseries::operator=(const pseries & other)
-{
-	debugmsg("pseries operator=", LOGLEVEL_ASSIGNMENT);
-	if (this != &other) {
-		destroy(true);
-		copy(other);
-	}
-	return *this;
+	debugmsg("pseries default ctor", LOGLEVEL_CONSTRUCT);
 }
 
 void pseries::copy(const pseries &other)
@@ -88,7 +64,7 @@ void pseries::destroy(bool call_parent)
 
 
 /*
- *  Other constructors
+ *  Other ctors
  */
 
 /** Construct pseries from a vector of coefficients and powers.
@@ -102,7 +78,7 @@ void pseries::destroy(bool call_parent)
  *  @return newly constructed pseries */
 pseries::pseries(const ex &rel_, const epvector &ops_) : basic(TINFO_pseries), seq(ops_)
 {
-	debugmsg("pseries constructor from ex,epvector", LOGLEVEL_CONSTRUCT);
+	debugmsg("pseries ctor from ex,epvector", LOGLEVEL_CONSTRUCT);
 	GINAC_ASSERT(is_ex_exactly_of_type(rel_, relational));
 	GINAC_ASSERT(is_ex_exactly_of_type(rel_.lhs(),symbol));
 	point = rel_.rhs();
@@ -117,7 +93,7 @@ pseries::pseries(const ex &rel_, const epvector &ops_) : basic(TINFO_pseries), s
 /** Construct object from archive_node. */
 pseries::pseries(const archive_node &n, const lst &sym_lst) : inherited(n, sym_lst)
 {
-	debugmsg("pseries constructor from archive_node", LOGLEVEL_CONSTRUCT);
+	debugmsg("pseries ctor from archive_node", LOGLEVEL_CONSTRUCT);
 	for (unsigned int i=0; true; ++i) {
 		ex rest;
 		ex coeff;
@@ -154,20 +130,15 @@ void pseries::archive(archive_node &n) const
 // functions overriding virtual functions from bases classes
 //////////
 
-basic *pseries::duplicate() const
-{
-	debugmsg("pseries duplicate", LOGLEVEL_DUPLICATE);
-	return new pseries(*this);
-}
-
 void pseries::print(std::ostream &os, unsigned upper_precedence) const
 {
 	debugmsg("pseries print", LOGLEVEL_PRINT);
 	if (precedence<=upper_precedence) os << "(";
+	// objects of type pseries must not have any zero entries, so the
+	// trivial (zero) pseries needs a special treatment here:
+	if (seq.size()==0)
+		os << '0';
 	for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) {
-		// omit zero terms
-		if (i->rest.is_zero())
-			continue;
 		// print a sign, if needed
 		if (i!=seq.begin())
 			os << '+';
@@ -205,9 +176,8 @@ void pseries::printraw(std::ostream &os) const
 {
 	debugmsg("pseries printraw", LOGLEVEL_PRINT);
 	os << "pseries(" << var << ";" << point << ";";
-	for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) {
+	for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
 		os << "(" << (*i).rest << "," << (*i).coeff << "),";
-	}
 	os << ")";
 }
 
@@ -229,6 +199,31 @@ void pseries::printtree(std::ostream & os, unsigned indent) const
 	point.printtree(os, indent+delta_indent);
 }
 
+int pseries::compare_same_type(const basic & other) const
+{
+	GINAC_ASSERT(is_of_type(other, pseries));
+	const pseries &o = static_cast<const pseries &>(other);
+
+	int cmpval = var.compare(o.var);
+	if (cmpval)
+		return cmpval;
+	cmpval = point.compare(o.point);
+	if (cmpval)
+		return cmpval;
+
+	epvector::const_iterator it1 = seq.begin(), it2 = o.seq.begin(), it1end = seq.end(), it2end = o.seq.end();
+	while ((it1 != it1end) && (it2 != it2end)) {
+		cmpval = it1->compare(*it2);
+		if (cmpval)
+			return cmpval;
+		it1++; it2++;
+	}
+	if (it1 == it1end)
+		return it2 == it2end ? 0 : -1;
+
+	return 0;
+}
+
 /** Return the number of operands including a possible order term. */
 unsigned pseries::nops(void) const
 {
@@ -305,6 +300,13 @@ int pseries::ldegree(const symbol &s) const
 	}
 }
 
+/** Return coefficient of degree n in power series if s is the expansion
+ *  variable.  If the expansion point is nonzero, by definition the n=1
+ *  coefficient in s of a+b*(s-z)+c*(s-z)^2+Order((s-z)^3) is b (assuming
+ *  the expansion took place in the s in the first place).
+ *  If s is not the expansion variable, an attempt is made to convert the
+ *  series to a polynomial and return the corresponding coefficient from
+ *  there. */
 ex pseries::coeff(const symbol &s, int n) const
 {
 	if (var.is_equal(s)) {
@@ -336,7 +338,7 @@ ex pseries::coeff(const symbol &s, int n) const
 		return convert_to_poly().coeff(s, n);
 }
 
-
+/** Does nothing. */
 ex pseries::collect(const symbol &s) const
 {
 	return *this;
@@ -407,14 +409,15 @@ ex pseries::subs(const lst & ls, const lst & lr) const
 
 
 /** Implementation of ex::expand() for a power series.  It expands all the
- *  terms individually and returns the resulting series as a new pseries.
- *  @see ex::diff */
+ *  terms individually and returns the resulting series as a new pseries. */
 ex pseries::expand(unsigned options) const
 {
 	epvector newseq;
-	newseq.reserve(seq.size());
-	for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i)
-		newseq.push_back(expair(i->rest.expand(), i->coeff));
+	for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) {
+		ex restexp = i->rest.expand();
+		if (!restexp.is_zero())
+			newseq.push_back(expair(restexp, i->coeff));
+	}
 	return (new pseries(relational(var,point), newseq))
 	        ->setflag(status_flags::dynallocated | status_flags::expanded);
 }
@@ -447,10 +450,6 @@ ex pseries::derivative(const symbol & s) const
 }
 
 
-/*
- *  Construct ordinary polynomial out of series
- */
-
 /** Convert a pseries object to an ordinary polynomial.
  *
  *  @param no_order flag: discard higher order terms */
@@ -470,6 +469,7 @@ ex pseries::convert_to_poly(bool no_order) const
 	return e;
 }
 
+
 /** Returns true if there is no order term, i.e. the series terminates and
  *  false otherwise. */
 bool pseries::is_terminating(void) const
@@ -479,7 +479,7 @@ bool pseries::is_terminating(void) const
 
 
 /*
- *  Implementation of series expansion
+ *  Implementations of series expansion
  */
 
 /** Default implementation of ex::series(). This performs Taylor expansion.
@@ -774,6 +774,18 @@ ex pseries::power_const(const numeric &p, int deg) const
 	// a constant, just consider A2(x) = A(x)*x^m, with some integer m and
 	// repeat the above derivation.  The leading power of C2(x) = A2(x)^2 is
 	// then of course x^(p*m) but the recurrence formula still holds.
+	
+	if (seq.size()==0) {
+		// as a spacial case, handle the empty (zero) series honoring the
+		// usual power laws such as implemented in power::eval()
+		if (p.real().is_zero())
+			throw (std::domain_error("pseries::power_const(): pow(0,I) is undefined"));
+		else if (p.real().is_negative())
+			throw (pole_error("pseries::power_const(): division by zero",1));
+		else
+			return *this;
+	}
+	
 	const symbol *s = static_cast<symbol *>(var.bp);
 	int ldeg = ldegree(*s);
 	
@@ -926,6 +938,4 @@ ex ex::series(const ex & r, int order, unsigned options) const
 
 unsigned pseries::precedence = 38;  // for clarity just below add::precedence
 
-#ifndef NO_NAMESPACE_GINAC
 } // namespace GiNaC
-#endif // ndef NO_NAMESPACE_GINAC