Fix bug in mul::series() about asymptotic order term.

This reverts db81420a6195 and adds a test case.

Thanks to Feng Feng for reporting this.

diff --git a/check/exam_pseries.cpp b/check/exam_pseries.cpp
index 3752a1f1068224b0096150ef244cfd8abf92f8ef..e59026c494384a0124d203962c19d1310c77c308 100644 (file)
--- a/check/exam_pseries.cpp
+++ b/check/exam_pseries.cpp
@@ -141,6 +141,10 @@ static unsigned exam_series1()
        d = pow(a, b) + (pow(a, b)*b/a)*x + (pow(a, b)*b*b/a/a/2 - pow(a, b)*b/a/a/2)*pow(x, 2) + Order(pow(x, 3));
        result += check_series(e, 0, d, 3);
 
        d = pow(a, b) + (pow(a, b)*b/a)*x + (pow(a, b)*b*b/a/a/2 - pow(a, b)*b/a/a/2)*pow(x, 2) + Order(pow(x, 3));
        result += check_series(e, 0, d, 3);
 

+       e = a * (1 / (x * sin(x)) - sin(x) / x);
+       d = a * pow(x, -2) + Order(pow(x, -1));
+       result += check_series(e, 0, d, -1);
+

        return result;
 }
 
        return result;
 }
 

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index e7462206ec95d36c35c9f5078811271b73bfc5cb..4dba512951ca60c36c66a51e78e98e2bd311d256 100644 (file)
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -959,9 +959,8 @@ ex mul::series(const relational & r, int order, unsigned options) const
 
        int degsum = std::accumulate(ldegrees.begin(), ldegrees.end(), 0);
 
 
        int degsum = std::accumulate(ldegrees.begin(), ldegrees.end(), 0);
 

-       if (degsum >= order) {
-               epvector epv { expair(Order(_ex1), order) };
-               return dynallocate<pseries>(r, std::move(epv));
+       if (degsum > order) {
+               return dynallocate<pseries>(r, epvector{{Order(_ex1), order}});

        }
 
        // Multiply with remaining terms
        }
 
        // Multiply with remaining terms