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

[apps/reg] Do not show "Yprediction given x" if not available

Browse Source
This commit is contained in:
Léa Saviot
2018-06-08 15:47:23 +02:00
committed by Émilie Feral
parent 94d21fb96a
commit 4b8462ed8a
15 changed files with 63 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/regression/graph_options_controller.cpp
View File

@@ -2,6 +2,7 @@
#include "app.h"
#include "graph_controller.h"
#include "regression_controller.h"
#include <apps/apps_container.h>
#include <assert.h>
using namespace Shared;
@@ -56,7 +57,11 @@ bool GraphOptionsController::handleEvent(Ion::Events::Event event) {
}
int GraphOptionsController::numberOfRows() {
return k_numberOfParameterCells + 1;
int series = m_graphController->selectedSeriesIndex();
Poincare::Context * globContext = const_cast<AppsContainer *>(static_cast<const AppsContainer *>(app()->container()))->globalContext();
double * coefs = m_store->coefficientsForSeries(series, globContext);
int numberOfParameterCells = m_store->modelForSeries(series)->levelSetAvailable(coefs) ? k_numberOfParameterCells : k_numberOfParameterCells - 1;
return numberOfParameterCells + 1;
}
KDCoordinate GraphOptionsController::rowHeight(int j) {
@@ -80,7 +85,8 @@ KDCoordinate GraphOptionsController::cumulatedHeightFromIndex(int j) {
int GraphOptionsController::indexFromCumulatedHeight(KDCoordinate offsetY) {
int result = 0;
int j = 0;
while (result < offsetY && j < numberOfRows()) {
int numberRows = numberOfRows();
while (result < offsetY && j < numberRows) {
result += rowHeight(j++);
}
return (result < offsetY || offsetY == 0) ? j : j - 1;
@@ -113,14 +119,14 @@ int GraphOptionsController::typeAtLocation(int i, int j) {
}
void GraphOptionsController::willDisplayCellForIndex(HighlightCell * cell, int index) {
if (index < k_numberOfParameterCells) {
MessageTableCellWithChevron * myCell = (MessageTableCellWithChevron *)cell;
I18n::Message titles[k_numberOfParameterCells] = {I18n::Message::XPrediction, I18n::Message::YPrediction};
myCell->setMessage(titles[index]);
} else {
assert(index == numberOfRows() - 1);
if (index == numberOfRows() - 1) {
m_changeRegressionCell.setExpressionLayout(static_cast<Store *>(m_store)->modelForSeries(m_graphController->selectedSeriesIndex())->layout());
return;
}
assert(index >=0 && index < k_numberOfParameterCells);
MessageTableCellWithChevron * myCell = (MessageTableCellWithChevron *)cell;
I18n::Message titles[k_numberOfParameterCells] = {I18n::Message::XPrediction, I18n::Message::YPrediction};
myCell->setMessage(titles[index]);
}
}

1
apps/regression/model/cubic_model.h
View File

@@ -12,6 +12,7 @@ public:
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::CubicRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
bool levelSetAvailable(double * modelCoefficients) const override { return false; }
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;
int numberOfCoefficients() const override { return 4; }

11
apps/regression/model/exponential_model.cpp
View File

@@ -32,10 +32,19 @@ double ExponentialModel::evaluate(double * modelCoefficients, double x) const {
return a*exp(b*x);
}
bool ExponentialModel::levelSetAvailable(double * modelCoefficients) const {
double a = modelCoefficients[0];
double b = modelCoefficients[1];
if (a == 0 || b == 0) {
return false;
}
return true;
}
double ExponentialModel::levelSet(double * modelCoefficients, double y) const {
double a = modelCoefficients[0];
double b = modelCoefficients[1];
if (a == 0 || b == 0 || y/a <= 0) {
if (!levelSetAvailable(modelCoefficients) || y/a <= 0) {
return NAN;
}
return log(y/a)/b;

1
apps/regression/model/exponential_model.h
View File

@@ -12,6 +12,7 @@ public:
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::ExponentialRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
bool levelSetAvailable(double * modelCoefficients) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;
int numberOfCoefficients() const override { return 2; }

1
apps/regression/model/linear_model.h
View File

@@ -12,6 +12,7 @@ public:
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::LinearRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
bool levelSetAvailable(double * modelCoefficients) const override { return true; }
double levelSet(double * modelCoefficients, double y) const override;
virtual void fit(Store * store, int series, double * modelCoefficients, Poincare::Context * context) override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;

11
apps/regression/model/logarithmic_model.cpp
View File

@@ -18,12 +18,17 @@ double LogarithmicModel::evaluate(double * modelCoefficients, double x) const {
return a*log(x)+b;
}
double LogarithmicModel::levelSet(double * modelCoefficients, double y) const {
bool LogarithmicModel::levelSetAvailable(double * modelCoefficients) const {
double a = modelCoefficients[0];
double b = modelCoefficients[1];
if (a == 0) {
return a != 0;
}
double LogarithmicModel::levelSet(double * modelCoefficients, double y) const {
if (!levelSetAvailable(modelCoefficients)) {
return NAN;
}
double a = modelCoefficients[0];
double b = modelCoefficients[1];
return exp((y-b)/a);
}

1
apps/regression/model/logarithmic_model.h
View File

@@ -12,6 +12,7 @@ public:
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::LogarithmicRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
bool levelSetAvailable(double * modelCoefficients) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;
int numberOfCoefficients() const override { return 2; }

12
apps/regression/model/logistic_model.cpp
View File

@@ -39,11 +39,21 @@ double LogisticModel::evaluate(double * modelCoefficients, double x) const {
return c/(1.0+a*exp(-b*x));
}
bool LogisticModel::levelSetAvailable(double * modelCoefficients) const {
double a = modelCoefficients[0];
double b = modelCoefficients[1];
double c = modelCoefficients[2];
if (a == 0 || b == 0 || c == 0) {
return false;
}
return true;
}
double LogisticModel::levelSet(double * modelCoefficients, double y) const {
double a = modelCoefficients[0];
double b = modelCoefficients[1];
double c = modelCoefficients[2];
if (a == 0 || b == 0 || c == 0 || y == 0) {
if (!levelSetAvailable(modelCoefficients) || y == 0) {
return NAN;
}
double lnArgument = (c/y - 1)/a;

1
apps/regression/model/logistic_model.h
View File

@@ -12,6 +12,7 @@ public:
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::LogisticRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
bool levelSetAvailable(double * modelCoefficients) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;
int numberOfCoefficients() const override { return 3; }

1
apps/regression/model/model.h
View File

@@ -29,6 +29,7 @@ public:
virtual Poincare::ExpressionLayout * layout() = 0;
virtual I18n::Message formulaMessage() const = 0;
virtual double evaluate(double * modelCoefficients, double x) const = 0;
virtual bool levelSetAvailable(double * modelCoefficients) const = 0;
virtual double levelSet(double * modelCoefficients, double y) const = 0;
virtual void fit(Store * store, int series, double * modelCoefficients, Poincare::Context * context);
virtual int numberOfCoefficients() const = 0;

11
apps/regression/model/power_model.cpp
View File

@@ -29,10 +29,19 @@ double PowerModel::evaluate(double * modelCoefficients, double x) const {
return a*pow(x,b);
}
bool PowerModel::levelSetAvailable(double * modelCoefficients) const {
double a = modelCoefficients[0];
double b = modelCoefficients[1];
if (a == 0 || b == 0) {
return false;
}
return true;
}
double PowerModel::levelSet(double * modelCoefficients, double y) const {
double a = modelCoefficients[0];
double b = modelCoefficients[1];
if (a == 0 || b == 0 || y/a <= 0) {
if (!levelSetAvailable(modelCoefficients) || y/a <= 0) {
return NAN;
}
return exp(log(y/a)/b);

1
apps/regression/model/power_model.h
View File

@@ -12,6 +12,7 @@ public:
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::PowerRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
bool levelSetAvailable(double * modelCoefficients) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;
int numberOfCoefficients() const override { return 2; }

1
apps/regression/model/quadratic_model.h
View File

@@ -12,6 +12,7 @@ public:
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::QuadraticRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
bool levelSetAvailable(double * modelCoefficients) const override { return false; }
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;
int numberOfCoefficients() const override { return 3; }

1
apps/regression/model/quartic_model.h
View File

@@ -12,6 +12,7 @@ public:
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::QuarticRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
bool levelSetAvailable(double * modelCoefficients) const override { return false; }
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;
int numberOfCoefficients() const override { return 5; }

1
apps/regression/model/trigonometric_model.h
View File

@@ -12,6 +12,7 @@ public:
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::TrigonometricRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
bool levelSetAvailable(double * modelCoefficients) const override { return false; }
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;
int numberOfCoefficients() const override { return 3; }