* methods for series expansion. */
/*
- * GiNaC Copyright (C) 1999-2004 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2015 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
*
* 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 <numeric>
-#include <stdexcept>
-
#include "pseries.h"
#include "add.h"
#include "inifcns.h" // for Order function
#include "relational.h"
#include "operators.h"
#include "symbol.h"
+#include "integral.h"
#include "archive.h"
#include "utils.h"
+#include <limits>
+#include <numeric>
+#include <stdexcept>
+
namespace GiNaC {
GINAC_IMPLEMENT_REGISTERED_CLASS_OPT(pseries, basic,
* Default constructor
*/
-pseries::pseries() : inherited(TINFO_pseries) { }
+pseries::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_)
+ : seq(ops_)
+{
+ GINAC_ASSERT(is_a<relational>(rel_));
+ GINAC_ASSERT(is_a<symbol>(rel_.lhs()));
+ point = rel_.rhs();
+ var = rel_.lhs();
+}
+pseries::pseries(const ex &rel_, epvector &&ops_)
+ : seq(std::move(ops_))
{
GINAC_ASSERT(is_a<relational>(rel_));
GINAC_ASSERT(is_a<symbol>(rel_.lhs()));
* Archiving
*/
-pseries::pseries(const archive_node &n, lst &sym_lst) : inherited(n, sym_lst)
+void pseries::read_archive(const archive_node &n, lst &sym_lst)
{
- for (unsigned int i=0; true; ++i) {
+ inherited::read_archive(n, sym_lst);
+ auto first = n.find_first("coeff");
+ auto last = n.find_last("power");
+ ++last;
+ seq.reserve((last-first)/2);
+
+ for (auto loc = first; loc < last;) {
ex rest;
ex coeff;
- if (n.find_ex("coeff", rest, sym_lst, i) && n.find_ex("power", coeff, sym_lst, i))
- seq.push_back(expair(rest, coeff));
- else
- break;
+ n.find_ex_by_loc(loc++, rest, sym_lst);
+ n.find_ex_by_loc(loc++, coeff, sym_lst);
+ seq.push_back(expair(rest, coeff));
}
+
n.find_ex("var", var, sym_lst);
n.find_ex("point", point, sym_lst);
}
void pseries::archive(archive_node &n) const
{
inherited::archive(n);
- epvector::const_iterator i = seq.begin(), iend = seq.end();
- while (i != iend) {
- n.add_ex("coeff", i->rest);
- n.add_ex("power", i->coeff);
- ++i;
+ for (auto & it : seq) {
+ n.add_ex("coeff", it.rest);
+ n.add_ex("power", it.coeff);
}
n.add_ex("var", var);
n.add_ex("point", point);
}
-DEFAULT_UNARCHIVE(pseries)
//////////
// functions overriding virtual functions from base classes
if (seq.empty())
c.s << '0';
- epvector::const_iterator i = seq.begin(), end = seq.end();
+ auto i = seq.begin(), end = seq.end();
while (i != end) {
// print a sign, if needed
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);
}
epvector::const_iterator it = seq.begin(), itend = seq.end();
if (it == itend)
return 0;
- int max_pow = INT_MIN;
+ int max_pow = std::numeric_limits<int>::min();
while (it != itend) {
int pow = it->rest.degree(s);
if (pow > max_pow)
epvector::const_iterator it = seq.begin(), itend = seq.end();
if (it == itend)
return 0;
- int min_pow = INT_MAX;
+ int min_pow = std::numeric_limits<int>::max();
while (it != itend) {
int pow = it->rest.ldegree(s);
if (pow < min_pow)
new_seq.push_back(expair(it->rest.eval(level-1), it->coeff));
++it;
}
- return (new pseries(relational(var,point), new_seq))->setflag(status_flags::dynallocated | status_flags::evaluated);
+ return (new pseries(relational(var,point), std::move(new_seq)))->setflag(status_flags::dynallocated | status_flags::evaluated);
}
/** Evaluate coefficients numerically. */
new_seq.push_back(expair(it->rest.evalf(level-1), it->coeff));
++it;
}
- return (new pseries(relational(var,point), new_seq))->setflag(status_flags::dynallocated | status_flags::evaluated);
+ return (new pseries(relational(var,point), std::move(new_seq)))->setflag(status_flags::dynallocated | status_flags::evaluated);
}
ex pseries::conjugate() const
{
- epvector * newseq = conjugateepvector(seq);
- ex newvar = var.conjugate();
+ if(!var.info(info_flags::real))
+ return conjugate_function(*this).hold();
+
+ std::unique_ptr<epvector> newseq(conjugateepvector(seq));
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);
- if (newseq) {
- delete newseq;
+ return (new pseries(var==newpoint, newseq ? std::move(*newseq) : seq))->setflag(status_flags::dynallocated);
+}
+
+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 (auto & it : seq)
+ v.push_back(expair((it.rest).real_part(), it.coeff));
+ return (new pseries(var==point, std::move(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 (auto & it : seq)
+ v.push_back(expair((it.rest).imag_part(), it.coeff));
+ return (new pseries(var==point, std::move(v)))->setflag(status_flags::dynallocated);
+}
+
+ex pseries::eval_integ() const
+{
+ std::unique_ptr<epvector> newseq(nullptr);
+ for (auto 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.reset(new epvector);
+ newseq->reserve(seq.size());
+ for (auto j=seq.begin(); j!=i; ++j)
+ newseq->push_back(*j);
+ newseq->push_back(expair(newterm, i->coeff));
+ }
}
- return result;
+
+ ex newpoint = point.eval_integ();
+ if (newseq || !are_ex_trivially_equal(newpoint, point))
+ return (new pseries(var==newpoint, std::move(*newseq)))
+ ->setflag(status_flags::dynallocated);
+ return *this;
+}
+
+ex pseries::evalm() const
+{
+ // evalm each coefficient
+ epvector newseq;
+ bool something_changed = false;
+ for (auto i=seq.begin(); i!=seq.end(); ++i) {
+ if (something_changed) {
+ ex newcoeff = i->rest.evalm();
+ if (!newcoeff.is_zero())
+ newseq.push_back(expair(newcoeff, i->coeff));
+ }
+ else {
+ ex newcoeff = i->rest.evalm();
+ if (!are_ex_trivially_equal(newcoeff, i->rest)) {
+ something_changed = true;
+ newseq.reserve(seq.size());
+ std::copy(seq.begin(), i, std::back_inserter<epvector>(newseq));
+ if (!newcoeff.is_zero())
+ newseq.push_back(expair(newcoeff, i->coeff));
+ }
+ }
+ }
+ if (something_changed)
+ return (new pseries(var==point, std::move(newseq)))->setflag(status_flags::dynallocated);
+ else
+ return *this;
}
ex pseries::subs(const exmap & m, unsigned options) const
// expansion point
epvector newseq;
newseq.reserve(seq.size());
- epvector::const_iterator it = seq.begin(), itend = seq.end();
- while (it != itend) {
- newseq.push_back(expair(it->rest.subs(m, options), it->coeff));
- ++it;
- }
- return (new pseries(relational(var,point.subs(m, options)), newseq))->setflag(status_flags::dynallocated);
+ for (auto & it : seq)
+ newseq.push_back(expair(it.rest.subs(m, options), it.coeff));
+ return (new pseries(relational(var,point.subs(m, options)), std::move(newseq)))->setflag(status_flags::dynallocated);
}
/** Implementation of ex::expand() for a power series. It expands all the
ex pseries::expand(unsigned options) const
{
epvector newseq;
- epvector::const_iterator i = seq.begin(), end = seq.end();
- while (i != end) {
- ex restexp = i->rest.expand();
+ for (auto & it : seq) {
+ ex restexp = it.rest.expand();
if (!restexp.is_zero())
- newseq.push_back(expair(restexp, i->coeff));
- ++i;
+ newseq.push_back(expair(restexp, it.coeff));
}
- return (new pseries(relational(var,point), newseq))
+ return (new pseries(relational(var,point), std::move(newseq)))
->setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0));
}
ex pseries::derivative(const symbol & s) const
{
epvector new_seq;
- epvector::const_iterator it = seq.begin(), itend = seq.end();
if (s == var) {
// FIXME: coeff might depend on var
- while (it != itend) {
- if (is_order_function(it->rest)) {
- new_seq.push_back(expair(it->rest, it->coeff - 1));
+ for (auto & it : seq) {
+ if (is_order_function(it.rest)) {
+ new_seq.push_back(expair(it.rest, it.coeff - 1));
} else {
- ex c = it->rest * it->coeff;
+ ex c = it.rest * it.coeff;
if (!c.is_zero())
- new_seq.push_back(expair(c, it->coeff - 1));
+ new_seq.push_back(expair(c, it.coeff - 1));
}
- ++it;
}
} else {
- while (it != itend) {
- if (is_order_function(it->rest)) {
- new_seq.push_back(*it);
+ for (auto & it : seq) {
+ if (is_order_function(it.rest)) {
+ new_seq.push_back(it);
} else {
- ex c = it->rest.diff(s);
+ ex c = it.rest.diff(s);
if (!c.is_zero())
- new_seq.push_back(expair(c, it->coeff));
+ new_seq.push_back(expair(c, it.coeff));
}
- ++it;
}
}
- return pseries(relational(var,point), new_seq);
+ return pseries(relational(var,point), std::move(new_seq));
}
ex pseries::convert_to_poly(bool no_order) const
{
ex e;
- epvector::const_iterator it = seq.begin(), itend = seq.end();
-
- while (it != itend) {
- if (is_order_function(it->rest)) {
+ for (auto & it : seq) {
+ if (is_order_function(it.rest)) {
if (!no_order)
- e += Order(power(var - point, it->coeff));
+ e += Order(power(var - point, it.coeff));
} else
- e += it->rest * power(var - point, it->coeff);
- ++it;
+ e += it.rest * power(var - point, it.coeff);
}
return e;
}
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
// default for order-values that make no sense for Taylor expansion
if ((order <= 0) && this->has(s)) {
seq.push_back(expair(Order(_ex1), order));
- return pseries(r, seq);
+ return pseries(r, std::move(seq));
}
// do Taylor expansion
// zero. Expanding the term occasionally helps a little...
deriv = deriv.diff(s).expand();
if (deriv.is_zero()) // Series terminates
- return pseries(r, seq);
+ return pseries(r, std::move(seq));
coeff = deriv.subs(r, subs_options::no_pattern);
if (!coeff.is_zero())
deriv = deriv.diff(s);
if (!deriv.expand().is_zero())
seq.push_back(expair(Order(_ex1), n));
- return pseries(r, seq);
+ return pseries(r, std::move(seq));
}
seq.push_back(expair(Order(_ex1), numeric(order)));
} else
seq.push_back(expair(*this, _ex0));
- return pseries(r, seq);
+ return pseries(r, std::move(seq));
}
// Adding two series with different variables or expansion points
// results in an empty (constant) series
if (!is_compatible_to(other)) {
- epvector nul;
- nul.push_back(expair(Order(_ex1), _ex0));
- return pseries(relational(var,point), nul);
+ epvector nul { expair(Order(_ex1), _ex0) };
+ return pseries(relational(var,point), std::move(nul));
}
// Series addition
epvector new_seq;
- epvector::const_iterator a = seq.begin();
- epvector::const_iterator b = other.seq.begin();
- epvector::const_iterator a_end = seq.end();
- epvector::const_iterator b_end = other.seq.end();
- int pow_a = INT_MAX, pow_b = INT_MAX;
+ auto a = seq.begin(), a_end = seq.end();
+ auto b = other.seq.begin(), b_end = other.seq.end();
+ int pow_a = std::numeric_limits<int>::max(), pow_b = std::numeric_limits<int>::max();
for (;;) {
// If a is empty, fill up with elements from b and stop
if (a == a_end) {
}
}
}
- return pseries(relational(var,point), new_seq);
+ return pseries(relational(var,point), std::move(new_seq));
}
acc = overall_coeff.series(r, order, options);
// Add remaining terms
- epvector::const_iterator it = seq.begin();
- epvector::const_iterator itend = seq.end();
- for (; it!=itend; ++it) {
+ for (auto & it : seq) {
ex op;
- if (is_exactly_a<pseries>(it->rest))
- op = it->rest;
+ if (is_exactly_a<pseries>(it.rest))
+ op = it.rest;
else
- op = it->rest.series(r, order, options);
- if (!it->coeff.is_equal(_ex1))
- op = ex_to<pseries>(op).mul_const(ex_to<numeric>(it->coeff));
+ op = it.rest.series(r, order, options);
+ if (!it.coeff.is_equal(_ex1))
+ op = ex_to<pseries>(op).mul_const(ex_to<numeric>(it.coeff));
// Series addition
acc = ex_to<pseries>(acc).add_series(ex_to<pseries>(op));
epvector new_seq;
new_seq.reserve(seq.size());
- epvector::const_iterator it = seq.begin(), itend = seq.end();
- while (it != itend) {
- if (!is_order_function(it->rest))
- new_seq.push_back(expair(it->rest * other, it->coeff));
+ for (auto & it : seq) {
+ if (!is_order_function(it.rest))
+ new_seq.push_back(expair(it.rest * other, it.coeff));
else
- new_seq.push_back(*it);
- ++it;
+ new_seq.push_back(it);
}
- return pseries(relational(var,point), new_seq);
+ return pseries(relational(var,point), std::move(new_seq));
}
// Multiplying two series with different variables or expansion points
// results in an empty (constant) series
if (!is_compatible_to(other)) {
- epvector nul;
- nul.push_back(expair(Order(_ex1), _ex0));
- return pseries(relational(var,point), nul);
+ epvector nul { expair(Order(_ex1), _ex0) };
+ return pseries(relational(var,point), std::move(nul));
+ }
+
+ if (seq.empty() || other.seq.empty()) {
+ return (new pseries(var==point, epvector()))
+ ->setflag(status_flags::dynallocated);
}
// Series multiplication
int cdeg_min = a_min + b_min;
int cdeg_max = a_max + b_max;
- int higher_order_a = INT_MAX;
- int higher_order_b = INT_MAX;
+ int higher_order_a = std::numeric_limits<int>::max();
+ int higher_order_b = std::numeric_limits<int>::max();
if (is_order_function(coeff(var, a_max)))
higher_order_a = a_max + b_min;
if (is_order_function(other.coeff(var, b_max)))
if (!co.is_zero())
new_seq.push_back(expair(co, numeric(cdeg)));
}
- if (higher_order_c < INT_MAX)
+ if (higher_order_c < std::numeric_limits<int>::max())
new_seq.push_back(expair(Order(_ex1), numeric(higher_order_c)));
- return pseries(relational(var, point), new_seq);
+ return pseries(relational(var, point), std::move(new_seq));
}
// holds ldegrees of the series of individual factors
std::vector<int> ldegrees;
+ std::vector<bool> ldegree_redo;
// find minimal degrees
- const epvector::const_iterator itbeg = seq.begin();
- const epvector::const_iterator itend = seq.end();
- for (epvector::const_iterator it=itbeg; it!=itend; ++it) {
-
- ex buf = recombine_pair_to_ex(*it);
+ // first round: obtain a bound up to which minimal degrees have to be
+ // considered
+ for (auto & it : seq) {
+
+ ex expon = it.coeff;
+ int factor = 1;
+ ex buf;
+ if (expon.info(info_flags::integer)) {
+ buf = it.rest;
+ factor = ex_to<numeric>(expon).to_int();
+ } else {
+ buf = recombine_pair_to_ex(it);
+ }
int real_ldegree = 0;
+ bool flag_redo = false;
try {
real_ldegree = buf.expand().ldegree(sym-r.rhs());
- }
- catch (std::runtime_error) {}
+ } catch (std::runtime_error) {}
if (real_ldegree == 0) {
+ if ( factor < 0 ) {
+ // This case must terminate, otherwise we would have division by
+ // zero.
+ int orderloop = 0;
+ do {
+ orderloop++;
+ real_ldegree = buf.series(r, orderloop, options).ldegree(sym);
+ } while (real_ldegree == orderloop);
+ } else {
+ // Here it is possible that buf does not have a ldegree, therefore
+ // check only if ldegree is negative, otherwise reconsider the case
+ // in the second round.
+ real_ldegree = buf.series(r, 0, options).ldegree(sym);
+ if (real_ldegree == 0)
+ flag_redo = true;
+ }
+ }
+
+ ldegrees.push_back(factor * real_ldegree);
+ ldegree_redo.push_back(flag_redo);
+ }
+
+ int degbound = order-std::accumulate(ldegrees.begin(), ldegrees.end(), 0);
+ // Second round: determine the remaining positive ldegrees by the series
+ // method.
+ // here we can ignore ldegrees larger than degbound
+ size_t j = 0;
+ for (auto & it : seq) {
+ if ( ldegree_redo[j] ) {
+ ex expon = it.coeff;
+ int factor = 1;
+ ex buf;
+ if (expon.info(info_flags::integer)) {
+ buf = it.rest;
+ factor = ex_to<numeric>(expon).to_int();
+ } else {
+ buf = recombine_pair_to_ex(it);
+ }
+ int real_ldegree = 0;
int orderloop = 0;
do {
orderloop++;
real_ldegree = buf.series(r, orderloop, options).ldegree(sym);
- } while (real_ldegree == orderloop);
+ } while ((real_ldegree == orderloop)
+ && (factor*real_ldegree < degbound));
+ ldegrees[j] = factor * real_ldegree;
+ degbound -= factor * real_ldegree;
}
-
- ldegrees.push_back(real_ldegree);
+ j++;
}
int degsum = std::accumulate(ldegrees.begin(), ldegrees.end(), 0);
- if (degsum>order) {
- epvector epv;
- epv.push_back(expair(Order(_ex1), order));
- return (new pseries(r, epv))->setflag(status_flags::dynallocated);
+ if (degsum >= order) {
+ epvector epv { expair(Order(_ex1), order) };
+ return (new pseries(r, std::move(epv)))->setflag(status_flags::dynallocated);
}
// Multiply with remaining terms
- std::vector<int>::const_iterator itd = ldegrees.begin();
- for (epvector::const_iterator it=itbeg; it!=itend; ++it, ++itd) {
+ auto itd = ldegrees.begin();
+ for (auto it=seq.begin(), itend=seq.end(); it!=itend; ++it, ++itd) {
// do series expansion with adjusted order
ex op = recombine_pair_to_ex(*it).series(r, order-degsum+(*itd), options);
// Series multiplication
- if (it==itbeg)
+ if (it == seq.begin())
acc = ex_to<pseries>(op);
else
acc = ex_to<pseries>(acc.mul_series(ex_to<pseries>(op)));
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 { expair(Order(_ex1), deg) };
+ return (new pseries(relational(var,point), std::move(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())
// 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<deg; ++i) {
+ for (int i=1; i<numcoeff; ++i) {
ex sum = _ex0;
for (int j=1; j<=i; ++j) {
ex c = coeff(var, j + ldeg);
// 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<numcoeff; ++i) {
if (!co[i].is_zero())
new_seq.push_back(expair(co[i], p * ldeg + i));
if (is_order_function(co[i])) {
}
}
if (!higher_order)
- new_seq.push_back(expair(Order(_ex1), p * ldeg + deg));
+ new_seq.push_back(expair(Order(_ex1), p * ldeg + numcoeff));
- return pseries(relational(var,point), new_seq);
+ return pseries(relational(var,point), std::move(new_seq));
}
pseries pseries::shift_exponents(int deg) const
{
epvector newseq = seq;
- epvector::iterator i = newseq.begin(), end = newseq.end();
- while (i != end) {
- i->coeff += deg;
- ++i;
- }
- return pseries(relational(var, point), newseq);
+ for (auto & it : newseq)
+ it.coeff += deg;
+ return pseries(relational(var, point), std::move(newseq));
}
must_expand_basis = true;
}
+ bool exponent_is_regular = true;
+ try {
+ exponent.subs(r, subs_options::no_pattern);
+ } catch (pole_error) {
+ exponent_is_regular = false;
+ }
+
+ if (!exponent_is_regular) {
+ ex l = exponent*log(basis);
+ // this == exp(l);
+ ex le = l.series(r, order, options);
+ // Note: expanding exp(l) won't help, since that will attempt
+ // Taylor expansion, and fail (because exponent is "singular")
+ // Still l itself might be expanded in Taylor series.
+ // Examples:
+ // sin(x)/x*log(cos(x))
+ // 1/x*log(1 + x)
+ return exp(le).series(r, order, options);
+ // Note: if l happens to have a Laurent expansion (with
+ // negative powers of (var - point)), expanding exp(le)
+ // will barf (which is The Right Thing).
+ }
+
// Is the expression of type something^(-int)?
- if (!must_expand_basis && !exponent.info(info_flags::negint))
+ if (!must_expand_basis && !exponent.info(info_flags::negint)
+ && (!is_a<add>(basis) || !is_a<numeric>(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<add>(basis) || !is_a<numeric>(exponent)))
return basic::series(r, order, options);
// Singularity encountered, is the basis equal to (var - point)?
new_seq.push_back(expair(_ex1, exponent));
else
new_seq.push_back(expair(Order(_ex1), exponent));
- return pseries(r, new_seq);
+ return pseries(r, std::move(new_seq));
}
// No, expand basis into series
- int intexp = ex_to<numeric>(exponent).to_int();
+ numeric numexp;
+ if (is_a<numeric>(exponent)) {
+ numexp = ex_to<numeric>(exponent);
+ } else {
+ numexp = 0;
+ }
const ex& sym = r.lhs();
// find existing minimal degree
- int real_ldegree = basis.expand().ldegree(sym-r.rhs());
+ ex eb = basis.expand();
+ int real_ldegree = 0;
+ if (eb.info(info_flags::rational_function))
+ real_ldegree = eb.ldegree(sym-r.rhs());
if (real_ldegree == 0) {
int orderloop = 0;
do {
} 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<pseries>(e).power_const(intexp, order);
- }
- catch (pole_error) {
- epvector ser;
- ser.push_back(expair(Order(_ex1), order));
- result = pseries(r, ser);
+ result = ex_to<pseries>(e).power_const(numexp, order);
+ } catch (pole_error) {
+ epvector ser { expair(Order(_ex1), order) };
+ result = pseries(r, std::move(ser));
}
return result;
return *this;
else {
epvector new_seq;
- epvector::const_iterator it = seq.begin(), itend = seq.end();
- while (it != itend) {
- int o = ex_to<numeric>(it->coeff).to_int();
+ for (auto & it : seq) {
+ int o = ex_to<numeric>(it.coeff).to_int();
if (o >= order) {
new_seq.push_back(expair(Order(_ex1), o));
break;
}
- new_seq.push_back(*it);
- ++it;
+ new_seq.push_back(it);
}
- return pseries(r, new_seq);
+ return pseries(r, std::move(new_seq));
}
} else
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 integrand 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.nops(); ++i) {
+ ex currcoeff = ex_to<pseries>(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<pseries>(fseries).exponop(i)));
+ }
+
+ // Expanding lower boundary
+ ex result = (new pseries(r, std::move(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.nops(); ++i) {
+ ex currcoeff = ex_to<pseries>(fseries).coeffop(i);
+ if (is_order_function(currcoeff))
+ break;
+ ex currexpon = ex_to<pseries>(fseries).exponop(i);
+ int orderforf = order-ex_to<numeric>(currexpon).to_int()-1;
+ currcoeff = currcoeff.series(r, orderforf);
+ ex term = ex_to<pseries>(aseries).power_const(ex_to<numeric>(currexpon+1),order);
+ term = ex_to<pseries>(term).mul_const(ex_to<numeric>(-1/(currexpon+1)));
+ term = ex_to<pseries>(term).mul_series(ex_to<pseries>(currcoeff));
+ result = ex_to<pseries>(result).add_series(ex_to<pseries>(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.nops(); ++i) {
+ ex currcoeff = ex_to<pseries>(fseries).coeffop(i);
+ if (is_order_function(currcoeff))
+ break;
+ ex currexpon = ex_to<pseries>(fseries).exponop(i);
+ int orderforf = order-ex_to<numeric>(currexpon).to_int()-1;
+ currcoeff = currcoeff.series(r, orderforf);
+ ex term = ex_to<pseries>(bseries).power_const(ex_to<numeric>(currexpon+1),order);
+ term = ex_to<pseries>(term).mul_const(ex_to<numeric>(1/(currexpon+1)));
+ term = ex_to<pseries>(term).mul_series(ex_to<pseries>(currcoeff));
+ result = ex_to<pseries>(result).add_series(ex_to<pseries>(term));
+ }
+
+ return result;
+}
+
/** Compute the truncated series expansion of an expression.
* This function returns an expression containing an object of class pseries
else
throw (std::logic_error("ex::series(): expansion point has unknown type"));
- try {
- e = bp->series(rel_, order, options);
- } catch (std::exception &x) {
- throw (std::logic_error(std::string("unable to compute series (") + x.what() + ")"));
- }
+ e = bp->series(rel_, order, options);
return e;
}
+GINAC_BIND_UNARCHIVER(pseries);
+
} // namespace GiNaC
git://www.ginac.de / ginac.git / blobdiff