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

[calculation] Fix all reference to Poincare

Browse Source
This commit is contained in:
Émilie Feral
2018-08-10 13:15:21 +02:00
parent 17daf19e05
commit b5f66171fc
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/calculation/calculation_store.cpp
View File

@@ -89,10 +89,10 @@ void CalculationStore::tidy() {
}
}
Expression * CalculationStore::ansExpression(Context * context) {
Expression CalculationStore::ansExpression(Context * context) {
if (numberOfCalculations() == 0) {
static Rational defaultExpression(0);
return &defaultExpression;
return defaultExpression;
}
Calculation * lastCalculation = calculationAtIndex(numberOfCalculations()-1);
/* Special case: the exact output is a Store/Equal expression.
@@ -100,10 +100,10 @@ Expression * CalculationStore::ansExpression(Context * context) {
* To avoid turning 'ans->A' in '2->A->A' (or 2->A=A) which cannot be parsed),
* ans is replaced by the approximation output in when any Store or Equal
* expression appears.*/
bool exactOuptutInvolvesStoreEqual = lastCalculation->exactOutput(context)->recursivelyMatches([](const Expression * e, Context & context) {
return e->type() == Expression::Type::Store || e->type() == Expression::Type::Equal;
bool exactOuptutInvolvesStoreEqual = lastCalculation->exactOutput(context).recursivelyMatches([](const Expression e, Context & context) {
return e.type() == ExpressionNode::Type::Store || e.type() == ExpressionNode::Type::Equal;
}, *context);
if (lastCalculation->input()->isApproximate(*context) || exactOuptutInvolvesStoreEqual) {
if (lastCalculation->input().isApproximate(*context) || exactOuptutInvolvesStoreEqual) {
return lastCalculation->approximateOutput(context);
}
return lastCalculation->exactOutput(context);