X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Fpseries.cpp;h=e7462206ec95d36c35c9f5078811271b73bfc5cb;hp=8f267e8de4d49c0062d5d1ed910aea1c61f53cff;hb=ec64e556734484ca3c518e6de95b26be61bedee7;hpb=2c8d5b298c5354c32514c4d5e52cfc80e8b32fbd

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index 8f267e8d..e7462206 100644
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -4,7 +4,7 @@
  *  methods for series expansion. */
 
 /*
- *  GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
@@ -71,6 +71,19 @@ pseries::pseries() { }
 pseries::pseries(const ex &rel_, const epvector &ops_)
   : seq(ops_)
 {
+#ifdef DO_GINAC_ASSERT
+	auto i = seq.begin();
+	while (i != seq.end()) {
+		auto ip1 = i+1;
+		if (ip1 != seq.end())
+			GINAC_ASSERT(!is_order_function(i->rest));
+		else
+			break;
+		GINAC_ASSERT(is_a<numeric>(i->coeff));
+		GINAC_ASSERT(ex_to<numeric>(i->coeff) < ex_to<numeric>(ip1->coeff));
+		++i;
+	}
+#endif // def DO_GINAC_ASSERT
 	GINAC_ASSERT(is_a<relational>(rel_));
 	GINAC_ASSERT(is_a<symbol>(rel_.lhs()));
 	point = rel_.rhs();
@@ -79,6 +92,19 @@ pseries::pseries(const ex &rel_, const epvector &ops_)
 pseries::pseries(const ex &rel_, epvector &&ops_)
   : seq(std::move(ops_))
 {
+#ifdef DO_GINAC_ASSERT
+	auto i = seq.begin();
+	while (i != seq.end()) {
+		auto ip1 = i+1;
+		if (ip1 != seq.end())
+			GINAC_ASSERT(!is_order_function(i->rest));
+		else
+			break;
+		GINAC_ASSERT(is_a<numeric>(i->coeff));
+		GINAC_ASSERT(ex_to<numeric>(i->coeff) < ex_to<numeric>(ip1->coeff));
+		++i;
+	}
+#endif // def DO_GINAC_ASSERT
 	GINAC_ASSERT(is_a<relational>(rel_));
 	GINAC_ASSERT(is_a<symbol>(rel_.lhs()));
 	point = rel_.rhs();
@@ -255,7 +281,7 @@ int pseries::compare_same_type(const basic & other) const
 		return cmpval;
 	
 	// ...and if that failed the individual elements
-	epvector::const_iterator it = seq.begin(), o_it = o.seq.begin();
+	auto it = seq.begin(), o_it = o.seq.begin();
 	while (it!=seq.end() && o_it!=o.seq.end()) {
 		cmpval = it->compare(*o_it);
 		if (cmpval)
@@ -290,25 +316,17 @@ ex pseries::op(size_t i) const
  *  series is examined termwise. */
 int pseries::degree(const ex &s) const
 {
-	if (var.is_equal(s)) {
-		// Return last exponent
-		if (seq.size())
-			return ex_to<numeric>((seq.end()-1)->coeff).to_int();
-		else
-			return 0;
-	} else {
-		epvector::const_iterator it = seq.begin(), itend = seq.end();
-		if (it == itend)
-			return 0;
-		int max_pow = std::numeric_limits<int>::min();
-		while (it != itend) {
-			int pow = it->rest.degree(s);
-			if (pow > max_pow)
-				max_pow = pow;
-			++it;
-		}
-		return max_pow;
-	}
+	if (seq.empty())
+		return 0;
+
+	if (var.is_equal(s))
+		// Return last/greatest exponent
+		return ex_to<numeric>((seq.end()-1)->coeff).to_int();
+
+	int max_pow = std::numeric_limits<int>::min();
+	for (auto & it : seq)
+		max_pow = std::max(max_pow, it.rest.degree(s));
+	return max_pow;
 }
 
 /** Return degree of lowest power of the series.  This is usually the exponent
@@ -318,25 +336,17 @@ int pseries::degree(const ex &s) const
  *  I.e.: (1-x) + (1-x)^2 + Order((1-x)^3) has ldegree(x) 1, not 0. */
 int pseries::ldegree(const ex &s) const
 {
-	if (var.is_equal(s)) {
-		// Return first exponent
-		if (seq.size())
-			return ex_to<numeric>((seq.begin())->coeff).to_int();
-		else
-			return 0;
-	} else {
-		epvector::const_iterator it = seq.begin(), itend = seq.end();
-		if (it == itend)
-			return 0;
-		int min_pow = std::numeric_limits<int>::max();
-		while (it != itend) {
-			int pow = it->rest.ldegree(s);
-			if (pow < min_pow)
-				min_pow = pow;
-			++it;
-		}
-		return min_pow;
-	}
+	if (seq.empty())
+		return 0;
+
+	if (var.is_equal(s))
+		// Return first/smallest exponent
+		return ex_to<numeric>((seq.begin())->coeff).to_int();
+
+	int min_pow = std::numeric_limits<int>::max();
+	for (auto & it : seq)
+		min_pow = std::min(min_pow, it.rest.degree(s));
+	return min_pow;
 }
 
 /** Return coefficient of degree n in power series if s is the expansion
@@ -389,35 +399,25 @@ ex pseries::eval() const
 	if (flags & status_flags::evaluated) {
 		return *this;
 	}
-	
+
 	// Construct a new series with evaluated coefficients
 	epvector new_seq;
 	new_seq.reserve(seq.size());
-	epvector::const_iterator it = seq.begin(), itend = seq.end();
-	while (it != itend) {
-		new_seq.push_back(expair(it->rest, it->coeff));
-		++it;
-	}
+	for (auto & it : seq)
+		new_seq.push_back(expair(it.rest, it.coeff));
+
 	return dynallocate<pseries>(relational(var,point), std::move(new_seq)).setflag(status_flags::evaluated);
 }
 
 /** Evaluate coefficients numerically. */
-ex pseries::evalf(int level) const
+ex pseries::evalf() const
 {
-	if (level == 1)
-		return *this;
-	
-	if (level == -max_recursion_level)
-		throw (std::runtime_error("pseries::evalf(): recursion limit exceeded"));
-	
 	// Construct a new series with evaluated coefficients
 	epvector new_seq;
 	new_seq.reserve(seq.size());
-	epvector::const_iterator it = seq.begin(), itend = seq.end();
-	while (it != itend) {
-		new_seq.push_back(expair(it->rest.evalf(level-1), it->coeff));
-		++it;
-	}
+	for (auto & it : seq)
+		new_seq.push_back(expair(it.rest, it.coeff));
+
 	return dynallocate<pseries>(relational(var,point), std::move(new_seq)).setflag(status_flags::evaluated);
 }