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

[apps/reg] Display correct formula in banner view

Browse Source
This commit is contained in:
Léa Saviot
2018-06-07 17:09:29 +02:00
committed by Émilie Feral
parent 799bbfbf05
commit f885923957
13 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/regression/Makefile
View File

@@ -39,6 +39,7 @@ i18n_files += $(addprefix apps/regression/,\
base.es.i18n\
base.fr.i18n\
base.pt.i18n\
base.universal.i18n\
)
app_images += apps/regression/regression_icon.png

4
apps/regression/graph_controller.cpp
View File

@@ -82,8 +82,8 @@ void GraphController::reloadBannerView() {
return;
}
m_bannerView.setMessageAtIndex(I18n::Message::RegressionFormula, 3);
Model * model = m_store->modelForSeries(selectedSeriesIndex());
m_bannerView.setMessageAtIndex(model->formulaMessage(), 3);
char buffer[k_maxNumberOfCharacters + PrintFloat::bufferSizeForFloatsWithPrecision(Constant::LargeNumberOfSignificantDigits)];
int numberOfChar = 0;
const char * legend = " P(";

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

@@ -10,6 +10,7 @@ class CubicModel : public Model {
public:
using Model::Model;
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::CubicRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;

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

@@ -10,6 +10,7 @@ class ExponentialModel : public Model {
public:
using Model::Model;
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::ExponentialRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;

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

@@ -10,6 +10,7 @@ class LinearModel : public Model {
public:
using Model::Model;
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::LinearRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
double levelSet(double * modelCoefficients, double y) const override;
virtual void fit(Store * store, int series, double * modelCoefficients, Poincare::Context * context) override;

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

@@ -10,6 +10,7 @@ class LogarithmicModel : public Model {
public:
using Model::Model;
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::LogarithmicRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;

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

@@ -10,6 +10,7 @@ class LogisticModel : public Model {
public:
using Model::Model;
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::LogisticRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;

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

@@ -2,6 +2,7 @@
#define REGRESSION_MODEL_H
#include <stdint.h>
#include "../../i18n.h"
#include <poincare/context.h>
#include <poincare/expression.h>
@@ -26,6 +27,7 @@ public:
static constexpr int k_maxNumberOfCoefficients = 5;
virtual ~Model() = default;
virtual Poincare::ExpressionLayout * layout() = 0;
virtual I18n::Message formulaMessage() const = 0;
virtual double evaluate(double * modelCoefficients, double x) const = 0;
virtual double levelSet(double * modelCoefficients, double y) const = 0;
virtual void fit(Store * store, int series, double * modelCoefficients, Poincare::Context * context);

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

@@ -10,6 +10,7 @@ class PowerModel : public Model {
public:
using Model::Model;
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::PowerRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;

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

@@ -10,6 +10,7 @@ class QuadraticModel : public Model {
public:
using Model::Model;
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::QuadraticRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;

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

@@ -10,6 +10,7 @@ class QuarticModel : public Model {
public:
using Model::Model;
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::QuarticRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;

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

@@ -10,6 +10,7 @@ class TrigonometricModel : public Model {
public:
using Model::Model;
Poincare::ExpressionLayout * layout() override;
I18n::Message formulaMessage() const override { return I18n::Message::TrigonometricRegressionFormula; }
double evaluate(double * modelCoefficients, double x) const override;
double levelSet(double * modelCoefficients, double y) const override;
double partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const override;

1
apps/shared.universal.i18n
View File

@@ -51,7 +51,6 @@ QuoCommandWithArg = "quo(p,q)"
RandintCommandWithArg = "randint(a,b)"
RandomCommandWithArg = "random()"
ReCommandWithArg = "re(z)"
RegressionFormula = " D: y=ax+b "
RemCommandWithArg = "rem(p,q)"
RightIntegralFirstLegend = "P("
RightIntegralSecondLegend = "≤X)="