Revert "Fix for #712 "Incorrect rollover digital numbers""

This reverts commit 11bfaf0e91.
This commit is contained in:
Frank Haverland
2022-07-20 19:12:19 +02:00
parent a0ffc88e47
commit 3f3532defe
4 changed files with 3 additions and 73 deletions

View File

@@ -5,7 +5,6 @@ class UnderTest : public ClassFlowCNNGeneral {
public:
using ClassFlowCNNGeneral::ZeigerEval;
using ClassFlowCNNGeneral::ZeigerEvalHybrid;
using ClassFlowCNNGeneral::ZeigerEvalDigital;
using ClassFlowCNNGeneral::ClassFlowCNNGeneral;
};
@@ -45,12 +44,6 @@ void test_ZeigerEval()
// the 4.5 (digital100) is not above 5 and the previous digit (analog) too (9.6)
TEST_ASSERT_EQUAL(4, undertest.ZeigerEval(4.5, 0));
// the 5.5 (digital100) is not above 6 and the previous digit (analog) not over Zero (9.7)
TEST_ASSERT_EQUAL(5, undertest.ZeigerEval(5.5, 9));
// the 5.0 (digital100) and the previous digit (analog) not over Zero (9.5). The transition is not completed
TEST_ASSERT_EQUAL(4, undertest.ZeigerEval(5.0, 9));
}
/**
@@ -91,24 +84,9 @@ void test_ZeigerEvalHybrid() {
TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(4.5, 9.6, 0));
// the 4.5 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.6)
TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(4.5, 9.6, 9));
// the 4.5 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.5)
TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(4.5, 9.5, 9));
//56.95797
TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(4.5, 9.6, 9));
// the 4.4 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.5)
TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalHybrid(5.5, 9.7, 9));
// the 5.0 (digital100) and the previous digit (analog) not over Zero (9.5). The transition is not completed
TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(5.0, 9.7, 9));
TEST_ASSERT_EQUAL(4, undertest.ZeigerEvalHybrid(4.5, 9.5, 9));
}
void test_ZeigerEvalDigital() {
UnderTest undertest = UnderTest(nullptr, Digital);
// the 4.4 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.5)
TEST_ASSERT_EQUAL(5, undertest.ZeigerEvalDigital(5.0, 9.7, 9));
}