rusefi
/
custom-board-bundle-sample-fork-of-rusefi
mirror of https://github.com/rusefi/custom-board-bundle-sample-fork-of-rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make the test legible (#2834)

This commit is contained in:
Matthew Kennedy 2021-06-18 19:53:22 -07:00 committed by GitHub
parent b3e47b493b
commit a4e3e28d14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
unit_tests/test_basic_math/test_interpolation_3d.cpp
View File

@ -28,6 +28,8 @@ static float getValue(float rpm, float maf) {
return x.getValue(rpm, maf); return x.getValue(rpm, maf);
} }
#define EXPECT_NEAR_M4(a, b) EXPECT_NEAR(a, b, 1e-4)
static void newTestToComfirmInterpolation() { static void newTestToComfirmInterpolation() {
// here's how the table loos like: // here's how the table loos like:
// //
@ -40,74 +42,73 @@ static void newTestToComfirmInterpolation() {
// let's start by testing corners // let's start by testing corners
ASSERT_EQ(3, getValue(/*rpm*/200, 2)); EXPECT_NEAR_M4(3, getValue(/*rpm*/200, 2));
ASSERT_NEAR( 4, getValue(/*rpm*/200, 3), EPS4D) << "low rpm high load"; EXPECT_NEAR_M4(4, getValue(/*rpm*/200, 3)) << "low rpm high load";
ASSERT_EQ(10, getValue(/*rpm*/300, 2)); EXPECT_NEAR_M4(10, getValue(/*rpm*/300, 2));
ASSERT_EQ(200, getValue(/*rpm*/300, 3)); EXPECT_NEAR_M4(200, getValue(/*rpm*/300, 3));
// now testing middles of cell sides // now testing middles of cell sides
assertEqualsM("low rpm middle", 3.5, getValue(/*rpm*/200, 2.5)); EXPECT_NEAR_M4(3.5, getValue(/*rpm*/200, 2.5)) << "low rpm middle";
ASSERT_EQ( 105, getValue(/*rpm*/300, 2.5)) << "high rpm "; EXPECT_NEAR_M4(105, getValue(/*rpm*/300, 2.5)) << "high rpm";
assertEqualsM("low load middle", 6.5, getValue(/*rpm*/250, 2)); EXPECT_NEAR_M4(6.5, getValue(/*rpm*/250, 2)) << "low load middle";
ASSERT_NEAR( 102, getValue(/*rpm*/250, 3), EPS4D) << " "; EXPECT_NEAR_M4(102, getValue(/*rpm*/250, 3));
// slowly go from middle side towards center // slowly go from middle side towards center
assertEqualsM("middle @ 2.1 ",16.05, getValue(/*rpm*/250, 2.1)); EXPECT_NEAR_M4(16.05, getValue(/*rpm*/250, 2.1)) << "middle @ 2.1";
assertEqualsM("middle @ 2.2 ",25.6, getValue(/*rpm*/250, 2.2)); EXPECT_NEAR_M4(25.6, getValue(/*rpm*/250, 2.2)) << "middle @ 2.2";
assertEqualsM("middle @ 2.3 ",35.15, getValue(/*rpm*/250, 2.3)); EXPECT_NEAR_M4(35.15, getValue(/*rpm*/250, 2.3)) << "middle @ 2.3";
assertEqualsM("middle cell ", 54.25, getValue(/*rpm*/250, 2.5)); EXPECT_NEAR_M4(54.25, getValue(/*rpm*/250, 2.5)) << "middle cell";
// issue #604: interpolation outside of the table // issue #604: interpolation outside of the table
// X above the range // X above the range
assertEqualsM("800 @ 2.1 ",230, getValue(/*rpm*/800, 2.1)); EXPECT_NEAR_M4(230, getValue(/*rpm*/800, 2.1)) << "800 @ 2.1";
assertEqualsM("800 @ 2.3 ",290, getValue(/*rpm*/800, 2.3)); EXPECT_NEAR_M4(290, getValue(/*rpm*/800, 2.3)) << "800 @ 2.3";
assertEqualsM("800 @ 3.3 ",530, getValue(/*rpm*/800, 3.3)); EXPECT_NEAR_M4(530, getValue(/*rpm*/800, 3.3)) << "800 @ 3.3";
// X below the range // X below the range
assertEqualsM("-810 @ 2.1 ",2.1, getValue(/*rpm*/-810, 2.1)); EXPECT_NEAR_M4(2.1, getValue(/*rpm*/-810, 2.1)) << "-810 @ 2.1";
assertEqualsM("-820 @ 2.3 ",2.3, getValue(/*rpm*/-820, 2.3)); EXPECT_NEAR_M4(2.3, getValue(/*rpm*/-820, 2.3)) << "-820 @ 2.3";
// Y above the range // Y above the range
ASSERT_EQ( 330, getValue(/*rpm*/310, 12.1)) << "310 @ 12.1 "; EXPECT_NEAR_M4(330, getValue(/*rpm*/310, 12.1)) << "310 @ 12.1";
ASSERT_EQ( 360, getValue(/*rpm*/320, 12.3)) << "320 @ 12.3 "; EXPECT_NEAR_M4(360, getValue(/*rpm*/320, 12.3)) << "320 @ 12.3";
// Y below the range // Y below the range
assertEqualsM("310 @ -12.1 ", 3.1, getValue(/*rpm*/310, -12.1)); EXPECT_NEAR_M4(3.1, getValue(/*rpm*/310, -12.1)) << "310 @ -12.1";
assertEqualsM("320 @ -12.3 ", 3.2, getValue(/*rpm*/320, -12.3)); EXPECT_NEAR_M4(3.2, getValue(/*rpm*/320, -12.3)) << "320 @ -12.3";
} }
TEST(misc, testInterpolate3d) { TEST(misc, testInterpolate3d) {
printf("*** no interpolation here 1\r\n"); printf("*** no interpolation here 1\r\n");
ASSERT_FLOAT_EQ(2, getValue(100, 2)); EXPECT_NEAR_M4(2, getValue(100, 2));
printf("*** no interpolation here 2\r\n"); printf("*** no interpolation here 2\r\n");
ASSERT_NEAR(5, getValue(200, 4), EPS4D); EXPECT_NEAR_M4(5, getValue(200, 4));
printf("*** rpm interpolated value expected1\r\n"); printf("*** rpm interpolated value expected1\r\n");
ASSERT_FLOAT_EQ(2.5, getValue(150, 2)); EXPECT_NEAR_M4(2.5, getValue(150, 2));
printf("*** rpm interpolated value expected2\r\n"); printf("*** rpm interpolated value expected2\r\n");
ASSERT_FLOAT_EQ(102, getValue(250, 3)); EXPECT_NEAR_M4(102, getValue(250, 3));
printf("*** both rpm and maf interpolated value expected\r\n"); printf("*** both rpm and maf interpolated value expected\r\n");
ASSERT_FLOAT_EQ(361, getValue(335.3, 3.551)); EXPECT_NEAR_M4(361, getValue(335.3, 3.551));
printf("*** both rpm and maf interpolated value expected 2\r\n"); printf("*** both rpm and maf interpolated value expected 2\r\n");
ASSERT_FLOAT_EQ(203.6, getValue(410.01, 2.012)); EXPECT_NEAR_M4(203.6, getValue(410.01, 2.012));
printf("*** both rpm and maf interpolated value expected 3\r\n"); printf("*** both rpm and maf interpolated value expected 3\r\n");
ASSERT_FLOAT_EQ(600, getValue(1000000, 1000)); EXPECT_NEAR_M4(600, getValue(1000000, 1000));
printf("*** both rpm and maf interpolated value expected 4\r\n"); printf("*** both rpm and maf interpolated value expected 4\r\n");
ASSERT_FLOAT_EQ(4, getValue(410.01, -1)); EXPECT_NEAR_M4(4, getValue(410.01, -1));
ASSERT_FLOAT_EQ(1, getValue(-1, -1)); EXPECT_NEAR_M4(1, getValue(-1, -1));
newTestToComfirmInterpolation(); newTestToComfirmInterpolation();
} }