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

[poincare] Clean recursive tests on expression (isApproximate, IsRandom,

Browse Source 
IsMatrix etc)
This commit is contained in:
Émilie Feral
2019-05-02 16:41:36 +02:00
parent 7f373a5c3c
commit cbbb827532
10 changed files with 40 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/calculation/calculation.cpp
View File

@@ -172,7 +172,7 @@ Calculation::DisplayOutput Calculation::displayOutput(Context * context) {
}
if (shouldOnlyDisplayExactOutput()) {
m_displayOutput = DisplayOutput::ExactOnly;
} else if (exactOutput().recursivelyMatches([](const Expression e, Context & c, bool replaceSymbols) {
} else if (exactOutput().recursivelyMatches([](const Expression e, Context & c) {
/* If the exact result contains one of the following types, do not
* display it. */
ExpressionNode::Type t = e.type();
@@ -192,7 +192,7 @@ Calculation::DisplayOutput Calculation::displayOutput(Context * context) {
} else if (strcmp(m_exactOutputText, Undefined::Name()) == 0 || strcmp(m_approximateOutputText, Unreal::Name()) == 0) {
// If the approximate result is 'unreal' or the exact result is 'undef'
m_displayOutput = DisplayOutput::ApproximateOnly;
} else if (input().isApproximate(*context) || exactOutput().isApproximate(*context)) {
} else if (input().recursivelyMatches(Expression::IsApproximate, *context) || exactOutput().recursivelyMatches(Expression::IsApproximate, *context)) {
m_displayOutput = DisplayOutput::ExactAndApproximateToggle;
} else {
m_displayOutput = DisplayOutput::ExactAndApproximate;