From: Christian Bauer <Christian.Bauer@uni-mainz.de>
Date: Tue, 29 Jun 2004 18:38:42 +0000 (+0000)
Subject: obvious patch from Chris Dams
X-Git-Tag: release_1-3-0~57
X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=db81420a61959540b71507fe0d3737d06eee54dc;ds=sidebyside

obvious patch from Chris Dams
---

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index eaef6388..443969c1 100644
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -798,8 +798,7 @@ ex mul::series(const relational & r, int order, unsigned options) const
 		int real_ldegree = 0;
 		try {
 			real_ldegree = buf.expand().ldegree(sym-r.rhs());
-		}
-		catch (std::runtime_error) {}
+		} catch (std::runtime_error) {}
 
 		if (real_ldegree == 0) {
 			int orderloop = 0;
@@ -814,7 +813,7 @@ ex mul::series(const relational & r, int order, unsigned options) const
 
 	int degsum = std::accumulate(ldegrees.begin(), ldegrees.end(), 0);
 
-	if (degsum>order) {
+	if (degsum >= order) {
 		epvector epv;
 		epv.push_back(expair(Order(_ex1), order));
 		return (new pseries(r, epv))->setflag(status_flags::dynallocated);
@@ -828,7 +827,7 @@ ex mul::series(const relational & r, int order, unsigned options) const
 		ex op = recombine_pair_to_ex(*it).series(r, order-degsum+(*itd), options);
 
 		// Series multiplication
-		if (it==itbeg)
+		if (it == itbeg)
 			acc = ex_to<pseries>(op);
 		else
 			acc = ex_to<pseries>(acc.mul_series(ex_to<pseries>(op)));