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 20:46:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renamed digital to digit (#3219)

Browse Source 
* renamed Digital to Digit

* added param migration

* Update .github/label-commenter-config.yaml

* renamed AnalogDigitTransition* to AnalogToDigitTransition*

---------

Co-authored-by: CaCO3 <caco@ruinelli.ch>
This commit is contained in:
CaCO3
2024-09-29 22:10:10 +02:00
committed by GitHub
parent 5496573369
commit f6bdd48bca
35 changed files with 228 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/test/components/jomjol-flowcontroll/test_PointerEvalAnalogToDigitNew.cpp
View File

@@ -20,7 +20,7 @@ class UnderTestCNNGeneral : public ClassFlowCNNGeneral {
*/
void test_analogToDigit_Standard() {
UnderTestCNNGeneral* undertest = new UnderTestCNNGeneral(nullptr, Digital100);
UnderTestCNNGeneral* undertest = new UnderTestCNNGeneral(nullptr, Digit100);
// 4.8 is a "hanging" 5, i.e. it has not jumped over to 5.0.
// A "hanging digit" should still be rounded from Transition.
@@ -59,7 +59,7 @@ void test_analogToDigit_Standard() {
}
void test_analogToDigit_Transition() {
UnderTestCNNGeneral* undertest = new UnderTestCNNGeneral(nullptr, Digital100);
UnderTestCNNGeneral* undertest = new UnderTestCNNGeneral(nullptr, Digit100);
// https://github.com/jomjol/AI-on-the-edge-device/issues/921#issuecomment-1222672175
// Default: dig=3.9, ana=9.7 => erg=3

24
code/test/components/jomjol-flowcontroll/test_cnnflowcontroll.cpp
View File

@@ -16,7 +16,7 @@ class UnderTestCNN : public ClassFlowCNNGeneral {
*/
void test_ZeigerEval()
{
UnderTestCNN undertest = UnderTestCNN(nullptr, Digital100);
UnderTestCNN undertest = UnderTestCNN(nullptr, Digit100);
// the 5.2 is already above 5.0 and the previous digit too (3)
printf("Test 5.2, 3\n");
@@ -29,11 +29,11 @@ void test_ZeigerEval()
TEST_ASSERT_EQUAL(4, undertest.PointerEvalAnalogNew(5.2, 9));
printf("Test 4.4, 9\n");
// the 4.4 (digital100) is not above 5 and the previous digit (analog) too (9.3)
// the 4.4 (Digit100) is not above 5 and the previous digit (analog) too (9.3)
TEST_ASSERT_EQUAL(4, undertest.PointerEvalAnalogNew(4.4, 9));
printf("Test 4.5, 0\n");
// the 4.5 (digital100) is not above 5 and the previous digit (analog) too (9.6)
// the 4.5 (Digit100) is not above 5 and the previous digit (analog) too (9.6)
TEST_ASSERT_EQUAL(4, undertest.PointerEvalAnalogNew(4.5, 0));
}
@@ -42,7 +42,7 @@ void test_ZeigerEval()
* @brief test if all combinations of digit
* evaluation are running correctly
*
* Desciption on call undertest.PointerEvalHybridNew(float number, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors, float digitalAnalogTransitionStart)
* Desciption on call undertest.PointerEvalHybridNew(float number, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors, float digitAnalogTransitionStart)
* @param number: is the current ROI as float value from recognition
* @param number_of_predecessors: is the last (lower) ROI as float from recognition
* @param eval_predecessors: is the evaluated number. Sometimes a much lower value can change higer values
@@ -50,16 +50,16 @@ void test_ZeigerEval()
* 0.1 => 0 (eval_predecessors)
* The 0 makes a 9.9 to 0 (eval_predecessors)
* The 0 makes a 9.8 to 0
* @param Analog_Predecessors false/true if the last ROI is an analog or digital ROI (default=false)
* @param Analog_Predecessors false/true if the last ROI is an analog or digit ROI (default=false)
* runs in special handling because analog is much less precise
* @param digitalAnalogTransitionStart start of the transitionlogic begins on number_of_predecessor (default=9.2)
* @param digitAnalogTransitionStart start of the transitionlogic begins on number_of_predecessor (default=9.2)
*
*
*
*
*/
void test_ZeigerEvalHybrid() {
UnderTestCNN undertest = UnderTestCNN(nullptr, Digital100);
UnderTestCNN undertest = UnderTestCNN(nullptr, Digit100);
// the 5.2 and no previous should round down
printf("PointerEvalHybridNew(5.2, 0, -1)\n");
@@ -93,17 +93,17 @@ void test_ZeigerEvalHybrid() {
// the 5.7 with previous and the previous >=9.5 should trunc to 5
TEST_ASSERT_EQUAL(5, undertest.PointerEvalHybridNew(5.7, 9.6, 9));
// the 4.5 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.6)
// the 4.5 (Digit100) is not above 5 and the previous digit (analog) not over Zero (9.6)
TEST_ASSERT_EQUAL(4, undertest.PointerEvalHybridNew(4.5, 9.6, 0));
// the 4.5 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.6)
// the 4.5 (Digit100) is not above 5 and the previous digit (analog) not over Zero (9.6)
TEST_ASSERT_EQUAL(4, undertest.PointerEvalHybridNew(4.5, 9.6, 9));
// the 4.5 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.5)
// the 4.5 (Digit100) is not above 5 and the previous digit (analog) not over Zero (9.5)
TEST_ASSERT_EQUAL(4, undertest.PointerEvalHybridNew(4.5, 9.5, 9));
// 59.96889 - Pre: 58.94888
// 8.6 : 9.8 : 6.7
// the 4.4 (digital100) is not above 5 and the previous digit (analog) not over Zero (9.5)
// the 4.4 (Digit100) is not above 5 and the previous digit (analog) not over Zero (9.5)
TEST_ASSERT_EQUAL(8, undertest.PointerEvalHybridNew(8.6, 9.8, 9));
// pre = 9.9 (0.0 raw)
@@ -111,7 +111,7 @@ void test_ZeigerEvalHybrid() {
TEST_ASSERT_EQUAL(2, undertest.PointerEvalHybridNew(1.8, 9.0, 9));
// if a digit have an early transition and the pointer is < 9.0
// prev (pointer) = 6.2, but on digital readout = 6.0 (prev is int parameter)
// prev (pointer) = 6.2, but on digit readout = 6.0 (prev is int parameter)
// zahl = 4.6
TEST_ASSERT_EQUAL(4, undertest.PointerEvalHybridNew(4.6, 6.0, 6));

8
code/test/components/jomjol-flowcontroll/test_flow_postrocess_helper.cpp
View File

@@ -37,9 +37,9 @@ std::string process_doFlow(UnderTestPost* _underTestPost) {
* @brief setup flow like it runs after recognition.
*
* @param analog the analog recognitions as array begins with the highest ROI
* @param digits the digital regocnitions as array begins with the highest ROI
* @param digType type of the model defaults do Digital100
* @param checkConsistency for Digital type only. Not relvant for newer models
* @param digits the digit regocnitions as array begins with the highest ROI
* @param digType type of the model defaults do Digit100
* @param checkConsistency for Digit type only. Not relvant for newer models
* @param extendedResolution the lowest ROI will directly used (9.7 => 9.7) if false 9.7 => 9
* @param decimal_shift the decimal point offset. -3 corresponds to x.yyy
* @return std::string the value result
@@ -162,7 +162,7 @@ void setAnalogdigitTransistionStart(UnderTestPost* _underTestPost, float _analog
std::vector<NumberPost*>* NUMBERS = _underTestPost->GetNumbers();
for (int _n = 0; _n < (*NUMBERS).size(); ++_n) {
ESP_LOGD(TAG, "Setting decimal shift on number: %d to %f", _n, _analogdigitTransistionStart);
(*NUMBERS)[_n]->AnalogDigitalTransitionStart = _analogdigitTransistionStart;
(*NUMBERS)[_n]->AnalogToDigitTransitionStart = _analogdigitTransistionStart;
}
}
}

8
code/test/components/jomjol-flowcontroll/test_flow_postrocess_helper.h
View File

@@ -33,13 +33,13 @@ UnderTestPost* setUpClassFlowPostprocessing(t_CNNType digType, t_CNNType anaType
*
* @param analog the analog recognitions
* @param digits the digit recognitions
* @param digType the digit model type (default Digital100)
* @param digType the digit model type (default Digit100)
* @param checkConsistency sets property checkConsistency (default = false)
* @param extendedResolution sets property extendedResolution (default = false)
* @param decimal_shift set property decimal_shift (Nachkommastellen, default = 0)
* @return UnderTestPost* the created testobject
*/
UnderTestPost* init_do_flow(std::vector<float> analog, std::vector<float> digits, t_CNNType digType = Digital100,
UnderTestPost* init_do_flow(std::vector<float> analog, std::vector<float> digits, t_CNNType digType = Digit100,
bool checkConsistency=false, bool extendedResolution=false, int decimal_shift=0);
/**
@@ -47,13 +47,13 @@ UnderTestPost* init_do_flow(std::vector<float> analog, std::vector<float> digits
*
* @param analog the analog recognitions
* @param digits the digit recognitions
* @param digType the digit model type (default Digital100)
* @param digType the digit model type (default Digit100)
* @param checkConsistency sets property checkConsistency (default = false)
* @param extendedResolution sets property extendedResolution (default = false)
* @param decimal_shift set property decimal_shift (Nachkommastellen, default = 0)
* @return std::string the return value of do_Flow is the Value as string
*/
std::string process_doFlow(std::vector<float> analog, std::vector<float> digits, t_CNNType digType = Digital100,
std::string process_doFlow(std::vector<float> analog, std::vector<float> digits, t_CNNType digType = Digit100,
bool checkConsistency=false, bool extendedResolution=false, int decimal_shift=0);
/**

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

@@ -20,7 +20,7 @@ void testNegative() {
// extendResolution=false
// da kein negativ, sollte kein Error auftreten
UnderTestPost* underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
UnderTestPost* underTestPost = init_do_flow(analogs, digits, Digit100, false, false, 0);
setAllowNegatives(underTestPost, false);
setPreValue(underTestPost, preValue);
std::string result = process_doFlow(underTestPost);
@@ -31,7 +31,7 @@ void testNegative() {
// extendResolution=true
// da negativ im Rahmen (letzte Stelle -0.2 > ergebnis), kein Error
// Aber der PreValue wird gesetzt
underTestPost = init_do_flow(analogs, digits, Digital100, false, true, 0);
underTestPost = init_do_flow(analogs, digits, Digit100, false, true, 0);
setAllowNegatives(underTestPost, false);
setPreValue(underTestPost, preValue_extended);
result = process_doFlow(underTestPost);
@@ -42,7 +42,7 @@ void testNegative() {
// extendResolution=true
// Tolleranz überschritten, Error wird gesetzt, kein ReturnValue
preValue_extended = 16.988; // zu groß
underTestPost = init_do_flow(analogs, digits, Digital100, false, true, 0);
underTestPost = init_do_flow(analogs, digits, Digit100, false, true, 0);
setAllowNegatives(underTestPost, false);
setPreValue(underTestPost, preValue_extended);
result = process_doFlow(underTestPost);
@@ -53,7 +53,7 @@ void testNegative() {
// extendResolution=false
// value < (preValue -.01)
preValue = 17.00; // zu groß
underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
underTestPost = init_do_flow(analogs, digits, Digit100, false, false, 0);
setAllowNegatives(underTestPost, false);
setPreValue(underTestPost, preValue);
result = process_doFlow(underTestPost);
@@ -65,7 +65,7 @@ void testNegative() {
// 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);
underTestPost = init_do_flow(analogs, digits, Digit100, false, false, 0);
setAllowNegatives(underTestPost, false);
setPreValue(underTestPost, preValue);
result = process_doFlow(underTestPost);
@@ -77,7 +77,7 @@ void testNegative() {
// value < preValue
// Aber Prüfung abgeschaltet => kein Fehler
preValue = 17.99; // zu groß
underTestPost = init_do_flow(analogs, digits, Digital100, false, false, 0);
underTestPost = init_do_flow(analogs, digits, Digit100, false, false, 0);
setAllowNegatives(underTestPost, true);
setPreValue(underTestPost, preValue_extended);
result = process_doFlow(underTestPost);
@@ -105,7 +105,7 @@ void testNegative_Issues() {
// value < preValue
// Prüfung eingeschaltet => Fehler
preValue = 22018.09; // zu groß
UnderTestPost* underTestPost = init_do_flow(analogs, digits, Digital100, false, false, -2);
UnderTestPost* underTestPost = init_do_flow(analogs, digits, Digit100, false, false, -2);
setAllowNegatives(underTestPost, false);
setPreValue(underTestPost, preValue_extended);
std::string result = process_doFlow(underTestPost);

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

@@ -178,7 +178,7 @@ void test_doFlowPP2() {
std::vector<float> digits = { 1.0, 9.0, 9.0}; // Übergang wurde um 1 erhöht (200, statt 199)
std::vector<float> analogs = { 7.1, 4.8, 8.3};
const char* expected = "199.748";
std::string result = process_doFlow(analogs, digits, Digital);
std::string result = process_doFlow(analogs, digits, Digit);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// Fehler bei Rolling (2002-09-09)
@@ -191,15 +191,15 @@ void test_doFlowPP2() {
// expected_extended= "32289.4198";
// extendResolution=false, checkConsistency=false
result = process_doFlow(analogs, digits, Digital100, false, false, -3);
result = process_doFlow(analogs, digits, Digit100, false, false, -3);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, -3);
result = process_doFlow(analogs, digits, Digit100, false, true, -3);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// checkConsistency=true und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, -3);
result = process_doFlow(analogs, digits, Digit100, false, true, -3);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler Rolling (2022-09-10)
@@ -210,20 +210,20 @@ void test_doFlowPP2() {
expected_extended= "83.99401";
// checkConsistency=false
result = process_doFlow(analogs, digits, Digital100, false);
result = process_doFlow(analogs, digits, Digit100, false);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=true
result = process_doFlow(analogs, digits, Digital100, true);
result = process_doFlow(analogs, digits, Digit100, true);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true);
result = process_doFlow(analogs, digits, Digit100, false, true);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// checkConsistency=true und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true);
result = process_doFlow(analogs, digits, Digit100, false, true);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler Rolling (2022-09-10)
@@ -234,16 +234,16 @@ void test_doFlowPP2() {
expected_extended= "123235.6";
// checkConsistency=true
result = process_doFlow(analogs, digits, Digital100, false, false);
result = process_doFlow(analogs, digits, Digit100, false, false);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=true
result = process_doFlow(analogs, digits, Digital100, true, false);
result = process_doFlow(analogs, digits, Digit100, true, false);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true);
result = process_doFlow(analogs, digits, Digit100, false, true);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler bei V11.2.0
@@ -254,11 +254,11 @@ void test_doFlowPP2() {
expected_extended= "3249.4692";
// checkConsistency=true
result = process_doFlow(analogs, digits, Digital100, false, false, -3);
result = process_doFlow(analogs, digits, Digit100, false, false, -3);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, -3);
result = process_doFlow(analogs, digits, Digit100, false, true, -3);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler bei V11.2.0
@@ -269,11 +269,11 @@ void test_doFlowPP2() {
expected_extended= "269.92272";
// extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, false);
result = process_doFlow(analogs, digits, Digit100, false, false);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true);
result = process_doFlow(analogs, digits, Digit100, false, true);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler bei V11.3.1
@@ -284,11 +284,11 @@ void test_doFlowPP2() {
expected_extended= "169.35935";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, -3);
result = process_doFlow(analogs, digits, Digit100, false, false, -3);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, -3);
result = process_doFlow(analogs, digits, Digit100, false, true, -3);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler bei V12.0.1
@@ -299,11 +299,11 @@ void test_doFlowPP2() {
expected_extended= "211.03555";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, -3);
result = process_doFlow(analogs, digits, Digit100, false, false, -3);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, -3);
result = process_doFlow(analogs, digits, Digit100, false, true, -3);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler bei V12.0.1
@@ -314,11 +314,11 @@ void test_doFlowPP2() {
expected_extended= "245.9386";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, 0);
result = process_doFlow(analogs, digits, Digit100, false, false, 0);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, 0);
result = process_doFlow(analogs, digits, Digit100, false, true, 0);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler bei V12.0.1
@@ -329,11 +329,11 @@ void test_doFlowPP2() {
expected_extended= "245.9386";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, 0);
result = process_doFlow(analogs, digits, Digit100, false, false, 0);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, 0);
result = process_doFlow(analogs, digits, Digit100, false, true, 0);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
}
@@ -346,11 +346,11 @@ void test_doFlowPP3() {
const char* expected_extended= "247.2045";
// extendResolution=false
std::string result = process_doFlow(analogs, digits, Digital100, false, false, 0);
std::string result = process_doFlow(analogs, digits, Digit100, false, false, 0);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, 0);
result = process_doFlow(analogs, digits, Digit100, false, true, 0);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
@@ -362,11 +362,11 @@ void test_doFlowPP3() {
expected_extended= "142.92690";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, 0);
result = process_doFlow(analogs, digits, Digit100, false, false, 0);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, 0);
result = process_doFlow(analogs, digits, Digit100, false, true, 0);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
@@ -379,14 +379,14 @@ void test_doFlowPP3() {
expected_extended= "170.05287";
// extendResolution=false
UnderTestPost* undertestPost = init_do_flow(analogs, digits, Digital100, false, false, -3);
UnderTestPost* undertestPost = init_do_flow(analogs, digits, Digit100, false, false, -3);
setAnalogdigitTransistionStart(undertestPost, 7.7);
result = process_doFlow(undertestPost);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
delete undertestPost;
// checkConsistency=false und extendResolution=true
undertestPost = init_do_flow(analogs, digits, Digital100, false, true, -3);
undertestPost = init_do_flow(analogs, digits, Digit100, false, true, -3);
setAnalogdigitTransistionStart(undertestPost, 7.7);
result = process_doFlow(undertestPost);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
@@ -400,11 +400,11 @@ void test_doFlowPP3() {
expected_extended= "91.88174";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, 0);
result = process_doFlow(analogs, digits, Digit100, false, false, 0);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, 0);
result = process_doFlow(analogs, digits, Digit100, false, true, 0);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
@@ -416,11 +416,11 @@ void test_doFlowPP3() {
expected_extended= "92.38320";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, 0);
result = process_doFlow(analogs, digits, Digit100, false, false, 0);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, 0);
result = process_doFlow(analogs, digits, Digit100, false, true, 0);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler V11.3.0
@@ -431,11 +431,11 @@ void test_doFlowPP3() {
expected_extended= "7472.7594";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, -3);
result = process_doFlow(analogs, digits, Digit100, false, false, -3);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, -3);
result = process_doFlow(analogs, digits, Digit100, false, true, -3);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler V12.0.1
@@ -446,11 +446,11 @@ void test_doFlowPP3() {
expected_extended= "577.86490";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, 0);
result = process_doFlow(analogs, digits, Digit100, false, false, 0);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, 0);
result = process_doFlow(analogs, digits, Digit100, false, true, 0);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
@@ -462,11 +462,11 @@ void test_doFlowPP3() {
expected_extended= "211.03580";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, -3);
result = process_doFlow(analogs, digits, Digit100, false, false, -3);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, -3);
result = process_doFlow(analogs, digits, Digit100, false, true, -3);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler V12.0.1
@@ -477,11 +477,11 @@ void test_doFlowPP3() {
expected_extended= "126.9231";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, 0);
result = process_doFlow(analogs, digits, Digit100, false, false, 0);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, 0);
result = process_doFlow(analogs, digits, Digit100, false, true, 0);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler V12.0.1
@@ -492,11 +492,11 @@ void test_doFlowPP3() {
expected_extended= "386.05672";
// extendResolution=false
result = process_doFlow(analogs, digits, Digital100, false, false, -3);
result = process_doFlow(analogs, digits, Digit100, false, false, -3);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true, -3);
result = process_doFlow(analogs, digits, Digit100, false, true, -3);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
// Fehler V12.0.1
@@ -508,14 +508,14 @@ void test_doFlowPP3() {
expected_extended= "171.24178";
// extendResolution=false
undertestPost = init_do_flow(analogs, digits, Digital100, false, false, -3);
undertestPost = init_do_flow(analogs, digits, Digit100, false, false, -3);
setAnalogdigitTransistionStart(undertestPost, 7.7);
result = process_doFlow(undertestPost);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
delete undertestPost;
// checkConsistency=false und extendResolution=true
undertestPost = init_do_flow(analogs, digits, Digital100, false, true, -3);
undertestPost = init_do_flow(analogs, digits, Digit100, false, true, -3);
setAnalogdigitTransistionStart(undertestPost, 7.7);
result = process_doFlow(undertestPost);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
@@ -533,11 +533,11 @@ void test_doFlowPP4() {
const char* expected_extended= "717.01658";
// extendResolution=false
std::string result = process_doFlow(analogs, digits, Digital100, false, false);
std::string result = process_doFlow(analogs, digits, Digit100, false, false);
TEST_ASSERT_EQUAL_STRING(expected, result.c_str());
// checkConsistency=false und extendResolution=true
result = process_doFlow(analogs, digits, Digital100, false, true);
result = process_doFlow(analogs, digits, Digit100, false, true);
TEST_ASSERT_EQUAL_STRING(expected_extended, result.c_str());
}

2
code/test/components/jomjol-flowcontroll/test_getReadoutRawString.cpp
View File

@@ -5,7 +5,7 @@
void test_getReadoutRawString() {
// no ROIs setted up
UnderTestPost* _undertestPost = setUpClassFlowPostprocessing(Digital100, Analogue100);
UnderTestPost* _undertestPost = setUpClassFlowPostprocessing(Digit100, Analogue100);
string result = _undertestPost->flowAnalog->getReadoutRawString(0);
TEST_ASSERT_EQUAL_STRING("", result.c_str());