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

[apps/shared] Memoize in StorageFuncListCtrl::indexFromCumulatedHeight

Browse Source
This commit is contained in:
Léa Saviot
2018-12-19 15:16:00 +01:00
committed by EmilieNumworks
parent 6740198e06
commit 13419f434f
3 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/shared/storage_expression_model_list_controller.h
View File

@@ -35,14 +35,16 @@ protected:
virtual StorageExpressionModelStore * modelStore() = 0;
virtual InputViewController * inputController() = 0;
EvenOddMessageTextCell m_addNewModel;
private:
protected:
// Memoization
static constexpr int k_memoizedCellHeightsCount = 5;
private:
// Memoization
static constexpr int k_resetedMemoizedValue = -1;
static_assert(StorageExpressionModelListController::k_memoizedCellHeightsCount == 5, "Wrong array size in initialization of StorageExpressionModelListController::m_memoizedCellHeight.");
static_assert(StorageExpressionModelListController::k_memoizedCellHeightsCount % 2 == 1, "StorageExpressionModelListController::k_memoizedCellHeightsCount should be odd to be able to compute the middle element.");
void resetMemoization();
virtual KDCoordinate notMemoizedCumulatedHeightFromIndex(int j) = 0;
static constexpr int k_resetedMemoizedValue = -1;
KDCoordinate m_memoizedCellHeight[k_memoizedCellHeightsCount];
KDCoordinate m_cumulatedHeightForSelectedIndex;
};

37
apps/shared/storage_function_list_controller.cpp
View File

@@ -4,6 +4,7 @@
namespace Shared {
static inline int max(int x, int y) { return x > y ? x : y; }
static inline int min(int x, int y) { return x < y ? x : y; }
StorageFunctionListController::StorageFunctionListController(Responder * parentResponder, ButtonRowController * header, ButtonRowController * footer, I18n::Message text) :
StorageExpressionModelListController(parentResponder, text),
@@ -81,6 +82,42 @@ int StorageFunctionListController::indexFromCumulatedWidth(KDCoordinate offsetX)
}
}
int StorageFunctionListController::indexFromCumulatedHeight(KDCoordinate offsetY) {
if (offsetY == 0) {
return 0;
}
/* We use memoization to speed up this method: if offsetY is "around" the
* memoized cumulatedHeightForIndex, we can compute its value easily by
* adding/substracting memoized row heights. */
int currentSelectedRow = selectedRow();
int rowsCount = numberOfRows();
if (rowsCount <= 1 || currentSelectedRow < 1) {
return TableViewDataSource::indexFromCumulatedHeight(offsetY);
}
KDCoordinate currentCumulatedHeight = cumulatedHeightFromIndex(currentSelectedRow);
if (offsetY > currentCumulatedHeight) {
int iMax = min(k_memoizedCellHeightsCount/2 + 1, rowsCount - currentSelectedRow);
for (int i = 0; i < iMax; i++) {
currentCumulatedHeight+= rowHeight(currentSelectedRow + i);
if (offsetY <= currentCumulatedHeight) {
return currentSelectedRow + i;
}
}
} else {
int iMax = min(k_memoizedCellHeightsCount/2, currentSelectedRow);
for (int i = 1; i <= iMax; i++) {
currentCumulatedHeight-= rowHeight(currentSelectedRow-i);
if (offsetY > currentCumulatedHeight) {
return currentSelectedRow - i;
}
}
}
return TableViewDataSource::indexFromCumulatedHeight(offsetY);
}
int StorageFunctionListController::typeAtLocation(int i, int j) {
if (isAddEmptyRow(j)){
return i + 2;

1
apps/shared/storage_function_list_controller.h
View File

@@ -26,6 +26,7 @@ public:
KDCoordinate cumulatedWidthFromIndex(int i) override;
KDCoordinate cumulatedHeightFromIndex(int j) override;
int indexFromCumulatedWidth(KDCoordinate offsetX) override;
int indexFromCumulatedHeight(KDCoordinate offsetY) override;
int typeAtLocation(int i, int j) override;
HighlightCell * reusableCell(int index, int type) override;
int reusableCellCount(int type) override;