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

[calculation] Calculation: memoized display output

Browse Source
This commit is contained in:
Émilie Feral
2019-04-26 10:46:46 +02:00
parent 08e4b0d6a3
commit 138587ee8e
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/calculation/calculation.cpp
View File

@@ -18,6 +18,7 @@ Calculation::Calculation() :
m_inputText(),
m_exactOutputText(),
m_approximateOutputText(),
m_displayOutput(DisplayOutput::Unknown),
m_height(-1),
m_expandedHeight(-1),
m_equalSign(EqualSign::Unknown)
@@ -127,6 +128,7 @@ bool Calculation::isEmpty() {
void Calculation::tidy() {
/* Uninitialized all Expression stored to free the Pool */
m_displayOutput = DisplayOutput::Unknown;
m_height = -1;
m_expandedHeight = -1;
m_equalSign = EqualSign::Unknown;
@@ -165,29 +167,33 @@ Layout Calculation::createApproximateOutputLayout(Context * context) {
}
Calculation::DisplayOutput Calculation::displayOutput(Context * context) {
if (shouldOnlyDisplayExactOutput()) {
return DisplayOutput::ExactOnly;
if (m_displayOutput != DisplayOutput::Unknown) {
return m_displayOutput;
}
if (exactOutput().recursivelyMatches([](const Expression e, Context & c, bool replaceSymbols) {
if (shouldOnlyDisplayExactOutput()) {
m_displayOutput = DisplayOutput::ExactOnly;
} else if (exactOutput().recursivelyMatches([](const Expression e, Context & c, bool replaceSymbols) {
/* If the exact result contains one of the following types, do not
* display it. */
ExpressionNode::Type t = e.type();
return (t == ExpressionNode::Type::Random) || (t == ExpressionNode::Type::Round);},
*context, true))
{
return DisplayOutput::ApproximateOnly;
m_displayOutput = DisplayOutput::ApproximateOnly;
} else if (strcmp(m_exactOutputText, m_approximateOutputText) == 0) {
/* If the exact and approximate results' texts are equal and their layouts
* too, do not display the exact result. If the two layouts are not equal
* because of the number of significant digits, we display both. */
return exactAndApproximateDisplayedOutputsAreEqual(context) == Calculation::EqualSign::Equal ? DisplayOutput::ApproximateOnly : DisplayOutput::ExactAndApproximate;
m_displayOutput = exactAndApproximateDisplayedOutputsAreEqual(context) == Calculation::EqualSign::Equal ? DisplayOutput::ApproximateOnly : DisplayOutput::ExactAndApproximate;
} 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'
return DisplayOutput::ApproximateOnly;
m_displayOutput = DisplayOutput::ApproximateOnly;
} else if (input().isApproximate(*context) || exactOutput().isApproximate(*context)) {
return DisplayOutput::ExactAndApproximateToggle;
m_displayOutput = DisplayOutput::ExactAndApproximateToggle;
} else {
m_displayOutput = DisplayOutput::ExactAndApproximate;
}
return DisplayOutput::ExactAndApproximate;
return m_displayOutput;
}
bool Calculation::shouldOnlyDisplayExactOutput() {

2
apps/calculation/calculation.h
View File

@@ -19,6 +19,7 @@ public:
};
enum class DisplayOutput : uint8_t {
Unknown,
ExactOnly,
ApproximateOnly,
ExactAndApproximate,
@@ -53,6 +54,7 @@ private:
char m_inputText[Constant::MaxSerializedExpressionSize];
char m_exactOutputText[Constant::MaxSerializedExpressionSize];
char m_approximateOutputText[Constant::MaxSerializedExpressionSize];
DisplayOutput m_displayOutput;
KDCoordinate m_height;
KDCoordinate m_expandedHeight;
EqualSign m_equalSign;