X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Fpseries.cpp;h=14488ba71c222b81e033379d51f61be66e94b062;hb=8405f067a0f0a0e17c7f42057ddc4bce76b10deb;hp=a8b820d46d073c28b81777de987a6cdf7cc4eb2e;hpb=9a36152ccc7a55b5b9d1229c4127104b047fb98a;p=ginac.git diff --git a/ginac/pseries.cpp b/ginac/pseries.cpp index a8b820d4..14488ba7 100644 --- a/ginac/pseries.cpp +++ b/ginac/pseries.cpp @@ -4,7 +4,7 @@ * methods for series expansion. */ /* - * GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany + * GiNaC Copyright (C) 1999-2006 Johannes Gutenberg University Mainz, Germany * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include @@ -33,6 +33,7 @@ #include "relational.h" #include "operators.h" #include "symbol.h" +#include "integral.h" #include "archive.h" #include "utils.h" @@ -50,7 +51,7 @@ GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(pseries, basic, * Default constructor */ -pseries::pseries() : inherited(TINFO_pseries) { } +pseries::pseries() : inherited(&pseries::tinfo_static) { } /* @@ -66,7 +67,7 @@ pseries::pseries() : inherited(TINFO_pseries) { } * @param rel_ expansion variable and point (must hold a relational) * @param ops_ vector of {coefficient, power} pairs (coefficient must not be zero) * @return newly constructed pseries */ -pseries::pseries(const ex &rel_, const epvector &ops_) : basic(TINFO_pseries), seq(ops_) +pseries::pseries(const ex &rel_, const epvector &ops_) : basic(&pseries::tinfo_static), seq(ops_) { GINAC_ASSERT(is_a(rel_)); GINAC_ASSERT(is_a(rel_.lhs())); @@ -266,6 +267,8 @@ ex pseries::op(size_t i) const if (i >= seq.size()) throw (std::out_of_range("op() out of range")); + if (is_order_function(seq[i].rest)) + return Order(power(var-point, seq[i].coeff)); return seq[i].rest * power(var - point, seq[i].coeff); } @@ -409,21 +412,78 @@ ex pseries::evalf(int level) const ex pseries::conjugate() const { + if(!var.info(info_flags::real)) + return conjugate_function(*this).hold(); + epvector * newseq = conjugateepvector(seq); - ex newvar = var.conjugate(); ex newpoint = point.conjugate(); - if (!newseq && are_ex_trivially_equal(newvar, var) && are_ex_trivially_equal(point, newpoint)) { + if (!newseq && are_ex_trivially_equal(point, newpoint)) { return *this; } - ex result = (new pseries(newvar==newpoint, newseq ? *newseq : seq))->setflag(status_flags::dynallocated); + ex result = (new pseries(var==newpoint, newseq ? *newseq : seq))->setflag(status_flags::dynallocated); if (newseq) { delete newseq; } return result; } +ex pseries::real_part() const +{ + if(!var.info(info_flags::real)) + return real_part_function(*this).hold(); + ex newpoint = point.real_part(); + if(newpoint != point) + return real_part_function(*this).hold(); + + epvector v; + v.reserve(seq.size()); + for(epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) + v.push_back(expair((i->rest).real_part(), i->coeff)); + return (new pseries(var==point, v))->setflag(status_flags::dynallocated); +} + +ex pseries::imag_part() const +{ + if(!var.info(info_flags::real)) + return imag_part_function(*this).hold(); + ex newpoint = point.real_part(); + if(newpoint != point) + return imag_part_function(*this).hold(); + + epvector v; + v.reserve(seq.size()); + for(epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) + v.push_back(expair((i->rest).imag_part(), i->coeff)); + return (new pseries(var==point, v))->setflag(status_flags::dynallocated); +} + +ex pseries::eval_integ() const +{ + epvector *newseq = NULL; + for (epvector::const_iterator i=seq.begin(); i!=seq.end(); ++i) { + if (newseq) { + newseq->push_back(expair(i->rest.eval_integ(), i->coeff)); + continue; + } + ex newterm = i->rest.eval_integ(); + if (!are_ex_trivially_equal(newterm, i->rest)) { + newseq = new epvector; + newseq->reserve(seq.size()); + for (epvector::const_iterator j=seq.begin(); j!=i; ++j) + newseq->push_back(*j); + newseq->push_back(expair(newterm, i->coeff)); + } + } + + ex newpoint = point.eval_integ(); + if (newseq || !are_ex_trivially_equal(newpoint, point)) + return (new pseries(var==newpoint, *newseq)) + ->setflag(status_flags::dynallocated); + return *this; +} + ex pseries::subs(const exmap & m, unsigned options) const { // If expansion variable is being substituted, convert the series to a @@ -519,6 +579,20 @@ bool pseries::is_terminating() const return seq.empty() || !is_order_function((seq.end()-1)->rest); } +ex pseries::coeffop(size_t i) const +{ + if (i >=nops()) + throw (std::out_of_range("coeffop() out of range")); + return seq[i].rest; +} + +ex pseries::exponop(size_t i) const +{ + if (i >= nops()) + throw (std::out_of_range("exponop() out of range")); + return seq[i].coeff; +} + /* * Implementations of series expansion @@ -729,6 +803,11 @@ ex pseries::mul_series(const pseries &other) const nul.push_back(expair(Order(_ex1), _ex0)); return pseries(relational(var,point), nul); } + + if (seq.empty() || other.seq.empty()) { + return (new pseries(var==point, epvector())) + ->setflag(status_flags::dynallocated); + } // Series multiplication epvector new_seq; @@ -798,8 +877,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 +892,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 +906,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(op); else acc = ex_to(acc.mul_series(ex_to(op))); @@ -881,7 +959,14 @@ ex pseries::power_const(const numeric &p, int deg) const throw std::runtime_error("pseries::power_const(): trying to assemble a Puiseux series"); // adjust number of coefficients - deg = deg - p.to_int()*ldeg; + int numcoeff = deg - (p*ldeg).to_int(); + if (numcoeff <= 0) { + epvector epv; + epv.reserve(1); + epv.push_back(expair(Order(_ex1), deg)); + return (new pseries(relational(var,point), epv)) + ->setflag(status_flags::dynallocated); + } // O(x^n)^(-m) is undefined if (seq.size() == 1 && is_order_function(seq[0].rest) && p.real().is_negative()) @@ -889,9 +974,9 @@ ex pseries::power_const(const numeric &p, int deg) const // Compute coefficients of the powered series exvector co; - co.reserve(deg); + co.reserve(numcoeff); co.push_back(power(coeff(var, ldeg), p)); - for (int i=1; i(basis)) + if (!must_expand_basis && !exponent.info(info_flags::negint) + && (!is_a(basis) || !is_a(exponent))) return basic::series(r, order, options); // Is the expression of type 0^something? - if (!must_expand_basis && !basis.subs(r, subs_options::no_pattern).is_zero()) + if (!must_expand_basis && !basis.subs(r, subs_options::no_pattern).is_zero() + && (!is_a(basis) || !is_a(exponent))) return basic::series(r, order, options); // Singularity encountered, is the basis equal to (var - point)? @@ -972,7 +1059,12 @@ ex power::series(const relational & r, int order, unsigned options) const // No, expand basis into series - int intexp = ex_to(exponent).to_int(); + numeric numexp; + if (is_a(exponent)) { + numexp = ex_to(exponent); + } else { + numexp = 0; + } const ex& sym = r.lhs(); // find existing minimal degree int real_ldegree = basis.expand().ldegree(sym-r.rhs()); @@ -984,13 +1076,14 @@ ex power::series(const relational & r, int order, unsigned options) const } while (real_ldegree == orderloop); } - ex e = basis.series(r, order + real_ldegree*(1-intexp), options); + if (!(real_ldegree*numexp).is_integer()) + throw std::runtime_error("pseries::power_const(): trying to assemble a Puiseux series"); + ex e = basis.series(r, (order + real_ldegree*(1-numexp)).to_int(), options); ex result; try { - result = ex_to(e).power_const(intexp, order); - } - catch (pole_error) { + result = ex_to(e).power_const(numexp, order); + } catch (pole_error) { epvector ser; ser.push_back(expair(Order(_ex1), order)); result = pseries(r, ser); @@ -1028,6 +1121,61 @@ ex pseries::series(const relational & r, int order, unsigned options) const return convert_to_poly().series(r, order, options); } +ex integral::series(const relational & r, int order, unsigned options) const +{ + if (x.subs(r) != x) + throw std::logic_error("Cannot series expand wrt dummy variable"); + + // Expanding integrant with r substituted taken in boundaries. + ex fseries = f.series(r, order, options); + epvector fexpansion; + fexpansion.reserve(fseries.nops()); + for (size_t i=0; i(fseries).coeffop(i); + currcoeff = (currcoeff == Order(_ex1)) + ? currcoeff + : integral(x, a.subs(r), b.subs(r), currcoeff); + if (currcoeff != 0) + fexpansion.push_back( + expair(currcoeff, ex_to(fseries).exponop(i))); + } + + // Expanding lower boundary + ex result = (new pseries(r, fexpansion))->setflag(status_flags::dynallocated); + ex aseries = (a-a.subs(r)).series(r, order, options); + fseries = f.series(x == (a.subs(r)), order, options); + for (size_t i=0; i(fseries).coeffop(i); + if (is_order_function(currcoeff)) + break; + ex currexpon = ex_to(fseries).exponop(i); + int orderforf = order-ex_to(currexpon).to_int()-1; + currcoeff = currcoeff.series(r, orderforf); + ex term = ex_to(aseries).power_const(ex_to(currexpon+1),order); + term = ex_to(term).mul_const(ex_to(-1/(currexpon+1))); + term = ex_to(term).mul_series(ex_to(currcoeff)); + result = ex_to(result).add_series(ex_to(term)); + } + + // Expanding upper boundary + ex bseries = (b-b.subs(r)).series(r, order, options); + fseries = f.series(x == (b.subs(r)), order, options); + for (size_t i=0; i(fseries).coeffop(i); + if (is_order_function(currcoeff)) + break; + ex currexpon = ex_to(fseries).exponop(i); + int orderforf = order-ex_to(currexpon).to_int()-1; + currcoeff = currcoeff.series(r, orderforf); + ex term = ex_to(bseries).power_const(ex_to(currexpon+1),order); + term = ex_to(term).mul_const(ex_to(1/(currexpon+1))); + term = ex_to(term).mul_series(ex_to(currcoeff)); + result = ex_to(result).add_series(ex_to(term)); + } + + return result; +} + /** Compute the truncated series expansion of an expression. * This function returns an expression containing an object of class pseries