* @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_) : 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()));
}
/** Perform coefficient-wise automatic term rewriting rules in this class. */
-ex pseries::eval(int level) const
+ex pseries::eval() const
{
- if (level == 1)
- return this->hold();
-
- if (level == -max_recursion_level)
- throw (std::runtime_error("pseries::eval(): recursion limit exceeded"));
+ if (flags & status_flags::evaluated) {
+ return *this;
+ }
// 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.eval(level-1), it->coeff));
+ new_seq.push_back(expair(it->rest, it->coeff));
++it;
}
- return (new pseries(relational(var,point), std::move(new_seq)))->setflag(status_flags::dynallocated | status_flags::evaluated);
+ return dynallocate<pseries>(relational(var,point), std::move(new_seq)).setflag(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), std::move(new_seq)))->setflag(status_flags::dynallocated | status_flags::evaluated);
+ return dynallocate<pseries>(relational(var,point), std::move(new_seq)).setflag(status_flags::evaluated);
}
ex pseries::conjugate() const
return *this;
}
- return (new pseries(var==newpoint, newseq ? std::move(*newseq) : seq))->setflag(status_flags::dynallocated);
+ return dynallocate<pseries>(var==newpoint, newseq ? std::move(*newseq) : seq);
}
ex pseries::real_part() const
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);
+ return dynallocate<pseries>(var==point, std::move(v));
}
ex pseries::imag_part() const
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);
+ return dynallocate<pseries>(var==point, std::move(v));
}
ex pseries::eval_integ() const
{
- epvector *newseq = nullptr;
+ 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));
}
ex newterm = i->rest.eval_integ();
if (!are_ex_trivially_equal(newterm, i->rest)) {
- newseq = new epvector;
+ newseq.reset(new epvector);
newseq->reserve(seq.size());
for (auto j=seq.begin(); j!=i; ++j)
newseq->push_back(*j);
ex newpoint = point.eval_integ();
if (newseq || !are_ex_trivially_equal(newpoint, point))
- return (new pseries(var==newpoint, *newseq))
- ->setflag(status_flags::dynallocated);
+ return dynallocate<pseries>(var==newpoint, std::move(*newseq));
return *this;
}
}
}
if (something_changed)
- return (new pseries(var==point, std::move(newseq)))->setflag(status_flags::dynallocated);
+ return dynallocate<pseries>(var==point, std::move(newseq));
else
return *this;
}
newseq.reserve(seq.size());
for (auto & it : seq)
newseq.push_back(expair(it.rest.subs(m, options), it.coeff));
- return (new pseries(relational(var,point.subs(m, options)), newseq))->setflag(status_flags::dynallocated);
+ return dynallocate<pseries>(relational(var,point.subs(m, options)), std::move(newseq));
}
/** Implementation of ex::expand() for a power series. It expands all the
if (!restexp.is_zero())
newseq.push_back(expair(restexp, it.coeff));
}
- return (new pseries(relational(var,point), std::move(newseq)))
- ->setflag(status_flags::dynallocated | (options == 0 ? status_flags::expanded : 0));
+ return dynallocate<pseries>(relational(var,point), std::move(newseq)).setflag(options == 0 ? status_flags::expanded : 0);
}
/** Implementation of ex::diff() for a power series.
// 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
else
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);
+ return dynallocate<pseries>(var==point, epvector());
}
// Series multiplication
}
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));
}
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);
+ epvector epv { expair(Order(_ex1), order) };
+ return dynallocate<pseries>(r, std::move(epv));
}
// Multiply with remaining terms
// adjust number of coefficients
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);
+ epvector epv { expair(Order(_ex1), deg) };
+ return dynallocate<pseries>(relational(var,point), std::move(epv));
}
// O(x^n)^(-m) is undefined
if (!higher_order)
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));
}
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
try {
result = ex_to<pseries>(e).power_const(numexp, order);
} catch (pole_error) {
- epvector ser;
- ser.push_back(expair(Order(_ex1), order));
- result = pseries(r, ser);
+ epvector ser { expair(Order(_ex1), order) };
+ result = pseries(r, std::move(ser));
}
return result;
}
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);
}
// Expanding lower boundary
- ex result = (new pseries(r, fexpansion))->setflag(status_flags::dynallocated);
+ ex result = dynallocate<pseries>(r, std::move(fexpansion));
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) {
git://www.ginac.de / ginac.git / blobdiff