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/expression] Equalize simplified and approximate output in presence of units

Browse Source
This commit is contained in:
Ruben Dashyan
2020-01-21 13:44:31 +01:00
committed by Léa Saviot
parent c4f112e5aa
commit 054aac2c1c
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
poincare/src/expression.cpp
View File

@@ -636,6 +636,14 @@ void Expression::beautifyAndApproximateScalar(Expression * simplifiedExpression,
*simplifiedExpression = deepBeautify(userReductionContext);
// Step 2: approximation
if (approximateExpression) {
if (simplifiedExpression->recursivelyMatches([](const Expression e, Context * context) { return e.type() == ExpressionNode::Type::Unit; }, nullptr, false)) {
/* Approximate and simplified expressions are set equal so that only
* one of them will be output. Note that there is no need to clone
* since the expressions will not be altered. */
*approximateExpression = *simplifiedExpression;
return;
}
*approximateExpression = simplifiedExpression->approximate<double>(context, complexFormat, angleUnit);
}
}