Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[sysid] Fix adjusted R² calculation (#6101)

Browse Source 
It hardcoded p to 2.
This commit is contained in:
Tyler Veness
2023-12-26 20:06:10 -08:00
committed by GitHub
parent 5659038443
commit f2c2bab7dc
9 changed files with 147 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sysid/src/test/native/cpp/analysis/OLSTest.cpp
View File

@@ -11,12 +11,12 @@ TEST(OLSTest, TwoVariablesTwoPoints) {
Eigen::MatrixXd X{{1.0, 1.0}, {1.0, 2.0}};
Eigen::VectorXd y{{3.0}, {5.0}};
auto [coefficients, cod, rmse] = sysid::OLS(X, y);
EXPECT_EQ(coefficients.size(), 2u);
auto [coeffs, rSquared, rmse] = sysid::OLS(X, y);
EXPECT_EQ(coeffs.size(), 2u);
EXPECT_NEAR(coefficients[0], 1.0, 0.05);
EXPECT_NEAR(coefficients[1], 2.0, 0.05);
EXPECT_NEAR(cod, 1.0, 1E-4);
EXPECT_NEAR(coeffs[0], 1.0, 0.05);
EXPECT_NEAR(coeffs[1], 2.0, 0.05);
EXPECT_NEAR(rSquared, 1.0, 1e-4);
}
TEST(OLSTest, TwoVariablesFivePoints) {
@@ -25,12 +25,12 @@ TEST(OLSTest, TwoVariablesFivePoints) {
Eigen::MatrixXd X{{1, 2}, {1, 3}, {1, 5}, {1, 7}, {1, 9}};
Eigen::VectorXd y{{4}, {5}, {7}, {10}, {15}};
auto [coefficients, cod, rmse] = sysid::OLS(X, y);
EXPECT_EQ(coefficients.size(), 2u);
auto [coeffs, rSquared, rmse] = sysid::OLS(X, y);
EXPECT_EQ(coeffs.size(), 2u);
EXPECT_NEAR(coefficients[0], 0.305, 0.05);
EXPECT_NEAR(coefficients[1], 1.518, 0.05);
EXPECT_NEAR(cod, 0.985, 0.05);
EXPECT_NEAR(coeffs[0], 0.305, 0.05);
EXPECT_NEAR(coeffs[1], 1.518, 0.05);
EXPECT_NEAR(rSquared, 0.985, 0.05);
}
#ifndef NDEBUG