Re-modifications for the old order-parameter conventions

diff --git a/check/exam_pseries.cpp b/check/exam_pseries.cpp
index ab2bfa690e6c7623e5b1672349fc7643cc39d157..0bffc11950a79114a2ccab163be956516f53949e 100644 (file)
--- a/check/exam_pseries.cpp
+++ b/check/exam_pseries.cpp
@@ -47,19 +47,19 @@ static unsigned exam_series1(void)
        ex e, d;
        
        e = sin(x);
-       d = x - pow(x, 3) / 6 + pow(x, 5) / 120 - pow(x, 7) / 5040 + Order(pow(x, 9));
+       d = x - pow(x, 3) / 6 + pow(x, 5) / 120 - pow(x, 7) / 5040 + Order(pow(x, 8));
        result += check_series(e, 0, d);
        
        e = cos(x);
-       d = 1 - pow(x, 2) / 2 + pow(x, 4) / 24 - pow(x, 6) / 720 + pow(x, 8) / 40320 + Order(pow(x, 10));
+       d = 1 - pow(x, 2) / 2 + pow(x, 4) / 24 - pow(x, 6) / 720 + Order(pow(x, 8));
        result += check_series(e, 0, d);
        
        e = exp(x);
-       d = 1 + x + pow(x, 2) / 2 + pow(x, 3) / 6 + pow(x, 4) / 24 + pow(x, 5) / 120 + pow(x, 6) / 720 + pow(x, 7) / 5040 + pow(x, 8) / 40320 + Order(pow(x, 9));
+       d = 1 + x + pow(x, 2) / 2 + pow(x, 3) / 6 + pow(x, 4) / 24 + pow(x, 5) / 120 + pow(x, 6) / 720 + pow(x, 7) / 5040 + Order(pow(x, 8));
        result += check_series(e, 0, d);
        
        e = pow(1 - x, -1);
-       d = 1 + x + pow(x, 2) + pow(x, 3) + pow(x, 4) + pow(x, 5) + pow(x, 6) + pow(x, 7) + pow(x, 8) + Order(pow(x, 9));
+       d = 1 + x + pow(x, 2) + pow(x, 3) + pow(x, 4) + pow(x, 5) + pow(x, 6) + pow(x, 7) + Order(pow(x, 8));
        result += check_series(e, 0, d);
        
        e = x + pow(x, -1);
@@ -67,37 +67,37 @@ static unsigned exam_series1(void)
        result += check_series(e, 0, d);
        
        e = x + pow(x, -1);
-       d = 2 + pow(x-1, 2) - pow(x-1, 3) + pow(x-1, 4) - pow(x-1, 5) + pow(x-1, 6) - pow(x-1, 7) + pow(x-1, 8) + Order(pow(x-1, 9));
+       d = 2 + pow(x-1, 2) - pow(x-1, 3) + pow(x-1, 4) - pow(x-1, 5) + pow(x-1, 6) - pow(x-1, 7) + Order(pow(x-1, 8));
        result += check_series(e, 1, d);
        
        e = pow(x + pow(x, 3), -1);
-       d = pow(x, -1) - x + pow(x, 3) - pow(x, 5) + pow(x, 7) + Order(pow(x, 9));
+       d = pow(x, -1) - x + pow(x, 3) - pow(x, 5) + pow(x, 7) + Order(pow(x, 8));
        result += check_series(e, 0, d);
        
        e = pow(pow(x, 2) + pow(x, 4), -1);
-       d = pow(x, -2) - 1 + pow(x, 2) - pow(x, 4) + pow(x, 6) - pow(x, 8) + Order(pow(x, 9));
+       d = pow(x, -2) - 1 + pow(x, 2) - pow(x, 4) + pow(x, 6) + Order(pow(x, 8));
        result += check_series(e, 0, d);
        
        e = pow(sin(x), -2);
-       d = pow(x, -2) + numeric(1,3) + pow(x, 2) / 15 + pow(x, 4) * 2/189 + pow(x, 6) / 675  + pow(x, 8) * 2/10395 + Order(pow(x, 9));
+       d = pow(x, -2) + numeric(1,3) + pow(x, 2) / 15 + pow(x, 4) * 2/189 + pow(x, 6) / 675  + Order(pow(x, 8));
        result += check_series(e, 0, d);
        
        e = sin(x) / cos(x);
-       d = x + pow(x, 3) / 3 + pow(x, 5) * 2/15 + pow(x, 7) * 17/315 + Order(pow(x, 9));
+       d = x + pow(x, 3) / 3 + pow(x, 5) * 2/15 + pow(x, 7) * 17/315 + Order(pow(x, 8));
        result += check_series(e, 0, d);
        
        e = cos(x) / sin(x);
-       d = pow(x, -1) - x / 3 - pow(x, 3) / 45 - pow(x, 5) * 2/945 - pow(x, 7) / 4725 + Order(pow(x, 9));
+       d = pow(x, -1) - x / 3 - pow(x, 3) / 45 - pow(x, 5) * 2/945 - pow(x, 7) / 4725 + Order(pow(x, 8));
        result += check_series(e, 0, d);
        
        e = pow(numeric(2), x);
        ex t = log(2) * x;
-       d = 1 + t + pow(t, 2) / 2 + pow(t, 3) / 6 + pow(t, 4) / 24 + pow(t, 5) / 120 + pow(t, 6) / 720 + pow(t, 7) / 5040 + pow(t, 8) / 40320 + Order(pow(x, 9));
+       d = 1 + t + pow(t, 2) / 2 + pow(t, 3) / 6 + pow(t, 4) / 24 + pow(t, 5) / 120 + pow(t, 6) / 720 + pow(t, 7) / 5040 + Order(pow(x, 8));
        result += check_series(e, 0, d.expand());
        
        e = pow(Pi, x);
        t = log(Pi) * x;
-       d = 1 + t + pow(t, 2) / 2 + pow(t, 3) / 6 + pow(t, 4) / 24 + pow(t, 5) / 120 + pow(t, 6) / 720 + pow(t, 7) / 5040 + pow(t, 8) / 40320 + Order(pow(x, 9));
+       d = 1 + t + pow(t, 2) / 2 + pow(t, 3) / 6 + pow(t, 4) / 24 + pow(t, 5) / 120 + pow(t, 6) / 720 + pow(t, 7) / 5040 + Order(pow(x, 8));
        result += check_series(e, 0, d.expand());
        
        e = log(x);
@@ -115,7 +115,7 @@ static unsigned exam_series2(void)
        ex e, d;
        
        e = pow(sin(x), -1).series(x==0, 8) + pow(sin(-x), -1).series(x==0, 12);
-       d = Order(pow(x, 9));
+       d = Order(pow(x, 8));
        result += check_series(e, 0, d);
        
        return result;
@@ -128,7 +128,7 @@ static unsigned exam_series3(void)
        ex e, d;
        
        e = sin(x).series(x==0, 8) * pow(sin(x), -1).series(x==0, 12);
-       d = 1 + Order(pow(x, 8));
+       d = 1 + Order(pow(x, 7));
        result += check_series(e, 0, d);
        
        return result;
@@ -141,10 +141,10 @@ static unsigned exam_series4(void)
        ex e, d;
        
        e = pow((2*cos(x)).series(x==0, 5), 2).series(x==0, 5);
-       d = 4 - 4*pow(x, 2) + 4*pow(x, 4)/3 + Order(pow(x, 6));
+       d = 4 - 4*pow(x, 2) + 4*pow(x, 4)/3 + Order(pow(x, 5));
        result += check_series(e, 0, d);
        
-       e = pow(tgamma(x), 2).series(x==0, 1);
+       e = pow(tgamma(x), 2).series(x==0, 2);
        d = pow(x,-2) - 2*Euler/x + (pow(Pi,2)/6+2*pow(Euler,2)) 
                + x*(-4*pow(Euler, 3)/3 -pow(Pi,2)*Euler/3 - 2*zeta(3)/3) + Order(pow(x, 2));
        result += check_series(e, 0, d);
@@ -163,9 +163,9 @@ static unsigned exam_series5(void)
        result += check_series(e, 0, d, 0);
        d = 1 + Order(x);
        result += check_series(e, 0, d, 1);
-       d = 1 + x + pow(x, 2) + Order(pow(x, 3));
+       d = 1 + x + Order(pow(x, 2));
        result += check_series(e, 0, d, 2);
-       d = 1 + x + pow(x, 2) + pow(x, 3);
+       d = 1 + x + pow(x, 2) + Order(pow(x, 3));
        result += check_series(e, 0, d, 3);
        d = 1 + x + pow(x, 2) + pow(x, 3);
        result += check_series(e, 0, d, 4);
@@ -201,7 +201,7 @@ static unsigned exam_series6(void)
                           numeric(1,40)*pow(Pi,4) +
                           numeric(4,3)*zeta(3)*Euler) +
               Order(pow(x+1,4));
-       return check_series(e, -1, d, 3);
+       return check_series(e, -1, d, 4);
 }
        
 // Series expansion of tan(x==Pi/2)
@@ -211,15 +211,15 @@ static unsigned exam_series7(void)
        ex d = pow(x-1,-1)/Pi*(-2) + pow(x-1,1)*Pi/6 + pow(x-1,3)*pow(Pi,3)/360
              +pow(x-1,5)*pow(Pi,5)/15120 + pow(x-1,7)*pow(Pi,7)/604800
              +Order(pow(x-1,9));
-       return check_series(e,1,d,8);
+       return check_series(e,1,d,9);
 }
 
 // Series expansion of log(sin(x==0))
 static unsigned exam_series8(void)
 {
        ex e = log(sin(x));
-       ex d = log(x) - pow(x,2)/6 - pow(x,4)/180 - pow(x,6)/2835 - pow(x,8)/37800 + Order(pow(x,10));
-       return check_series(e,0,d,8);
+       ex d = log(x) - pow(x,2)/6 - pow(x,4)/180 - pow(x,6)/2835 - pow(x,8)/37800 + Order(pow(x,9));
+       return check_series(e,0,d,9);
 }
 
 // Series expansion of Li2(sin(x==0))
@@ -243,7 +243,7 @@ static unsigned exam_series10(void)
               + (numeric(11,27) - log(3)/12 + I*Pi/12*csgn(I-I*pow(x,2))) * pow(x-2,3)
               + (numeric(-155,648) + log(3)/32 - I*Pi/32*csgn(I-I*pow(x,2))) * pow(x-2,4)
               + Order(pow(x-2,5));
-       return check_series(e,2,d,4);
+       return check_series(e,2,d,5);
 }
 
 // Series expansion of logarithms around branch points
@@ -283,7 +283,7 @@ static unsigned exam_series11(void)
        
        e = log((1-x)/x);
        d = log(1-x) - (x-1) + pow(x-1,2)/2 - pow(x-1,3)/3  + pow(x-1,4)/4 + Order(pow(x-1,5));
-       result += check_series(e,1,d,4);
+       result += check_series(e,1,d,5);
        
        return result;
 }
@@ -300,18 +300,18 @@ static unsigned exam_series12(void)
        // takes into account that by assumption |x|<1.
        e = atan(x);
        d = (I*log(2)/2-I*log(1+I*x)/2) + (x-I)/4 + I*pow(x-I,2)/16 + Order(pow(x-I,3));
-       result += check_series(e,I,d,2);
+       result += check_series(e,I,d,3);
        
        // NB: here, at -I, Mathematica disagrees, but it is wrong -- they
        // pick up a complex phase by incorrectly expanding logarithms.
        e = atan(x);
        d = (-I*log(2)/2+I*log(1-I*x)/2) + (x+I)/4 - I*pow(x+I,2)/16 + Order(pow(x+I,3));
-       result += check_series(e,-I,d,2);
+       result += check_series(e,-I,d,3);
        
        // This is basically the same as above, the branch point is at +/-1:
        e = atanh(x);
        d = (-log(2)/2+log(x+1)/2) + (x+1)/4 + pow(x+1,2)/16 + Order(pow(x+1,3));
-       result += check_series(e,-1,d,2);
+       result += check_series(e,-1,d,3);
        
        return result;
 }

diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp
index d622ecc20f6c442c2576bc6836073be7bac27f41..6c4b4ee02754075737a31a39adedbdfbc322c143 100644 (file)
--- a/ginac/pseries.cpp
+++ b/ginac/pseries.cpp
@@ -520,7 +520,7 @@ ex basic::series(const relational & r, int order, unsigned options) const
                seq.push_back(expair(coeff, _ex0));
        
        int n;
-       for (n=1; n<=order; ++n) {
+       for (n=1; n<order; ++n) {
                fac = fac.mul(n);
                // We need to test for zero in order to see if the series terminates.
                // The problem is that there is no such thing as a perfect test for
@@ -535,33 +535,9 @@ ex basic::series(const relational & r, int order, unsigned options) const
        }
        
        // Higher-order terms, if present
-       int ldeg;
-       try {
-               ldeg = std::abs(deriv.ldegree(s));
-       }
-       catch (std::runtime_error) {
-               ldeg = 0;
-       }
-       if (ldeg != 0) {
-               // pure polynomial
-               if (!deriv.subs(r, subs_options::no_pattern).is_zero()) {
-                       seq.push_back(expair(Order(_ex1), n));
-               } else {
-               seq.push_back(expair(Order(_ex1), n+ldeg-1));
-               }
-       } else {
-               // something more complicated -> loop until next coefficient is found
-               for (;; ++n) {
-                       deriv = deriv.diff(s).expand();
-                       if (deriv.is_zero()) {
-                               break;
-                       }
-                       if (!deriv.subs(r, subs_options::no_pattern).is_zero()) {
-                               seq.push_back(expair(Order(_ex1), n));
-                               break;
-                       }
-               }
-       }
+       deriv = deriv.diff(s);
+       if (!deriv.expand().is_zero())
+               seq.push_back(expair(Order(_ex1), n));
        
        return pseries(r, seq);
 }
@@ -882,7 +858,7 @@ ex pseries::power_const(const numeric &p, int deg) const
        co.reserve(deg);
        co.push_back(power(coeff(var, ldeg), p));
        bool all_sums_zero = true;
-       for (int i=1; i<=deg; ++i) {
+       for (int i=1; i<deg; ++i) {
                ex sum = _ex0;
                for (int j=1; j<=i; ++j) {
                        ex c = coeff(var, j + ldeg);
@@ -900,7 +876,7 @@ ex pseries::power_const(const numeric &p, int deg) const
        // Construct new series (of non-zero coefficients)
        epvector new_seq;
        bool higher_order = false;
-       for (int i=0; i<=deg; ++i) {
+       for (int i=0; i<deg; ++i) {
                if (!co[i].is_zero())
                        new_seq.push_back(expair(co[i], p * ldeg + i));
                if (is_order_function(co[i])) {
@@ -909,7 +885,7 @@ ex pseries::power_const(const numeric &p, int deg) const
                }
        }
        if (!higher_order && !all_sums_zero)
-               new_seq.push_back(expair(Order(_ex1), p * ldeg + deg + 1));
+               new_seq.push_back(expair(Order(_ex1), p * ldeg + deg));
 
        return pseries(relational(var,point), new_seq);
 }