* methods for series expansion. */
/*
- * GiNaC Copyright (C) 1999-2001 Johannes Gutenberg University Mainz, Germany
+ * GiNaC Copyright (C) 1999-2003 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
* @return newly constructed pseries */
pseries::pseries(const ex &rel_, const epvector &ops_) : basic(TINFO_pseries), seq(ops_)
{
- GINAC_ASSERT(is_exactly_a<relational>(rel_));
- GINAC_ASSERT(is_exactly_a<symbol>(rel_.lhs()));
+ GINAC_ASSERT(is_a<relational>(rel_));
+ GINAC_ASSERT(is_a<symbol>(rel_.lhs()));
point = rel_.rhs();
var = rel_.lhs();
}
var.print(c, level + delta_indent);
point.print(c, level + delta_indent);
+ } else if (is_a<print_python_repr>(c)) {
+ c.s << class_name() << "(relational(";
+ var.print(c);
+ c.s << ',';
+ point.print(c);
+ c.s << "),[";
+ unsigned num = seq.size();
+ for (unsigned i=0; i<num; ++i) {
+ if (i)
+ c.s << ',';
+ c.s << '(';
+ seq[i].rest.print(c);
+ c.s << ',';
+ seq[i].coeff.print(c);
+ c.s << ')';
+ }
+ c.s << "])";
} else {
if (precedence() <= level)
} else
var.print(c);
if (i->coeff.compare(_ex1)) {
- c.s << '^';
+ if (is_a<print_python>(c))
+ c.s << "**";
+ else
+ c.s << '^';
if (i->coeff.info(info_flags::negative)) {
c.s << par_open;
i->coeff.print(c);
->setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0));
}
-/** Implementation of ex::diff() for a power series. It treats the series as a
- * polynomial.
+/** Implementation of ex::diff() for a power series.
* @see ex::diff */
ex pseries::derivative(const symbol & s) const
{
+ epvector new_seq;
+ epvector::const_iterator it = seq.begin(), itend = seq.end();
+
if (s == var) {
- epvector new_seq;
- epvector::const_iterator it = seq.begin(), itend = seq.end();
// FIXME: coeff might depend on var
while (it != itend) {
}
++it;
}
- return pseries(relational(var,point), new_seq);
+
} else {
- return *this;
+
+ while (it != itend) {
+ if (is_order_function(it->rest)) {
+ new_seq.push_back(*it);
+ } else {
+ ex c = it->rest.diff(s);
+ if (!c.is_zero())
+ new_seq.push_back(expair(c, it->coeff));
+ }
+ ++it;
+ }
}
+
+ return pseries(relational(var,point), new_seq);
}
ex pseries::convert_to_poly(bool no_order) const
{
epvector seq;
const ex point = r.rhs();
- GINAC_ASSERT(is_exactly_a<symbol>(r.lhs()));
+ GINAC_ASSERT(is_a<symbol>(r.lhs()));
if (this->is_equal_same_type(ex_to<symbol>(r.lhs()))) {
if (order > 0 && !point.is_zero())
epvector::const_iterator itend = seq.end();
for (; it!=itend; ++it) {
ex op;
- if (is_ex_exactly_of_type(it->rest, pseries))
+ if (is_exactly_a<pseries>(it->rest))
op = it->rest;
else
op = it->rest.series(r, order, options);
ex power::series(const relational & r, int order, unsigned options) const
{
// If basis is already a series, just power it
- if (is_ex_exactly_of_type(basis, pseries))
+ if (is_exactly_a<pseries>(basis))
return ex_to<pseries>(basis).power_const(ex_to<numeric>(exponent), order);
// Basis is not a series, may there be a singularity?
ex pseries::series(const relational & r, int order, unsigned options) const
{
const ex p = r.rhs();
- GINAC_ASSERT(is_exactly_a<symbol>(r.lhs()));
+ GINAC_ASSERT(is_a<symbol>(r.lhs()));
const symbol &s = ex_to<symbol>(r.lhs());
if (var.is_equal(s) && point.is_equal(p)) {
ex e;
relational rel_;
- if (is_ex_exactly_of_type(r,relational))
+ if (is_exactly_a<relational>(r))
rel_ = ex_to<relational>(r);
- else if (is_ex_exactly_of_type(r,symbol))
+ else if (is_a<symbol>(r))
rel_ = relational(r,_ex0);
else
throw (std::logic_error("ex::series(): expansion point has unknown type"));