Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2026-01-30 06:10:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #885 from haverland/rolling

Browse Source 
CNNThreshold removed vor Analog100 and Digital100
This commit is contained in:
jomjol
2022-08-07 21:19:37 +02:00
committed by GitHub
parent 085ea2028c 4a8d6592ab
commit 6a48f0502e
5 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -15,3 +15,4 @@ install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps
code/edgeAI.code-workspace

2
README.md
View File

@@ -50,7 +50,9 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
------
##### 10.6.2
- ignore hidden files in model selection (configuration page)
##### 10.6.1 - Stability Increase (2022-07-24)

5
code/components/jomjol_fileserver_ota/server_file.cpp
View File

@@ -95,6 +95,11 @@ esp_err_t get_tflite_file_handler(httpd_req_t *req)
_filename = std::string(entry->d_name);
printf("File: %s\t", _filename.c_str());
// ignore all files with starting dot (hidden files)
if (_filename.rfind(".", 0) == 0) {
continue;
}
_fileext = _filename;
pos = _fileext.find_last_of(".");
if (pos != std::string::npos)

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

@@ -811,34 +811,21 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time)
case Analogue100:
{
int _num;
float _fit;
float _result_save_file;
tflite->LoadInputImageBasis(GENERAL[_ana]->ROI[i]->image);
tflite->Invoke();
_num = tflite->GetOutClassification();
_fit = tflite->GetOutputValue(_num);
GENERAL[_ana]->ROI[i]->result_float = (float)_num / 10.0;
_result_save_file = GENERAL[_ana]->ROI[i]->result_float;
if (_fit < CNNGoodThreshold)
{
GENERAL[_ana]->ROI[i]->isReject = true;
GENERAL[_ana]->ROI[i]->result_float = -1;
_result_save_file+= 100; // Für den Fall, dass fit nicht ausreichend, soll trotzdem das Ergebnis mit "-10x.y" abgespeichert werden.
string zw = "Value Rejected due to Threshold (Fit: " + to_string(_fit) + "Threshold: " + to_string(CNNGoodThreshold);
printf("Value Rejected due to Threshold (Fit: %f, Threshold: %f\n", _fit, CNNGoodThreshold);
LogFile.WriteToFile(zw);
}
else
{
GENERAL[_ana]->ROI[i]->isReject = false;
}
GENERAL[_ana]->ROI[i]->isReject = false;
printf("Result General(Analog)%i: %f\n", i, GENERAL[_ana]->ROI[i]->result_float);
if (isLogImage)

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

@@ -88,5 +88,14 @@ void test_ZeigerEvalHybrid() {
// the 4.4 (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));
// 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)
TEST_ASSERT_EQUAL(8, undertest.ZeigerEvalHybrid(8.6, 9.8, 9));
// issue #879 vorgaenger is -1, zahl = 6.7
//TEST_ASSERT_EQUAL(7, undertest.ZeigerEvalHybrid(6.7, -1.0, -1));
}