#include "utils.h"
#include "debugmsg.h"
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
namespace GiNaC {
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC
GINAC_IMPLEMENT_REGISTERED_CLASS(pseries, basic)
void pseries::print(ostream &os, unsigned upper_precedence) const
{
- debugmsg("symbol print", LOGLEVEL_PRINT);
- convert_to_poly().print(os, upper_precedence);
+ debugmsg("pseries print", LOGLEVEL_PRINT);
+ convert_to_poly().print(os, upper_precedence);
}
void pseries::printraw(ostream &os) const
{
- debugmsg("symbol printraw", LOGLEVEL_PRINT);
+ debugmsg("pseries printraw", LOGLEVEL_PRINT);
os << "pseries(" << var << ";" << point << ";";
for (epvector::const_iterator i=seq.begin(); i!=seq.end(); i++) {
os << "(" << (*i).rest << "," << (*i).coeff << "),";
unsigned pseries::nops(void) const
{
- return seq.size();
+ return seq.size();
}
ex pseries::op(int i) const
{
- if (i < 0 || i >= seq.size())
- throw (std::out_of_range("op() out of range"));
- return seq[i].rest * power(var - point, seq[i].coeff);
+ if (i < 0 || unsigned(i) >= seq.size())
+ throw (std::out_of_range("op() out of range"));
+ return seq[i].rest * power(var - point, seq[i].coeff);
}
ex &pseries::let_op(int i)
ex pseries::coeff(const symbol &s, int n) const
{
if (var.is_equal(s)) {
- epvector::const_iterator it = seq.begin(), itend = seq.end();
- while (it != itend) {
- int pow = ex_to_numeric(it->coeff).to_int();
- if (pow == n)
- return it->rest;
- if (pow > n)
- return _ex0();
- it++;
- }
- return _ex0();
+ if (seq.size() == 0)
+ return _ex0();
+
+ // Binary search in sequence for given power
+ numeric looking_for = numeric(n);
+ int lo = 0, hi = seq.size() - 1;
+ while (lo <= hi) {
+ int mid = (lo + hi) / 2;
+ GINAC_ASSERT(is_ex_exactly_of_type(seq[mid].coeff, numeric));
+ int cmp = ex_to_numeric(seq[mid].coeff).compare(looking_for);
+ switch (cmp) {
+ case -1:
+ lo = mid + 1;
+ break;
+ case 0:
+ return seq[mid].rest;
+ case 1:
+ hi = mid - 1;
+ break;
+ default:
+ throw(std::logic_error("pseries::coeff: compare() didn't return -1, 0 or 1"));
+ }
+ }
+ return _ex0();
} else
return convert_to_poly().coeff(s, n);
}
+ex pseries::collect(const symbol &s) const
+{
+ return *this;
+}
+
+/** Evaluate coefficients. */
ex pseries::eval(int level) const
{
if (level == 1)
return this->hold();
+
+ if (level == -max_recursion_level)
+ throw (std::runtime_error("pseries::eval(): recursion limit exceeded"));
// Construct a new series with evaluated coefficients
epvector new_seq;
return (new pseries(var, point, new_seq))->setflag(status_flags::dynallocated | status_flags::evaluated);
}
-/** Evaluate numerically. The order term is dropped. */
+/** Evaluate coefficients numerically. */
ex pseries::evalf(int level) const
{
- return convert_to_poly().evalf(level);
+ if (level == 1)
+ return *this;
+
+ if (level == -max_recursion_level)
+ throw (std::runtime_error("pseries::evalf(): recursion limit exceeded"));
+
+ // Construct a new series with evaluated coefficients
+ epvector new_seq;
+ new_seq.reserve(seq.size());
+ epvector::const_iterator it = seq.begin(), itend = seq.end();
+ while (it != itend) {
+ new_seq.push_back(expair(it->rest.evalf(level-1), it->coeff));
+ it++;
+ }
+ return (new pseries(var, point, new_seq))->setflag(status_flags::dynallocated | status_flags::evaluated);
}
ex pseries::subs(const lst & ls, const lst & lr) const
return (new pseries(var, point.subs(ls, lr), new_seq))->setflag(status_flags::dynallocated);
}
+/** Implementation of ex::diff() for a power series. It treats the series as a
+ * polynomial.
+ * @see ex::diff */
+ex pseries::derivative(const symbol & s) const
+{
+ if (s == var) {
+ epvector new_seq;
+ epvector::const_iterator it = seq.begin(), itend = seq.end();
+
+ // 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));
+ } else {
+ ex c = it->rest * it->coeff;
+ if (!c.is_zero())
+ new_seq.push_back(expair(c, it->coeff - 1));
+ }
+ it++;
+ }
+ return pseries(var, point, new_seq);
+ } else {
+ return *this;
+ }
+}
+
/*
* Construct ordinary polynomial out of series
}
-/** Add one series object to another, producing a pseries object that represents
- * the sum.
+/** Add one series object to another, producing a pseries object that
+ * represents the sum.
*
* @param other pseries object to add with
* @return the sum as a pseries */
}
-/** Multiply a pseries object with a numeric constant, producing a pseries object
- * that represents the product.
+/** Multiply a pseries object with a numeric constant, producing a pseries
+ * object that represents the product.
*
* @param other constant to multiply with
* @return the product as a pseries */
}
+/** Re-expansion of a pseries object. */
+ex pseries::series(const symbol & s, const ex & p, int order) const
+{
+ if (var.is_equal(s) && point.is_equal(p)) {
+ if (order > degree(s))
+ 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();
+ if (o >= order) {
+ new_seq.push_back(expair(Order(_ex1()), o));
+ break;
+ }
+ new_seq.push_back(*it);
+ it++;
+ }
+ return pseries(var, point, new_seq);
+ }
+ } else
+ return convert_to_poly().series(s, p, order);
+}
+
+
/** Compute the truncated series expansion of an expression.
* This function returns an expression containing an object of class pseries to
* represent the series. If the series does not terminate within the given
ex ex::series(const symbol &s, const ex &point, int order) const
{
GINAC_ASSERT(bp!=0);
- return bp->series(s, point, order);
+ ex e;
+ try {
+ e = bp->series(s, point, order);
+ } catch (exception &x) {
+ throw (std::logic_error(string("unable to compute series (") + x.what() + ")"));
+ }
+ return e;
}
const pseries some_pseries;
const type_info & typeid_pseries = typeid(some_pseries);
-#ifndef NO_GINAC_NAMESPACE
+#ifndef NO_NAMESPACE_GINAC
} // namespace GiNaC
-#endif // ndef NO_GINAC_NAMESPACE
+#endif // ndef NO_NAMESPACE_GINAC