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] Calculation: move implementation of ansExpression() from

Browse Source 
Calculation to CalculationStore
This commit is contained in:
Émilie Feral
2018-01-24 15:12:46 +01:00
committed by EmilieNumworks
parent d43fc1b6eb
commit 36a3108309
4 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/calculation/calculation.cpp
View File

@@ -64,10 +64,10 @@ void Calculation::reset() {
tidy();
}
void Calculation::setContent(const char * c, Context * context, CalculationStore * calculationStore) {
void Calculation::setContent(const char * c, Context * context, Expression * ansExpression) {
reset();
m_input = Expression::parse(c);
Expression::ReplaceSymbolWithExpression(&m_input, Symbol::SpecialSymbols::Ans, ansExpression(calculationStore, context));
Expression::ReplaceSymbolWithExpression(&m_input, Symbol::SpecialSymbols::Ans, ansExpression);
/* 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));
@@ -192,16 +192,4 @@ bool Calculation::shouldDisplayApproximateOutput(Context * context) {
return input()->isApproximate(*context);
}
Expression * Calculation::ansExpression(CalculationStore * calculationStore, Context * context) {
if (calculationStore->numberOfCalculations() == 0) {
static Rational defaultExpression(0);
return &defaultExpression;
}
Calculation * lastCalculation = calculationStore->calculationAtIndex(calculationStore->numberOfCalculations()-1);
if (lastCalculation->input()->isApproximate(*context)) {
return lastCalculation->approximateOutput(context);
}
return lastCalculation->exactOutput(context);
}
}