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

[poincare] Expression::ReductionContext

Browse Source
This commit is contained in:
Léa Saviot
2019-07-01 12:09:34 +02:00
committed by Émilie Feral
parent de2d9f7c57
commit 61cf762eef
177 changed files with 1458 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/shared/store_controller.cpp
View File

@@ -259,7 +259,7 @@ bool StoreController::privateFillColumnWithFormula(Expression formula, Expressio
char variables[Expression::k_maxNumberOfVariables][k_maxSizeOfStoreSymbols];
variables[0][0] = 0;
AppsContainer * appsContainer = AppsContainer::sharedAppsContainer();
int nbOfVariables = formula.getVariables(*(appsContainer->globalContext()), isVariable, (char *)variables, k_maxSizeOfStoreSymbols);
int nbOfVariables = formula.getVariables(appsContainer->globalContext(), isVariable, (char *)variables, k_maxSizeOfStoreSymbols);
(void) nbOfVariables; // Remove compilation warning of nused variable
assert(nbOfVariables >= 0);
int numberOfValuesToCompute = -1;
@@ -287,7 +287,7 @@ bool StoreController::privateFillColumnWithFormula(Expression formula, Expressio
// Set the context
store->setSeriesPairIndex(j);
// Compute the new value using the formula
double evaluation = PoincareHelpers::ApproximateToScalar<double>(formula, *store);
double evaluation = PoincareHelpers::ApproximateToScalar<double>(formula, store);
if (std::isnan(evaluation) || std::isinf(evaluation)) {
Container::activeApp()->displayWarning(I18n::Message::DataNotSuitable);
return false;
@@ -297,7 +297,7 @@ bool StoreController::privateFillColumnWithFormula(Expression formula, Expressio
// Fill in the table with the formula values
for (int j = 0; j < numberOfValuesToCompute; j++) {
store->setSeriesPairIndex(j);
double evaluation = PoincareHelpers::ApproximateToScalar<double>(formula, *store);
double evaluation = PoincareHelpers::ApproximateToScalar<double>(formula, store);
setDataAtLocation(evaluation, currentColumn, j + 1);
}
selectableTableView()->reloadData();