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

[apps] Simplify expressions in sequence and function applications

Browse Source 
Change-Id: I2708934d3b5c90e8692e50d939b3a13028b8615e
This commit is contained in:
Émilie Feral
2017-11-24 14:39:06 +01:00
parent fda382cc0d
commit 2c06727f36
6 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/shared/function.cpp
View File

@@ -69,16 +69,23 @@ const char * Function::name() const {
return m_name;
}
Poincare::Expression * Function::expression() const {
Poincare::Expression * Function::expression(Poincare::Context * context) const {
if (m_expression == nullptr) {
m_expression = Expression::parse(m_text);
if (m_expression) {
Expression::Simplify(&m_expression, *context);
}
}
return m_expression;
}
Poincare::ExpressionLayout * Function::layout() {
if (m_layout == nullptr && expression() != nullptr) {
m_layout = expression()->createLayout(Expression::FloatDisplayMode::Decimal);
if (m_layout == nullptr) {
Expression * nonSimplifiedExpression = Expression::parse(m_text);
if (nonSimplifiedExpression != nullptr) {
m_layout = nonSimplifiedExpression->createLayout(Expression::FloatDisplayMode::Decimal);
delete nonSimplifiedExpression;
}
}
return m_layout;
}
@@ -105,7 +112,7 @@ T Function::templatedApproximateAtAbscissa(T x, Poincare::Context * context) con
Poincare::Symbol xSymbol(symbol());
Poincare::Complex<T> e = Poincare::Complex<T>::Float(x);
variableContext.setExpressionForSymbolName(&e, &xSymbol, variableContext);
return expression()->approximateToScalar<T>(variableContext);
return expression(context)->approximateToScalar<T>(variableContext);
}
void Function::tidy() {