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

[apps/regression] Only uniformize c if needed

Browse Source
This commit is contained in:
Hugo Saint-Vignes
2020-12-09 17:27:59 +01:00
committed by LeaNumworks
parent 6e318593ae
commit 78cb340065
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,13 +114,15 @@ void TrigonometricModel::uniformizeCoefficientsFromFit(double * modelCoefficient
modelCoefficients[2] *= -1.0;
modelCoefficients[2] += piInAngleUnit;
}
/* C must be between -π (excluded) and π (included).
* A * sin(B * x + C) + D = A * sin(B * x + C - 2π) = A * sin(B * x + C + 2π)
* Using remainder(C,2π) = C - 2π * round(C / 2π) */
modelCoefficients[2] -= 2.0 * piInAngleUnit * std::round(modelCoefficients[2] / (2.0 * piInAngleUnit));
if (modelCoefficients[2] == -piInAngleUnit) {
// Keep π instead of -π
modelCoefficients[2] = piInAngleUnit;
// C must be between -π (excluded) and π (included).
if (modelCoefficients[2] <= -piInAngleUnit || modelCoefficients[2] > piInAngleUnit) {
/* A*sin(B*x + C) + D = A*sin(B*x + C - 2π) = A*sin(B*x + C + 2π)
* Using remainder(C,2π) = C - 2π * round(C / 2π) */
modelCoefficients[2] -= 2.0 * piInAngleUnit * std::round(modelCoefficients[2] / (2.0 * piInAngleUnit));
if (modelCoefficients[2] == -piInAngleUnit) {
// Keep π instead of -π
modelCoefficients[2] = piInAngleUnit;
}
}
}