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-08 04:26:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix negatives on extended resolution false #2744 (#2772)

Browse Source 
* not extended resolution allows -1 on the lowest digit

* not extended resolution allows -1 on the lowest number

* negatives on last value digit with -1 will set to prevalue and is not an error  #2744

---------

Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com>
This commit is contained in:
Frank Haverland
2023-12-31 12:03:52 +01:00
committed by GitHub
parent a11e19fb0c
commit 6fca4d8d95
3 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
View File

@@ -872,11 +872,15 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
+ ", preValue=" + std::to_string(NUMBERS[j]->PreValue) + ", preValue=" + std::to_string(NUMBERS[j]->PreValue)
+ ", preToll=" + std::to_string(NUMBERS[j]->PreValue-(2/pow(10, NUMBERS[j]->Nachkomma)))); + ", preToll=" + std::to_string(NUMBERS[j]->PreValue-(2/pow(10, NUMBERS[j]->Nachkomma))));
} }
// Include inaccuracy of 0.2 for isExtendedResolution.
if (NUMBERS[j]->Value >= (NUMBERS[j]->PreValue-(2/pow(10, NUMBERS[j]->Nachkomma))) && NUMBERS[j]->isExtendedResolution) { // Include inaccuracy of 0.2 for isExtendedResolution.
NUMBERS[j]->Value = NUMBERS[j]->PreValue; if ((NUMBERS[j]->Value >= (NUMBERS[j]->PreValue-(2/pow(10, NUMBERS[j]->Nachkomma))) && NUMBERS[j]->isExtendedResolution)
NUMBERS[j]->ReturnValue = to_string(NUMBERS[j]->PreValue); // not extended resolution allows -1 on the lowest digit
} else { || (NUMBERS[j]->Value >= (NUMBERS[j]->PreValue-(1/pow(10, NUMBERS[j]->Nachkomma))) && !NUMBERS[j]->isExtendedResolution)) {
NUMBERS[j]->Value = NUMBERS[j]->PreValue;
NUMBERS[j]->ReturnValue = to_string(NUMBERS[j]->PreValue);
}
else {
NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " "; NUMBERS[j]->ErrorMessageText = NUMBERS[j]->ErrorMessageText + "Neg. Rate - Read: " + zwvalue + " - Raw: " + NUMBERS[j]->ReturnRawValue + " - Pre: " + RundeOutput(NUMBERS[j]->PreValue, NUMBERS[j]->Nachkomma) + " ";
NUMBERS[j]->Value = NUMBERS[j]->PreValue; NUMBERS[j]->Value = NUMBERS[j]->PreValue;
NUMBERS[j]->ReturnValue = ""; NUMBERS[j]->ReturnValue = "";

31
code/test/components/jomjol-flowcontroll/test_flow_pp_negative.cpp
View File

@@ -51,21 +51,32 @@ void testNegative() {
delete underTestPost; delete underTestPost;
// extendResolution=false // extendResolution=false
// value < preValue // value < (preValue -.01)
preValue = 16.99; // zu groß preValue = 17.00; // zu groß
underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0); underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
setAllowNegatives(underTestPost, false); setAllowNegatives(underTestPost, false);
setPreValue(underTestPost, preValue_extended); setPreValue(underTestPost, preValue);
result = process_doFlow(underTestPost); result = process_doFlow(underTestPost);
TEST_ASSERT_EQUAL_STRING("Neg. Rate - Read: - Raw: 16.98 - Pre: 16.99 ", underTestPost->getReadoutError().c_str()); TEST_ASSERT_EQUAL_STRING("Neg. Rate - Read: - Raw: 16.98 - Pre: 17.00 ", underTestPost->getReadoutError().c_str());
TEST_ASSERT_EQUAL_STRING("", result.c_str()); TEST_ASSERT_EQUAL_STRING("", result.c_str());
delete underTestPost; delete underTestPost;
// extendResolution=false
// value > (preValue -.01)
// ist im Rahmen der Ungenauigkeit (-1 auf letzter Stelle)
preValue = 16.99; // zu groß
underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
setAllowNegatives(underTestPost, false);
setPreValue(underTestPost, preValue);
result = process_doFlow(underTestPost);
TEST_ASSERT_EQUAL_STRING("no error", underTestPost->getReadoutError().c_str());
TEST_ASSERT_EQUAL_STRING("16.99", result.c_str());
delete underTestPost;
// extendResolution=false // extendResolution=false
// value < preValue // value < preValue
// Aber Prüfung abgeschaltet => kein Fehler // Aber Prüfung abgeschaltet => kein Fehler
preValue = 16.99; // zu groß preValue = 17.99; // zu groß
underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0); underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
setAllowNegatives(underTestPost, true); setAllowNegatives(underTestPost, true);
setPreValue(underTestPost, preValue_extended); setPreValue(underTestPost, preValue_extended);
@@ -84,8 +95,8 @@ void testNegative_Issues() {
// Ohne decimal_shift // Ohne decimal_shift
std::vector<float> digits = { 2.0, 2.0, 0.0, 1.0, 7.2, 9.0, 8.0}; std::vector<float> digits = { 2.0, 2.0, 0.0, 1.0, 7.2, 9.0, 8.0};
std::vector<float> analogs = { }; std::vector<float> analogs = { };
double preValue_extended = 22018.080; double preValue_extended = 22018.090;
double preValue = 22018.08; double preValue = 22018.09;
const char* expected = "22017.98"; const char* expected = "22017.98";
@@ -93,13 +104,13 @@ void testNegative_Issues() {
// extendResolution=false // extendResolution=false
// value < preValue // value < preValue
// Prüfung eingeschaltet => Fehler // Prüfung eingeschaltet => Fehler
preValue = 22018.08; // zu groß preValue = 22018.09; // zu groß
UnderTestPost* underTestPost = init_do_flow(analogs, digits, Digital100, false, false, -2); UnderTestPost* underTestPost = init_do_flow(analogs, digits, Digital100, false, false, -2);
setAllowNegatives(underTestPost, false); setAllowNegatives(underTestPost, false);
setPreValue(underTestPost, preValue_extended); setPreValue(underTestPost, preValue_extended);
std::string result = process_doFlow(underTestPost); std::string result = process_doFlow(underTestPost);
TEST_ASSERT_EQUAL_STRING("Neg. Rate - Read: - Raw: 22017.98 - Pre: 22018.08 ", underTestPost->getReadoutError().c_str()); TEST_ASSERT_EQUAL_STRING("Neg. Rate - Read: - Raw: 22017.98 - Pre: 22018.09 ", underTestPost->getReadoutError().c_str());
TEST_ASSERT_EQUAL_STRING(expected, result.c_str()); TEST_ASSERT_EQUAL_STRING("", result.c_str());
delete underTestPost; delete underTestPost;
} }

25
code/test/test_suite_flowcontroll.cpp
View File

@@ -149,11 +149,24 @@ void task_UnityTesting(void *pvParameter)
*/ */
extern "C" void app_main() extern "C" void app_main()
{ {
initGPIO(); initGPIO();
Init_NVS_SDCard(); Init_NVS_SDCard();
esp_log_level_set("*", ESP_LOG_DEBUG); // set all components to DEBUG level esp_log_level_set("*", ESP_LOG_DEBUG); // set all components to ERROR level
// Create dedicated testing task (heap size can be configured - large enough to handle a lot of testing cases) UNITY_BEGIN();
// ******************************************** RUN_TEST(testNegative_Issues);
xTaskCreate(&task_UnityTesting, "task_UnityTesting", 12 * 1024, NULL, tskIDLE_PRIORITY+2, NULL); RUN_TEST(testNegative);
/*
RUN_TEST(test_analogToDigit_Standard);
RUN_TEST(test_analogToDigit_Transition);
RUN_TEST(test_doFlowPP);
RUN_TEST(test_doFlowPP1);
RUN_TEST(test_doFlowPP2);
RUN_TEST(test_doFlowPP3);
RUN_TEST(test_doFlowPP4);
// getReadoutRawString test
RUN_TEST(test_getReadoutRawString);
*/
UNITY_END();
} }