- ex::series() catches and re-throws exceptions happening during expansion

[ginac.git] / ginac / pseries.cpp

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index 87d0e4377a6ccbb3023723759b5c6be3773b45d8..4faa7200c8551a161fa700ae80c0a5b4c0b09342 100644 (file)
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -272,16 +272,17 @@ ex pseries::coeff(const symbol &s, int n) const
 
 ex pseries::collect(const symbol &s) const
 {
-       if (var.is_equal(s))
-               return convert_to_poly();
-       else
-               return inherited::collect(s);
+       return *this;
 }
 
+/** Evaluate coefficients. */
 ex pseries::eval(int level) const
 {
     if (level == 1)
         return this->hold();
+
+       if (level == -max_recursion_level)
+               throw (std::runtime_error("pseries::eval(): recursion limit exceeded"));
     
     // Construct a new series with evaluated coefficients
     epvector new_seq;
@@ -294,10 +295,24 @@ ex pseries::eval(int level) const
     return (new pseries(var, point, new_seq))->setflag(status_flags::dynallocated | status_flags::evaluated);
 }
 
-/** Evaluate numerically.  The order term is dropped. */
+/** Evaluate coefficients numerically. */
 ex pseries::evalf(int level) const
 {
-    return convert_to_poly().evalf(level);
+       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++;
+    }
+    return (new pseries(var, point, new_seq))->setflag(status_flags::dynallocated | status_flags::evaluated);
 }
 
 ex pseries::subs(const lst & ls, const lst & lr) const
@@ -748,7 +763,13 @@ ex pseries::series(const symbol & s, const ex & p, int order) const
 ex ex::series(const symbol &s, const ex &point, int order) const
 {
     GINAC_ASSERT(bp!=0);
-    return bp->series(s, point, order);
+       ex e;
+       try {
+           e = bp->series(s, point, order);
+       } catch (exception &x) {
+               throw (std::logic_error(string("unable to compute series (") + x.what() + ")"));
+       }
+       return e;
 }