UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-19 05:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Global Context] Fixed rank approximation error for sequences

Browse Source 
Change-Id: I29c0a55956aee8764e50650b229a49aa8a0f9336
This commit is contained in:
Arthur Camouseigt
2020-09-30 16:02:48 +02:00
committed by Émilie Feral
parent f64a650ef6
commit bf0f6c7a33
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
apps/shared/global_context.cpp
View File

@@ -2,6 +2,7 @@
#include "continuous_function.h"
#include "sequence.h"
#include "poincare_helpers.h"
#include <poincare/rational.h>
#include <poincare/serialization_helper.h>
#include <poincare/undefined.h>
#include <assert.h>
@@ -123,16 +124,29 @@ const Expression GlobalContext::ExpressionForSequence(const SymbolAbstract & sym
/* An function record value has metadata before the expression. To get the
* expression, use the function record handle. */
Sequence seq(r);
constexpr int bufferSize = CodePoint::MaxCodePointCharLength + 1;
char unknownN[bufferSize];
Poincare::SerializationHelper::CodePoint(unknownN, bufferSize, UCodePointUnknown);
float rank = symbol.childAtIndex(0).approximateWithValueForSymbol<float>(unknownN, unknownSymbolValue, ctx, Preferences::sharedPreferences()->complexFormat(),Preferences::sharedPreferences()->angleUnit());
if (std::floor(rank) == rank && !seq.badlyReferencesItself(ctx)) {
SequenceContext sqctx(ctx, sequenceStore());
return Float<double>::Builder(seq.evaluateXYAtParameter(rank, &sqctx).x2());
} else {
return Float<double>::Builder(NAN);
Expression rank = symbol.childAtIndex(0).clone();
rank = rank.replaceSymbolWithExpression(Symbol::Builder(UCodePointUnknown), Float<float>::Builder(unknownSymbolValue));
rank = rank.simplify(ExpressionNode::ReductionContext(ctx, Poincare::Preferences::sharedPreferences()->complexFormat(), Poincare::Preferences::sharedPreferences()->angleUnit(), GlobalPreferences::sharedGlobalPreferences()->unitFormat(), ExpressionNode::ReductionTarget::SystemForApproximation));
if (!rank.isUninitialized()) {
bool rankIsInteger = false;
double rankValue = rank.approximateToScalar<double>(ctx, Poincare::Preferences::sharedPreferences()->complexFormat(), Poincare::Preferences::sharedPreferences()->angleUnit());
if (rank.type() == ExpressionNode::Type::Rational) {
Rational n = static_cast<Rational &>(rank);
rankIsInteger = n.isInteger();
} else if (!std::isnan(unknownSymbolValue)) {
/* If unknownSymbolValue is not nan, then we are in the graph app. In order
* to allow functions like f(x) = u(x+0.5) to be ploted, we need to
* approximate the rank and check if it is an integer. Unfortunatly this
* leads to some edge cases were, because of quantification, we have
* floor(x) = x while x is not integer.*/
rankIsInteger = std::floor(rankValue) == rankValue;
}
if (rankIsInteger && !seq.badlyReferencesItself(ctx)) {
SequenceContext sqctx(ctx, sequenceStore());
return Float<double>::Builder(seq.evaluateXYAtParameter(rankValue, &sqctx).x2());
}
}
return Float<double>::Builder(NAN);
}
Ion::Storage::Record::ErrorStatus GlobalContext::SetExpressionForActualSymbol(const Expression & expression, const SymbolAbstract & symbol, Ion::Storage::Record previousRecord) {