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

[apps/reg/stats] Share StoreContext

Browse Source
This commit is contained in:
Léa Saviot
2018-06-11 11:02:57 +02:00
parent 2723e37c00
commit d44459bba2
13 changed files with 108 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/regression/regression_context.cpp
View File

@@ -8,10 +8,6 @@ using namespace Shared;
namespace Regression {
void RegressionContext::setExpressionForSymbolName(const Expression * expression, const Symbol * symbol, Context & context) {
m_parentContext->setExpressionForSymbolName(expression, symbol, context);
}
const Expression * RegressionContext::expressionForSymbol(const Symbol * symbol) {
if (Symbol::isRegressionSymbol(symbol->name())) {
const char * seriesName = Symbol::textForSpecialSymbols(symbol->name());

17
apps/regression/regression_context.h
View File

@@ -2,25 +2,14 @@
#define REGRESSION_REGRESSION_CONTEXT_H
#include <poincare/context.h>
#include "../shared/double_pair_store.h"
#include "../shared/store_context.h"
namespace Regression {
class RegressionContext : public Poincare::Context {
class RegressionContext : public Shared::StoreContext {
public:
RegressionContext(Shared::DoublePairStore * store, Poincare::Context * parentContext = nullptr) :
Poincare::Context(),
m_store(store),
m_seriesPairIndex(-1),
m_parentContext(parentContext)
{}
void setSeriesPairIndex(int j) { m_seriesPairIndex = j; }
void setExpressionForSymbolName(const Poincare::Expression * expression, const Poincare::Symbol * symbol, Poincare::Context & context) override;
using Shared::StoreContext::StoreContext;
const Poincare::Expression * expressionForSymbol(const Poincare::Symbol * symbol) override;
private:
Shared::DoublePairStore * m_store;
int m_seriesPairIndex;
Poincare::Context * m_parentContext;
};
}

40
apps/regression/store_controller.cpp
View File

@@ -15,10 +15,16 @@ namespace Regression {
StoreController::StoreController(Responder * parentResponder, Store * store, ButtonRowController * header) :
Shared::StoreController(parentResponder, store, header),
m_titleCells{}
m_titleCells{},
m_regressionContext(store)
{
}
StoreContext * StoreController::storeContext() {
m_regressionContext.setParentContext(const_cast<AppsContainer *>(static_cast<const AppsContainer *>(app()->container()))->globalContext());
return &m_regressionContext;
}
void StoreController::setFormulaLabel() {
int series = selectedColumn() / Store::k_numberOfColumnsPerSeries;
int isXColumn = selectedColumn() % Store::k_numberOfColumnsPerSeries == 0;
@@ -27,37 +33,7 @@ void StoreController::setFormulaLabel() {
}
void StoreController::fillColumnWithFormula(Expression * formula) {
int currentColumn = selectedColumn();
// Fetch the series used in the formula to compute the size of the filled in series
char variables[7] = {0, 0, 0, 0, 0, 0, 0};
formula->getVariables(Symbol::isRegressionSymbol, variables);
int numberOfValuesToCompute = -1;
int index = 0;
while (variables[index] != 0) {
const char * seriesName = Symbol::textForSpecialSymbols(variables[index]);
assert(strlen(seriesName) == 2);
int series = (int)(seriesName[1] - '0') - 1;
assert(series >= 0 && series < DoublePairStore::k_numberOfSeries);
if (numberOfValuesToCompute == -1) {
numberOfValuesToCompute = m_store->numberOfPairsOfSeries(series);
} else {
numberOfValuesToCompute = min(numberOfValuesToCompute, m_store->numberOfPairsOfSeries(series));
}
index++;
}
if (numberOfValuesToCompute == -1) {
numberOfValuesToCompute = m_store->numberOfPairsOfSeries(selectedColumn()/DoublePairStore::k_numberOfColumnsPerSeries);
}
RegressionContext regressionContext(m_store, const_cast<AppsContainer *>(static_cast<const AppsContainer *>(app()->container()))->globalContext());
for (int j = 0; j < numberOfValuesToCompute; j++) {
// Set the context
regressionContext.setSeriesPairIndex(j);
// Compute the new value using the formula
double evaluation = formula->approximateToScalar<double>(regressionContext);
setDataAtLocation(evaluation, currentColumn, j + 1);
}
selectableTableView()->reloadData();
privateFillColumnWithFormula(formula, Symbol::isRegressionSymbol);
}
void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int j) {

3
apps/regression/store_controller.h
View File

@@ -3,6 +3,7 @@
#include <escher.h>
#include "store.h"
#include "regression_context.h"
#include "../shared/store_controller.h"
#include "../shared/store_title_cell.h"
@@ -11,6 +12,7 @@ namespace Regression {
class StoreController : public Shared::StoreController {
public:
StoreController(Responder * parentResponder, Store * store, ButtonRowController * header);
Shared::StoreContext * storeContext() override;
void setFormulaLabel() override;
void fillColumnWithFormula(Poincare::Expression * formula) override;
void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
@@ -19,6 +21,7 @@ private:
View * loadView() override;
void unloadView(View * view) override;
Shared::StoreTitleCell * m_titleCells[k_numberOfTitleCells];
RegressionContext m_regressionContext;
};
}

1
apps/shared/Makefile
View File

@@ -46,6 +46,7 @@ app_objs += $(addprefix apps/shared/,\
separator_even_odd_buffer_text_cell.o\
simple_interactive_curve_view_controller.o\
store_cell.o\
store_context.o\
store_controller.o\
store_parameter_controller.o\
store_selectable_table_view.o\

14
apps/shared/store_context.cpp Normal file
View File

@@ -0,0 +1,14 @@
#include "store_context.h"
#include <poincare/decimal.h>
#include <assert.h>
#include <string.h>
using namespace Poincare;
namespace Shared {
void StoreContext::setExpressionForSymbolName(const Expression * expression, const Symbol * symbol, Context & context) {
m_parentContext->setExpressionForSymbolName(expression, symbol, context);
}
}

28
apps/shared/store_context.h Normal file
View File

@@ -0,0 +1,28 @@
#ifndef SHARED_STORE_CONTEXT_H
#define SHARED_STORE_CONTEXT_H
#include <poincare/context.h>
#include "double_pair_store.h"
namespace Shared {
class StoreContext : public Poincare::Context {
public:
StoreContext(Shared::DoublePairStore * store) :
Poincare::Context(),
m_store(store),
m_seriesPairIndex(-1),
m_parentContext(nullptr)
{}
void setParentContext(Poincare::Context * parentContext) { m_parentContext = parentContext; }
void setSeriesPairIndex(int j) { m_seriesPairIndex = j; }
void setExpressionForSymbolName(const Poincare::Expression * expression, const Poincare::Symbol * symbol, Poincare::Context & context) override;
protected:
Shared::DoublePairStore * m_store;
int m_seriesPairIndex;
Poincare::Context * m_parentContext;
};
}
#endif

34
apps/shared/store_controller.cpp
View File

@@ -268,6 +268,40 @@ void StoreController::unloadView(View * view) {
delete view;
}
void StoreController::privateFillColumnWithFormula(Expression * formula, Expression::isVariableTest isVariable) {
int currentColumn = selectedColumn();
// Fetch the series used in the formula to compute the size of the filled in series
char variables[7] = {0, 0, 0, 0, 0, 0, 0};
formula->getVariables(isVariable, variables);
int numberOfValuesToCompute = -1;
int index = 0;
while (variables[index] != 0) {
const char * seriesName = Symbol::textForSpecialSymbols(variables[index]);
assert(strlen(seriesName) == 2);
int series = (int)(seriesName[1] - '0') - 1;
assert(series >= 0 && series < DoublePairStore::k_numberOfSeries);
if (numberOfValuesToCompute == -1) {
numberOfValuesToCompute = m_store->numberOfPairsOfSeries(series);
} else {
numberOfValuesToCompute = min(numberOfValuesToCompute, m_store->numberOfPairsOfSeries(series));
}
index++;
}
if (numberOfValuesToCompute == -1) {
numberOfValuesToCompute = m_store->numberOfPairsOfSeries(selectedColumn()/DoublePairStore::k_numberOfColumnsPerSeries);
}
StoreContext * store = storeContext();
for (int j = 0; j < numberOfValuesToCompute; j++) {
// Set the context
store->setSeriesPairIndex(j);
// Compute the new value using the formula
double evaluation = formula->approximateToScalar<double>(*store);
setDataAtLocation(evaluation, currentColumn, j + 1);
}
selectableTableView()->reloadData();
}
bool StoreController::cellShouldBeTransparent(int i, int j) {
int seriesIndex = i/DoublePairStore::k_numberOfColumnsPerSeries;
return j > 1 + m_store->numberOfPairsOfSeries(seriesIndex);

3
apps/shared/store_controller.h
View File

@@ -6,6 +6,7 @@
#include "editable_cell_table_view_controller.h"
#include "double_pair_store.h"
#include "store_cell.h"
#include "store_context.h"
#include "store_parameter_controller.h"
#include "store_selectable_table_view.h"
@@ -15,6 +16,7 @@ class StoreController : public EditableCellTableViewController, public ButtonRow
public:
StoreController(Responder * parentResponder, DoublePairStore * store, ButtonRowController * header);
virtual StoreContext * storeContext() = 0;
void displayFormulaInput();
virtual void setFormulaLabel() = 0;
virtual void fillColumnWithFormula(Poincare::Expression * formula) = 0;
@@ -83,6 +85,7 @@ protected:
virtual HighlightCell * titleCells(int index) = 0;
char m_draftTextBuffer[TextField::maxBufferSize()];
int seriesAtColumn(int column) const { return column / DoublePairStore::k_numberOfColumnsPerSeries; }
void privateFillColumnWithFormula(Poincare::Expression * formula, Poincare::Expression::isVariableTest isVariable);
StoreCell * m_editableCells[k_maxNumberOfEditableCells];
DoublePairStore * m_store;
StoreParameterController m_storeParameterController;

4
apps/statistics/statistics_context.cpp
View File

@@ -8,10 +8,6 @@ using namespace Shared;
namespace Statistics {
void StatisticsContext::setExpressionForSymbolName(const Expression * expression, const Symbol * symbol, Context & context) {
m_parentContext->setExpressionForSymbolName(expression, symbol, context);
}
const Expression * StatisticsContext::expressionForSymbol(const Symbol * symbol) {
if (Symbol::isSeriesSymbol(symbol->name())) {
const char * seriesName = Symbol::textForSpecialSymbols(symbol->name());

18
apps/statistics/statistics_context.h
View File

@@ -1,26 +1,14 @@
#ifndef STATISTICS_STATISTICS_CONTEXT_H
#define STATISTICS_STATISTICS_CONTEXT_H
#include <poincare/context.h>
#include "../shared/double_pair_store.h"
#include "../shared/store_context.h"
namespace Statistics {
class StatisticsContext : public Poincare::Context {
class StatisticsContext : public Shared::StoreContext {
public:
StatisticsContext(Shared::DoublePairStore * store, Poincare::Context * parentContext = nullptr) :
Poincare::Context(),
m_store(store),
m_seriesPairIndex(-1),
m_parentContext(parentContext)
{}
void setSeriesPairIndex(int j) { m_seriesPairIndex = j; }
void setExpressionForSymbolName(const Poincare::Expression * expression, const Poincare::Symbol * symbol, Poincare::Context & context) override;
using Shared::StoreContext::StoreContext;
const Poincare::Expression * expressionForSymbol(const Poincare::Symbol * symbol) override;
private:
Shared::DoublePairStore * m_store;
int m_seriesPairIndex;
Poincare::Context * m_parentContext;
};
}

40
apps/statistics/store_controller.cpp
View File

@@ -15,10 +15,16 @@ namespace Statistics {
StoreController::StoreController(Responder * parentResponder, Store * store, ButtonRowController * header) :
Shared::StoreController(parentResponder, store, header),
m_titleCells{},
m_store(store)
m_store(store),
m_statisticsContext(m_store)
{
}
StoreContext * StoreController::storeContext() {
m_statisticsContext.setParentContext(const_cast<AppsContainer *>(static_cast<const AppsContainer *>(app()->container()))->globalContext());
return &m_statisticsContext;
}
void StoreController::setFormulaLabel() {
int series = selectedColumn() / Store::k_numberOfColumnsPerSeries;
int isValueColumn = selectedColumn() % Store::k_numberOfColumnsPerSeries == 0;
@@ -27,37 +33,7 @@ void StoreController::setFormulaLabel() {
}
void StoreController::fillColumnWithFormula(Expression * formula) {
int currentColumn = selectedColumn();
// Fetch the series used in the formula to compute the size of the filled in series
char variables[7] = {0, 0, 0, 0, 0, 0, 0};
formula->getVariables(Symbol::isSeriesSymbol, variables);
int numberOfValuesToCompute = -1;
int index = 0;
while (variables[index] != 0) {
const char * seriesName = Symbol::textForSpecialSymbols(variables[index]);
assert(strlen(seriesName) == 2);
int series = (int)(seriesName[1] - '0') - 1;
assert(series >= 0 && series < DoublePairStore::k_numberOfSeries);
if (numberOfValuesToCompute == -1) {
numberOfValuesToCompute = m_store->numberOfPairsOfSeries(series);
} else {
numberOfValuesToCompute = min(numberOfValuesToCompute, m_store->numberOfPairsOfSeries(series));
}
index++;
}
if (numberOfValuesToCompute == -1) {
numberOfValuesToCompute = m_store->numberOfPairsOfSeries(selectedColumn()/DoublePairStore::k_numberOfColumnsPerSeries);
}
StatisticsContext seriesContext(m_store, const_cast<AppsContainer *>(static_cast<const AppsContainer *>(app()->container()))->globalContext());
for (int j = 0; j < numberOfValuesToCompute; j++) {
// Set the context
seriesContext.setSeriesPairIndex(j);
// Compute the new value using the formula
double evaluation = formula->approximateToScalar<double>(seriesContext);
setDataAtLocation(evaluation, currentColumn, j + 1);
}
selectableTableView()->reloadData();
privateFillColumnWithFormula(formula, Symbol::isSeriesSymbol);
}
void StoreController::willDisplayCellAtLocation(HighlightCell * cell, int i, int j) {

3
apps/statistics/store_controller.h
View File

@@ -3,6 +3,7 @@
#include <escher.h>
#include "store.h"
#include "statistics_context.h"
#include "../shared/store_controller.h"
#include "../shared/store_title_cell.h"
@@ -11,6 +12,7 @@ namespace Statistics {
class StoreController : public Shared::StoreController {
public:
StoreController(Responder * parentResponder, Store * store, ButtonRowController * header);
Shared::StoreContext * storeContext() override;
void setFormulaLabel() override;
void fillColumnWithFormula(Poincare::Expression * formula) override;
void willDisplayCellAtLocation(HighlightCell * cell, int i, int j) override;
@@ -21,6 +23,7 @@ private:
void unloadView(View * view) override;
Shared::StoreTitleCell * m_titleCells[k_numberOfTitleCells];
Store * m_store;
StatisticsContext m_statisticsContext;
};
}