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

[apps/reg] Fix TrigonometricModel -> watch out for radians/degrees

Browse Source
This commit is contained in:
Léa Saviot
2018-06-05 18:04:27 +02:00
committed by Émilie Feral
parent 1283c943a4
commit 0e53da5cc4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,6 @@
#include "trigonometric_model.h"
#include <math.h>
#include <poincare/preferences.h>
#include <assert.h>
namespace Regression {
@@ -8,24 +9,26 @@ double TrigonometricModel::evaluate(double * modelCoefficients, double x) const
double a = modelCoefficients[0];
double b = modelCoefficients[1];
double c = modelCoefficients[2];
return a*sin(b*x+c);
double radianX = Poincare::Preferences::sharedPreferences()->angleUnit() == Poincare::Expression::AngleUnit::Radian ? x : x * M_PI/180.0;
return a*sin(b*radianX+c);
}
double TrigonometricModel::partialDerivate(double * modelCoefficients, int derivateCoefficientIndex, double x) const {
double a = modelCoefficients[0];
double b = modelCoefficients[1];
double c = modelCoefficients[2];
double radianX = Poincare::Preferences::sharedPreferences()->angleUnit() == Poincare::Expression::AngleUnit::Radian ? x : x * M_PI/180.0;
if (derivateCoefficientIndex == 0) {
// Derivate: sin(b*x+c)
return sin(b*x+c);
return sin(b*radianX+c);
}
if (derivateCoefficientIndex == 1) {
// Derivate: x*a*cos(b*x+c);
return x*a*cos(b*x+c);
return radianX*a*cos(b*radianX+c);
}
if (derivateCoefficientIndex == 2) {
// Derivate: a*cos(b*x+c)
return a*cos(b*x+c);
return a*cos(b*radianX+c);
}
assert(false);
return 0.0;