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] Calculation: improve memoization of a calculation height

Browse Source
This commit is contained in:
Émilie Feral
2019-04-23 15:12:14 +02:00
parent 55e325cc3a
commit 0c453386d3
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/calculation/calculation.cpp
View File

@@ -19,6 +19,7 @@ Calculation::Calculation() :
m_exactOutputText(),
m_approximateOutputText(),
m_height(-1),
m_selectedHeight(-1),
m_equalSign(EqualSign::Unknown),
m_toggleDisplayExact(false)
{
@@ -60,32 +61,35 @@ void Calculation::setContent(const char * c, Context * context, Expression ansEx
}
KDCoordinate Calculation::height(Context * context, bool isSelected) {
if (m_height < 0 || isSelected) {
KDCoordinate height;
KDCoordinate * memoizedHeight = isSelected ? &m_selectedHeight : &m_height;
if (*memoizedHeight < 0) {
DisplayOutput display = displayOutput(context);
Layout inputLayout = createInputLayout();
KDCoordinate inputHeight = inputLayout.layoutSize().height();
Layout approximateLayout = createApproximateOutputLayout(context);
Layout exactLayout = createExactOutputLayout();
DisplayOutput display = displayOutput(context);
if (display == DisplayOutput::ExactOnly || (!isSelected && display == DisplayOutput::ExactAndApproximateToggle && m_toggleDisplayExact)) {
KDCoordinate exactOutputHeight = exactLayout.layoutSize().height();
height = inputHeight+exactOutputHeight;
KDCoordinate exactOutputHeight = createExactOutputLayout().layoutSize().height();
*memoizedHeight = inputHeight+exactOutputHeight;
} else if (display == DisplayOutput::ApproximateOnly || (!isSelected && display == DisplayOutput::ExactAndApproximateToggle && !m_toggleDisplayExact)) {
KDCoordinate approximateOutputHeight = approximateLayout.layoutSize().height();
height = inputHeight+approximateOutputHeight;
KDCoordinate approximateOutputHeight = createApproximateOutputLayout(context).layoutSize().height();
*memoizedHeight = inputHeight+approximateOutputHeight;
} else {
assert(display == DisplayOutput::ExactAndApproximate || (display == DisplayOutput::ExactAndApproximateToggle && isSelected));
Layout approximateLayout = createApproximateOutputLayout(context);
Layout exactLayout = createExactOutputLayout();
KDCoordinate approximateOutputHeight = approximateLayout.layoutSize().height();
KDCoordinate exactOutputHeight = exactLayout.layoutSize().height();
KDCoordinate outputHeight = maxCoordinate(exactLayout.baseline(), approximateLayout.baseline()) + maxCoordinate(exactOutputHeight-exactLayout.baseline(), approximateOutputHeight-approximateLayout.baseline());
height = inputHeight + outputHeight;
*memoizedHeight = inputHeight + outputHeight;
}
if (isSelected) {
return height;
/* For all display output except ExactAndApproximateToggle, the selected
* height and the usual height are identical. We update both heights in
* theses cases. */
if (display != DisplayOutput::ExactAndApproximateToggle) {
m_height = *memoizedHeight;
m_selectedHeight = *memoizedHeight;
}
m_height = height;
}
return m_height;
return *memoizedHeight;
}
const char * Calculation::inputText() {
@@ -125,6 +129,7 @@ bool Calculation::isEmpty() {
void Calculation::tidy() {
/* Uninitialized all Expression stored to free the Pool */
m_height = -1;
m_selectedHeight = -1;
m_equalSign = EqualSign::Unknown;
}

1
apps/calculation/calculation.h
View File

@@ -56,6 +56,7 @@ private:
char m_exactOutputText[Constant::MaxSerializedExpressionSize];
char m_approximateOutputText[Constant::MaxSerializedExpressionSize];
KDCoordinate m_height;
KDCoordinate m_selectedHeight;
EqualSign m_equalSign;
bool m_toggleDisplayExact;
};