diff --git a/apps/graph/graph/banner_view.cpp b/apps/graph/graph/banner_view.cpp index fa900c652..7033a1d3c 100644 --- a/apps/graph/graph/banner_view.cpp +++ b/apps/graph/graph/banner_view.cpp @@ -11,7 +11,7 @@ BannerView::BannerView( ) : Shared::XYBannerView(parentResponder, inputEventHandlerDelegate, textFieldDelegate), m_derivativeView(Font(), 0.5f, 0.5f, TextColor(), BackgroundColor()), - m_tangentEquationView(Font(), I18n::Message::LinearRegressionFormula, 0.0f, 0.5f, TextColor(), BackgroundColor()), + m_tangentEquationView(Font(), I18n::Message::AffineRegressionFormula, 0.0f, 0.5f, TextColor(), BackgroundColor()), m_aView(Font(), 0.5f, 0.5f, TextColor(), BackgroundColor()), m_bView(Font(), 0.5f, 0.5f, TextColor(), BackgroundColor()), m_numberOfSubviews(Shared::XYBannerView::k_numberOfSubviews) diff --git a/apps/regression/base.universal.i18n b/apps/regression/base.universal.i18n index a1bf08724..f04c13b35 100644 --- a/apps/regression/base.universal.i18n +++ b/apps/regression/base.universal.i18n @@ -1,4 +1,4 @@ -AffineRegressionFormula = " y=a·x " +LinearRegressionFormula = " y=a·x " QuadraticRegressionFormula = " y=a·x^2+b·x+c " CubicRegressionFormula = " y=a·x^3+b·x^2+c·x+d " QuarticRegressionFormula = " y=a·x^4+b·x^3+c·x^2+d·x+e " diff --git a/apps/regression/model/affine_model.cpp b/apps/regression/model/affine_model.cpp index fc18ac3aa..0356b7991 100644 --- a/apps/regression/model/affine_model.cpp +++ b/apps/regression/model/affine_model.cpp @@ -1,4 +1,4 @@ -#include "linear_model.h" +#include "affine_model.h" #include "../store.h" #include #include diff --git a/apps/regression/model/affine_model.h b/apps/regression/model/affine_model.h index b2c0a7cd0..868664c21 100644 --- a/apps/regression/model/affine_model.h +++ b/apps/regression/model/affine_model.h @@ -1,5 +1,5 @@ -#ifndef REGRESSION_LINEAR_MODEL_H -#define REGRESSION_LINEAR_MODEL_H +#ifndef REGRESSION_AFFINE_MODEL_H +#define REGRESSION_AFFINE_MODEL_H #include "model.h" diff --git a/apps/regression/model/linear_model.cpp b/apps/regression/model/linear_model.cpp index 824500e09..0fc663f45 100644 --- a/apps/regression/model/linear_model.cpp +++ b/apps/regression/model/linear_model.cpp @@ -1,4 +1,4 @@ -#include "affine_model.h" +#include "linear_model.h" #include "../store.h" #include #include @@ -23,16 +23,14 @@ double LinearModel::evaluate(double * modelCoefficients, double x) const { double LinearModel::levelSet(double * modelCoefficients, double xMin, double step, double xMax, double y, Poincare::Context * context) { double a = modelCoefficients[0]; - double b = modelCoefficients[1]; - if (a == 0) { + if (a == 0.0) { return NAN; } - return y-b; + return y/a; } void LinearModel::fit(Store * store, int series, double * modelCoefficients, Poincare::Context * context) { modelCoefficients[0] = store->slope(series); - modelCoefficients[1] = store->yIntercept(series); } double LinearModel::partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const { @@ -40,10 +38,6 @@ double LinearModel::partialDerivate(double * modelCoefficients, int derivateCoef // Derivate: x return x; } - if (derivateCoefficientIndex == 1) { - // Derivate: 1; - return 1; - } assert(false); return 0.0; } diff --git a/apps/regression/model/linear_model.h b/apps/regression/model/linear_model.h index 4fb6fd886..d98dbd756 100644 --- a/apps/regression/model/linear_model.h +++ b/apps/regression/model/linear_model.h @@ -1,5 +1,5 @@ -#ifndef REGRESSION_AFFINE_MODEL_H -#define REGRESSION_AFFINE_MODEL_H +#ifndef REGRESSION_LINEAR_MODEL_H +#define REGRESSION_LINEAR_MODEL_H #include "model.h" diff --git a/apps/shared.universal.i18n b/apps/shared.universal.i18n index 2aa997b88..344244ab2 100644 --- a/apps/shared.universal.i18n +++ b/apps/shared.universal.i18n @@ -119,7 +119,7 @@ InvSortCommandWithArg = "sort>(L)" K = "k" Lambda = "λ" LcmCommandWithArg = "lcm(p,q)" -LinearRegressionFormula = " y=a·x+b " +AffineRegressionFormula = " y=a·x+b " LogCommandWithArg = "log(x,a)" MatrixCommand = "[[\x11]]" MatrixCommandWithArg = "[[1,2][3,4]]"