Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-11 22:16:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add analogdigit early zero crossing case

Browse Source
This commit is contained in:
Slider0007
2024-02-12 14:20:19 +01:00
parent b551eadf8a
commit 827ca1cf61
2 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
View File

@@ -195,7 +195,8 @@ int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_pred
// everything >=x.4 can be considered as current number in transition. With 9.x predecessor the current
// number can still be x.6 - x.7.
// Preceding (else - branch) does not already happen from 9.
if (Digital_Transition_Area_Forward>=number_of_predecessors || result_after_decimal_point >= 4)
if (((Digital_Transition_Area_Forward>=number_of_predecessors) && (eval_predecessors == (int)number_of_predecessors))
|| result_after_decimal_point >= 4)
// The current digit, like the previous digit, does not yet have a zero crossing.
result = result_before_decimal_point % 10;
else
@@ -229,6 +230,13 @@ int ClassFlowCNNGeneral::PointerEvalAnalogToDigitNew(float number, float numeral
" erg before comma: " + std::to_string(result_before_decimal_point) +
" erg after comma: " + std::to_string(result_after_decimal_point));
}
else if (result_after_decimal_point < Digital_Uncertainty && numeral_preceder > analogDigitalTransitionStart) {
result = ((result_before_decimal_point+10) - 1) % 10;
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - Digital Uncertainty - Too early zero crossing - Result = " + std::to_string(result) +
" number: " + std::to_string(number) + " numeral_preceder: " + std::to_string(numeral_preceder) +
" erg before comma: " + std::to_string(result_before_decimal_point) +
" erg after comma: " + std::to_string(result_after_decimal_point));
}
else {
result = (int) ((int) trunc(number) + 10) % 10;
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - NO digital Uncertainty - Result = " + std::to_string(result) +
@@ -238,7 +246,7 @@ int ClassFlowCNNGeneral::PointerEvalAnalogToDigitNew(float number, float numeral
// No zero crossing has taken place.
// Only eval_predecessors used because numeral_preceder could be wrong here.
// numeral_preceder<=0.1 & eval_predecessors=9 corresponds to analogue was reset because of previous analogue that are not yet at 0.
if ((eval_predecessors >= 3 && (numeral_preceder >= analogDigitalTransitionStart) && roundedUp))
if ((eval_predecessors >= 3 && (numeral_preceder > analogDigitalTransitionStart) && roundedUp))
{
result = ((result_before_decimal_point+10) - 1) % 10;
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - No correction = " + std::to_string(result) +

23
code/test/components/jomjol-flowcontroll/test_flowpostprocessing.cpp
View File

@@ -476,12 +476,18 @@ void test_doFlowPP3() {
expected_extended= "126.9231";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, 0);
undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
setAnalogdigitTransistionStart(undertestPost, 9.4); // Extreme late transition
result = process_doFlow(undertestPost);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
delete undertestPost;
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, 0);
undertestPost = init_do_flow(analogs, digits, Digital100, false, true, 0);
setAnalogdigitTransistionStart(undertestPost, 9.4); // Extreme late transition
result = process_doFlow(undertestPost);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
delete undertestPost;
// Fehler V12.0.1
// https://github.com/jomjol/AI-on-the-edge-device/issues/1110#issuecomment-1282168030
@@ -564,4 +570,17 @@ void test_doFlowPP_rainman110() {
result = process_doFlow(undertestPost);
TEST_ASSERT_EQUAL_STRING("418.2579", result.c_str());
delete undertestPost;
// Edge cases
undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
setAnalogdigitTransistionStart(undertestPost, 8.0);
TEST_ASSERT_EQUAL_STRING("99.50", process_doFlow({5.0, 0.0}, {9.9, 9.4},
Digital100, false, false, 0).c_str());
delete undertestPost;
undertestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
setAnalogdigitTransistionStart(undertestPost, 8.0);
TEST_ASSERT_EQUAL_STRING("99.95", process_doFlow({9.5, 5.0}, {1.0, 0.0, 0.0},
Digital100, false, false, 0).c_str());
delete undertestPost;
}