]> www.ginac.de Git - ginac.git/commitdiff
Synced log-fix to 1.1 ginac_1-1
authorJens Vollinga <vollinga@thep.physik.uni-mainz.de>
Mon, 19 Apr 2004 16:12:30 +0000 (16:12 +0000)
committerJens Vollinga <vollinga@thep.physik.uni-mainz.de>
Mon, 19 Apr 2004 16:12:30 +0000 (16:12 +0000)
ginac/inifcns_trans.cpp

index 070fdc153b3bbb53a232301cd57bc6b10dba8a19..72d18154b747bd16f3b502aa7357299dc8293faf 100644 (file)
@@ -193,7 +193,6 @@ static ex log_series(const ex &arg,
                if (!argser.is_terminating() || argser.nops()!=1) {
                        // in this case n more (or less) terms are needed
                        // (sadly, to generate them, we have to start from the beginning)
-                       const ex newarg = ex_to<pseries>((arg/coeff).series(rel, order+n, options)).shift_exponents(-n).convert_to_poly(true);
                        if (n == 0 && coeff == 1) {
                                epvector epv;
                                ex acc = (new pseries(rel, epv))->setflag(status_flags::dynallocated);
@@ -210,6 +209,7 @@ static ex log_series(const ex &arg,
                                }
                                return acc;
                        }
+                       const ex newarg = ex_to<pseries>((arg/coeff).series(rel, order+n, options)).shift_exponents(-n).convert_to_poly(true);
                        return pseries(rel, seq).add_series(ex_to<pseries>(log(newarg).series(rel, order, options)));
                } else  // it was a monomial
                        return pseries(rel, seq);