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

[poincare] Avoid returning partial simplification when the

Browse Source 
simplification process has been interrupted
This commit is contained in:
Émilie Feral
2018-01-24 10:34:23 +01:00
committed by EmilieNumworks
parent e4c6636b08
commit 59fdcde548
5 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/sequence/sequence.cpp
View File

@@ -149,20 +149,14 @@ void Sequence::setInitialRank(int rank) {
Poincare::Expression * Sequence::firstInitialConditionExpression(Context * context) const {
if (m_firstInitialConditionExpression == nullptr) {
m_firstInitialConditionExpression = Poincare::Expression::parse(m_firstInitialConditionText);
if (m_firstInitialConditionExpression) {
Expression::Simplify(&m_firstInitialConditionExpression, *context);
}
m_firstInitialConditionExpression = Poincare::Expression::ParseAndSimplify(m_firstInitialConditionText, *context);
}
return m_firstInitialConditionExpression;
}
Poincare::Expression * Sequence::secondInitialConditionExpression(Context * context) const {
if (m_secondInitialConditionExpression == nullptr) {
m_secondInitialConditionExpression = Poincare::Expression::parse(m_secondInitialConditionText);
if (m_secondInitialConditionExpression) {
Expression::Simplify(&m_secondInitialConditionExpression, *context);
}
m_secondInitialConditionExpression = Poincare::Expression::ParseAndSimplify(m_secondInitialConditionText, *context);
}
return m_secondInitialConditionExpression;
}