UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-23 15:50:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[sequence] Fix Sequence::sumBetweenBounds

Browse Source
This commit is contained in:
Émilie Feral
2019-11-13 15:06:14 +01:00
committed by LeaNumworks
parent 90b3e52c0c
commit 269f479c29
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/sequence/sequence.cpp
View File

@@ -189,8 +189,22 @@ T Sequence::approximateToNextRank(int n, SequenceContext * sqctx) const {
}
Expression Sequence::sumBetweenBounds(double start, double end, Poincare::Context * context) const {
assert(std::round(start) == start && std::round(end) == end);
return Poincare::Sum::Builder(expressionReduced(context).clone(), Poincare::Symbol::Builder(UCodePointUnknownX), Poincare::Float<double>::Builder(start), Poincare::Float<double>::Builder(end)); // Sum takes ownership of args
/* Here, we cannot just create the expression sum(u(n), start, end) because
* the approximation of u(n) is not handled by Poincare (but only by
* Sequence). */
double result = 0.0;
if (end-start > ExpressionNode::k_maxNumberOfSteps || start + 1.0 == start) {
return Float<double>::Builder(NAN);
}
for (double i = std::round(start); i <= std::round(end); i = i + 1.0) {
/* When |start| >> 1.0, start + 1.0 = start. In that case, quit the
* infinite loop. */
if (i == i-1.0 || i == i+1.0) {
return Float<double>::Builder(NAN);
}
result += evaluateXYAtParameter(i, context).x2();
}
return Float<double>::Builder(result);
}
Sequence::RecordDataBuffer * Sequence::recordData() const {