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

[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

12
apps/calculation/calculation.cpp
View File

@@ -71,8 +71,7 @@ void Calculation::setContent(const char * c, Context * context, CalculationStore
/* We do not store directly the text enter by the user but its serialization
* to be able to compare it to the exact ouput text. */
m_input->writeTextInBuffer(m_inputText, sizeof(m_inputText));
m_exactOutput = input()->clone();
Expression::Simplify(&m_exactOutput, *context);
m_exactOutput = Expression::ParseAndSimplify(m_inputText, *context);
m_exactOutput->writeTextInBuffer(m_exactOutputText, sizeof(m_exactOutputText));
m_approximateOutput = m_exactOutput->approximate<double>(*context);
m_approximateOutput->writeTextInBuffer(m_approximateOutputText, sizeof(m_approximateOutputText));
@@ -148,13 +147,8 @@ void Calculation::tidy() {
Expression * Calculation::exactOutput(Context * context) {
if (m_exactOutput == nullptr) {
/* To ensure that the expression 'm_exactOutput' is a simplified, we
* call 'simplifyAndBeautify'. */
m_exactOutput = Expression::parse(m_exactOutputText);
if (m_exactOutput != nullptr) {
Expression::Simplify(&m_exactOutput, *context);
} else {
m_exactOutput = new Undefined();
}
* call 'ParseAndSimplify'. */
m_exactOutput = Expression::ParseAndSimplify(m_exactOutputText, *context);
}
return m_exactOutput;
}