mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-06 11:36:51 +03:00
* Create dig-cont_0640_s3_q.tflite * Update edit_reference.html (#2924) Zoom-Einstellungen ausblenden, wenn zoom deaktiviert ist * Update edit_config_template.html (#2925) Zoom-Einstellungen ausblenden, wenn zoom deaktiviert ist + Kameraeinstellungen nicht nur in der config.ini speichern, sondern auch setzen * The parameter "negative" is processed on the MCU * Renamed menu entry Alignment -> References * renamed model file to make naming consistent * Fix test (#2933) * always reset change absolute (#2956) * Create dig-class11_1701_s2.tflite * Update tflite * Update tflite * Camera settings (#3029) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Fix minor typo and harmonize spaces (#3030) * Update edit_digits.html * Update edit_analog.html * Update overview.html * Update edit_reference.html --------- Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Source code formatting, ClassFlowPostProcessing.cpp * fix edit_config_template.html Unfortunately, I didn't take out some entries from other experiments because I overlooked/forgot them^^ * fix readconfigparam.js Unfortunately, I didn't take out some entries from other experiments because I overlooked/forgot them^^ * fix edit_config_template.html TakeImage_CamZoomMode_value1 was replaced by TakeImage_CamZoomSize_value1, but not deleted. This caused problems when saving the camera settings. * Update info.html function loadWLANSSID() was present three times * Update overview.html CamFrameSize is no longer needed/used for zoom * Update reply-bot.yaml * homeassistant service discovery: derive node_id when using nested topics (#3088) * derive correct node_id for homeassistant service discovery in nested topics (fixes #1792) * explicit use of std::string * move nodeId creation to separate function add unit-tests * add documentation about node_id generation for Home Assistant MQTT Service Discovery * add Prometheus/OpenMetrics exporter (#3081) * add prometheus endpoint * refine metrics implementation * move metrics generator to ClassFlowControll * add more metrics align prefix * add more metrics clean up * refine documentation * revert dependencies change * sanitize labels * create separate module for openmetrics * move openmetrics to separate folder * clean up * add basic unit-tests * work with const numbers add replaceAll for string replacement avoid opening std namespace adapt unit-tests * Update code/main/server_main.cpp --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Typo * update platformIO to 6.7.0 (ESP IDF 5.2.1) (#3098) * update to platformio/espressif32 @ 6.7.0 * remove unused getReadout() as it throws errors (error: 'virtual std::string ClassFlow::getReadout()' was hidden). --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update reply-bot.yaml (#3107) * Fix actions-label-commenter * Update Helper.cpp * Update Helper.h * Update Helper.cpp * Update readconfigparam.js fix for: In the selected field the value '1' in the section 'TakeImage' in the field 'CamGainceiling' is invalid. PLEASE CHECK BEFORE SAVING! * proposal for renaming and documentation (#3115) * Update server_camera.cpp Fix building with -D DEBUG_DETAIL_ON better alternative to: https://github.com/jomjol/AI-on-the-edge-device/pull/3160 * Update ClassFlowPostProcessing.cpp * Update ClassFlowAlignment.cpp * Fix building with `-D DEBUG_DETAIL_ON` (#3160) Building with `-D DEBUG_DETAIL_ON` has been broken since #3029. Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Handle empty prevalue.ini gracefully (#3162) Fixes #2149. * Bugfix for boot loop (#3175) * Add files via upload * Add files via upload * Add files via upload * Delete param-docs/parameter-pages/TakeImage/Aec2.md has been replaced by CamAec2.md * Delete param-docs/parameter-pages/TakeImage/AutoExposureLevel.md has been replaced by CamAeLevel.md * Delete param-docs/parameter-pages/TakeImage/Brightness.md has been replaced by CamBrightness.md * Delete param-docs/parameter-pages/TakeImage/Contrast.md has been replaced by CamContrast.md * Delete param-docs/parameter-pages/TakeImage/Grayscale.md has been replaced by CamSpecialEffect.md * Delete param-docs/parameter-pages/TakeImage/Negative.md has been replaced by CamSpecialEffect.md * Delete param-docs/parameter-pages/TakeImage/Saturation.md has been replaced by CamSaturation.md * Delete param-docs/parameter-pages/TakeImage/Sharpness.md has been replaced by CamSharpness.md * Delete param-docs/parameter-pages/TakeImage/ImageQuality.md has been replaced by CamQuality.md * Delete param-docs/parameter-pages/TakeImage/Zoom.md has been replaced by CamZoom.md * Delete param-docs/parameter-pages/TakeImage/ZoomMode.md has been replaced by CamZoomSize.md * Delete param-docs/parameter-pages/TakeImage/ZoomOffsetX.md has been replaced by CamZoomOffsetX.md * Delete param-docs/parameter-pages/TakeImage/ZoomOffsetY.md has been replaced by CamZoomOffsetY.md * Delete param-docs/parameter-pages/TakeImage/ImageSize.md has been replaced by CamZoomSize.md * Delete param-docs/parameter-pages/TakeImage/FixedExposure.md has been replaced by CamAec.md * Delete param-docs/parameter-pages/Alignment/FlipImageSize.md has been replaced by CamVflip.md * Delete param-docs/parameter-pages/Alignment/InitialMirror.md has been replaced by CamHmirror.md * CamParameter documentation update https://github.com/jomjol/AI-on-the-edge-device/issues/3185 * typo * add Webhook #3148 (#3163) * WIP add Webhook * fix config html for webhook add tooltips for webhook * webhook: fix not enabling webhook * send webhook as json * Update ApiKey.md * webhook: fix only sending last "Number" * webhook JSON is now closer to the data log in CSV format * webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Bugfix for time stamp (#3180) * Update ClassFlowPostProcessing.cpp * Update ClassFlowDefineTypes.h * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update interface_webhook.cpp * Update readconfigcommon.js fix for: The same message("Image Contrast got enhanced") came up with "Update Marker" and "Enhance Image Contrast". * fix svg favicon The svg one got added in33893eb566but does not work on Firefox * Update platformIO to 6.8.1 (Contains ESP IDF 5.3) (#3196) * Update platformIO to 6.8.1 (ESP IDF 5.3) * removed now redundant typedef * updated IDF manifest hash * Add files via upload so it should work now * Update server_main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: michael <Heinrich-Tuning@web.de> * Update MainFlowControl.cpp * Add support for OV5640 camera (#3063) * Add support for OV5640 camera * clean up sharpness handling * limit sharpness range to -2 and +2 * refactor * Fix OV3660 sharpness handling * refactor sharpness handling * fix OV3660 zoom mode * reinstate aspect ratio via imageSize * Changed OV5640 full frame size to match datasheet * various fixes * add denoise config and general clean up * fix line endings to LF * Support enabling red blue swap via web interface * update jpeg quality limits * remove color swap config; color swap workaround dependent on vflip * fix missing commit * fix gain ceiling * Update cam vflip param page * fix typo: camdenoise, not camsdenoise * fix compile errors * Update MainFlowControl.cpp * Add rate threshold parameter (#3195) * still needs to be tested https://github.com/jomjol/AI-on-the-edge-device/issues/3143 * Update ClassFlowPostProcessing.cpp code formatting * Update ClassFlowDefineTypes.h code formatting * Update ClassFlowPostProcessing.h code formatting * Update edit_config_template.html * fix * Update config.ini * Update edit_config_template.html * Updated param doc * Rename parameters * Update edit_config_template.html * Update NUMBER.ChangeRateThreshold.md * Update NUMBER.ChangeRateThreshold.md --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Update main.cpp * Update config.ini Adjusted camera settings to make the image brighter. * Update readconfigparam.js Adjusted camera settings to make the image brighter. * add optional ImageUpload for Webhook (#3174) * WIP add Webhook * fix config html for webhook add tooltips for webhook * webhook: fix not enabling webhook * send webhook as json * Update ApiKey.md * webhook: fix only sending last "Number" * webhook JSON is now closer to the data log in CSV format * webhook: add img upload * webhoop added config for imgupload * webhook html fixes * webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error * add checkbox for Webhook_UploadImg * Update sd-card/html/edit_config_template.html * Update edit_config_template.html * Update edit_config_template.html * Update edit_config_template.html * added a long timestamp to both webhook requests --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Add files via upload (#3207) * Update ClassFlowPostProcessing.cpp deleted some unnecessary double entries RateType renamed to MaxRateType * Update ClassFlowDefineTypes.h RateType renamed to MaxRateType * Update text on recognition page * Update digital CNN * add a Delay between the WiFi reconnections (#3068) * add a Delay between the WiFi reconnections * log the delay between the WiFi reconnections move the delay after the log * cleanup * cleanup * cleanup * Update edit_alignment.html * cleanup * cleanup * Update platformIO to 6.9.0 (Contains ESP IDF 5.3.1) * Handle crash on corrupted model (#3220) * Upgrade esp-tflite-micro to 1.3.1 * Added log message to hint in case it crashes on loading a corrupted model --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * new dig-class100-173-s2-q on 23.800 images (#3257) * new dig-class100-173-s2-q on 23.800 images * platformio/espressif32 @ 6.8.1 for esp32cam-dev * Revert "platformio/espressif32 @ 6.8.1 for esp32cam-dev" This reverts commitcc9297d483. * not using platformio 6.1.16 * Revert "not using platformio 6.1.16" This reverts commitef18e4fae7. * moved number edit box styles into new file edit_style.css (#3262) changed input[type=number] from 60px to 3em, to show 3 digits with current font size. * added note about only TLS 1.2 is supported (#3213) * Renamed digital to digit (#3219) * renamed Digital to Digit * added param migration * Update .github/label-commenter-config.yaml * renamed AnalogDigitTransition* to AnalogToDigitTransition* --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md * Update Changelog.md --------- Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: michael <Heinrich-Tuning@web.de> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: kub3let <95883234+kub3let@users.noreply.github.com> Co-authored-by: Marco H <myxor@users.noreply.github.com> Co-authored-by: Henry Thasler <henrythasler@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Sebastian Lövdahl <slovdahl@hibox.fi> Co-authored-by: Raphael Hehl <raphael@rhehl.de> Co-authored-by: jasaw <jasaw@dius.com.au> Co-authored-by: Francesco Carnielli <hex7c0@gmail.com> Co-authored-by: kalwados <kalwados@gmx.de>
945 lines
41 KiB
C++
945 lines
41 KiB
C++
#include "ClassFlowCNNGeneral.h"
|
|
|
|
#include <math.h>
|
|
#include <iomanip>
|
|
#include <sys/types.h>
|
|
#include <sstream> // std::stringstream
|
|
|
|
#include "CTfLiteClass.h"
|
|
#include "ClassLogFile.h"
|
|
#include "esp_log.h"
|
|
#include "../../include/defines.h"
|
|
|
|
static const char* TAG = "CNN";
|
|
|
|
//#ifdef CONFIG_HEAP_TRACING_STANDALONE
|
|
#ifdef HEAP_TRACING_CLASS_FLOW_CNN_GENERAL_DO_ALING_AND_CUT
|
|
#include <esp_heap_trace.h>
|
|
#define NUM_RECORDS 300
|
|
static heap_trace_record_t trace_record[NUM_RECORDS]; // This buffer must be in internal RAM
|
|
#endif
|
|
|
|
ClassFlowCNNGeneral::ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, t_CNNType _cnntype) : ClassFlowImage(NULL, TAG) {
|
|
string cnnmodelfile = "";
|
|
modelxsize = 1;
|
|
modelysize = 1;
|
|
CNNGoodThreshold = 0.0;
|
|
ListFlowControll = NULL;
|
|
previousElement = NULL;
|
|
SaveAllFiles = false;
|
|
disabled = false;
|
|
isLogImageSelect = false;
|
|
CNNType = AutoDetect;
|
|
CNNType = _cnntype;
|
|
flowpostalignment = _flowalign;
|
|
imagesRetention = 5;
|
|
}
|
|
|
|
string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution, int prev, float _before_narrow_Analog, float AnalogToDigitTransitionStart) {
|
|
string result = "";
|
|
|
|
if (GENERAL[_analog]->ROI.size() == 0) {
|
|
return result;
|
|
}
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "getReadout _analog=" + std::to_string(_analog) + ", _extendedResolution=" + std::to_string(_extendedResolution) + ", prev=" + std::to_string(prev));
|
|
|
|
if (CNNType == Analogue || CNNType == Analogue100) {
|
|
float number = GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float;
|
|
int result_after_decimal_point = ((int) floor(number * 10) + 10) % 10;
|
|
|
|
prev = PointerEvalAnalogNew(GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float, prev);
|
|
// LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "getReadout(analog) number=" + std::to_string(number) + ", result_after_decimal_point=" + std::to_string(result_after_decimal_point) + ", prev=" + std::to_string(prev));
|
|
result = std::to_string(prev);
|
|
|
|
if (_extendedResolution) {
|
|
result = result + std::to_string(result_after_decimal_point);
|
|
}
|
|
|
|
for (int i = GENERAL[_analog]->ROI.size() - 2; i >= 0; --i) {
|
|
prev = PointerEvalAnalogNew(GENERAL[_analog]->ROI[i]->result_float, prev);
|
|
result = std::to_string(prev) + result;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
if (CNNType == Digit) {
|
|
for (int i = 0; i < GENERAL[_analog]->ROI.size(); ++i) {
|
|
if (GENERAL[_analog]->ROI[i]->result_klasse >= 10) {
|
|
result = result + "N";
|
|
}
|
|
else {
|
|
result = result + std::to_string(GENERAL[_analog]->ROI[i]->result_klasse);
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
|
|
if ((CNNType == DoubleHyprid10) || (CNNType == Digit100)) {
|
|
float number = GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float;
|
|
// NaN?
|
|
if (number >= 0) {
|
|
// is only set if it is the first digit (no analogue before!)
|
|
if (_extendedResolution) {
|
|
int result_after_decimal_point = ((int) floor(number * 10)) % 10;
|
|
int result_before_decimal_point = ((int) floor(number)) % 10;
|
|
|
|
result = std::to_string(result_before_decimal_point) + std::to_string(result_after_decimal_point);
|
|
prev = result_before_decimal_point;
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "getReadout(dig100-ext) result_before_decimal_point=" + std::to_string(result_before_decimal_point) + ", result_after_decimal_point=" + std::to_string(result_after_decimal_point) + ", prev=" + std::to_string(prev));
|
|
}
|
|
else {
|
|
if (_before_narrow_Analog >= 0) {
|
|
prev = PointerEvalHybridNew(GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float, _before_narrow_Analog, prev, true, AnalogToDigitTransitionStart);
|
|
}
|
|
else {
|
|
prev = PointerEvalHybridNew(GENERAL[_analog]->ROI[GENERAL[_analog]->ROI.size() - 1]->result_float, prev, prev);
|
|
}
|
|
result = std::to_string(prev);
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "getReadout(dig100) prev=" + std::to_string(prev));
|
|
}
|
|
}
|
|
else {
|
|
result = "N";
|
|
if (_extendedResolution && (CNNType != Digit)) {
|
|
result = "NN";
|
|
}
|
|
}
|
|
|
|
for (int i = GENERAL[_analog]->ROI.size() - 2; i >= 0; --i) {
|
|
if (GENERAL[_analog]->ROI[i]->result_float >= 0) {
|
|
prev = PointerEvalHybridNew(GENERAL[_analog]->ROI[i]->result_float, GENERAL[_analog]->ROI[i+1]->result_float, prev);
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "getReadout#PointerEvalHybridNew()= " + std::to_string(prev));
|
|
result = std::to_string(prev) + result;
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "getReadout#result= " + result);
|
|
}
|
|
else {
|
|
prev = -1;
|
|
result = "N" + result;
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "getReadout(result_float<0 /'N') result_float=" + std::to_string(GENERAL[_analog]->ROI[i]->result_float));
|
|
|
|
}
|
|
}
|
|
return result;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* @brief Determines the number of an ROI in connection with previous ROI results
|
|
*
|
|
* @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
|
|
* example: 9.8, 9.9, 0.1
|
|
* 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 digit ROI (default=false)
|
|
* runs in special handling because analog is much less precise
|
|
* @param digitAnalogTransitionStart start of the transitionlogic begins on number_of_predecessor (default=9.2)
|
|
*
|
|
* @return int the determined number of the current ROI
|
|
*/
|
|
int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_predecessors, int eval_predecessors, bool Analog_Predecessors, float digitAnalogTransitionStart) {
|
|
int result;
|
|
int result_after_decimal_point = ((int) floor(number * 10)) % 10;
|
|
int result_before_decimal_point = ((int) floor(number) + 10) % 10;
|
|
|
|
if (eval_predecessors < 0) {
|
|
// on first digit is no spezial logic for transition needed
|
|
// we use the recognition as given. The result is the int value of the recognition
|
|
// add precisition of 2 digits and round before trunc
|
|
result = (int) ((int) trunc(round((number+10 % 10)*100)) ) / 100;
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalHybridNew - No predecessor - Result = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digit_Uncertainty = " + std::to_string(Digit_Uncertainty));
|
|
return result;
|
|
}
|
|
|
|
if (Analog_Predecessors) {
|
|
result = PointerEvalAnalogToDigitNew(number, number_of_predecessors, eval_predecessors, digitAnalogTransitionStart);
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalHybridNew - Analog predecessor, evaluation over PointerEvalAnalogNew = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digit_Uncertainty = " + std::to_string(Digit_Uncertainty));
|
|
return result;
|
|
}
|
|
|
|
if ((number_of_predecessors >= Digit_Transition_Area_Predecessor ) && (number_of_predecessors <= (10.0 - Digit_Transition_Area_Predecessor))) {
|
|
// no digit change, because predecessor is far enough away (0+/-DigitTransitionRangePredecessor) --> number is rounded
|
|
// Band around the digit --> Round off, as digit reaches inaccuracy in the frame
|
|
if ((result_after_decimal_point <= DigitBand) || (result_after_decimal_point >= (10-DigitBand))) {
|
|
result = ((int) round(number) + 10) % 10;
|
|
}
|
|
else {
|
|
result = ((int) trunc(number) + 10) % 10;
|
|
}
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalHybridNew - NO analogue predecessor, no change of digits, as pre-decimal point far enough away = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digit_Uncertainty = " + std::to_string(Digit_Uncertainty));
|
|
return result;
|
|
}
|
|
|
|
// Zero crossing at the predecessor has taken place (! evaluation via Prev_value and not number!) --> round up here (2.8 --> 3, but also 3.1 --> 3)
|
|
if (eval_predecessors <= 1) {
|
|
// We simply assume that the current digit after the zero crossing of the predecessor
|
|
// has passed through at least half (x.5)
|
|
if (result_after_decimal_point > 5) {
|
|
// The current digit does not yet have a zero crossing, but the predecessor does..
|
|
result = (result_before_decimal_point + 1) % 10;
|
|
}
|
|
else {
|
|
// Act. digit and predecessor have zero crossing
|
|
result = result_before_decimal_point % 10;
|
|
}
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalHybridNew - NO analogue predecessor, zero crossing has taken placen = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digit_Uncertainty = " + std::to_string(Digit_Uncertainty));
|
|
return result;
|
|
}
|
|
|
|
// remains only >= 9.x --> no zero crossing yet --> 2.8 --> 2,
|
|
// and from 9.7(DigitTransitionRangeLead) 3.1 --> 2
|
|
// 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 (Digit_Transition_Area_Forward>=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 {
|
|
// current digit precedes the smaller digit (9.x). So already >=x.0 while the previous digit has not yet
|
|
// has no zero crossing. Therefore, it is reduced by 1.
|
|
result = (result_before_decimal_point - 1 + 10) % 10;
|
|
}
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalHybridNew - O analogue predecessor, >= 9.5 --> no zero crossing yet = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) + " number_of_predecessors = " + std::to_string(number_of_predecessors)+ " eval_predecessors = " + std::to_string(eval_predecessors) + " Digit_Uncertainty = " + std::to_string(Digit_Uncertainty) + " result_after_decimal_point = " + std::to_string(result_after_decimal_point));
|
|
return result;
|
|
}
|
|
|
|
int ClassFlowCNNGeneral::PointerEvalAnalogToDigitNew(float number, float numeral_preceder, int eval_predecessors, float AnalogToDigitTransitionStart) {
|
|
int result;
|
|
int result_after_decimal_point = ((int) floor(number * 10)) % 10;
|
|
int result_before_decimal_point = ((int) floor(number) + 10) % 10;
|
|
bool roundedUp = false;
|
|
|
|
// Within the digit inequalities
|
|
if ((result_after_decimal_point >= (10-Digit_Uncertainty * 10)) // Band around the digit --> Round off, as digit reaches inaccuracy in the frame
|
|
|| (eval_predecessors <= 4 && result_after_decimal_point>=6)) { // or digit runs after (analogue =0..4, digit >=6)
|
|
result = (int) (round(number) + 10) % 10;
|
|
roundedUp = true;
|
|
// before/ after decimal point, because we adjust the number based on the uncertainty.
|
|
result_after_decimal_point = ((int) floor(result * 10)) % 10;
|
|
result_before_decimal_point = ((int) floor(result) + 10) % 10;
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - Digit Uncertainty - 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 digit Uncertainty - Result = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) + " numeral_preceder = " + std::to_string(numeral_preceder));
|
|
}
|
|
|
|
// 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>=6 && (numeral_preceder>AnalogToDigitTransitionStart || numeral_preceder<=0.2) && roundedUp)) {
|
|
result = ((result_before_decimal_point+10) - 1) % 10;
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogToDigitNew - Nulldurchgang noch nicht stattgefunden = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) +
|
|
" numeral_preceder = " + std::to_string(numeral_preceder) +
|
|
" eerg after comma = " + std::to_string(result_after_decimal_point));
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
int ClassFlowCNNGeneral::PointerEvalAnalogNew(float number, int numeral_preceder) {
|
|
float number_min, number_max;
|
|
int result;
|
|
|
|
if (numeral_preceder == -1) {
|
|
result = (int) floor(number);
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogNew - No predecessor - Result = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) + " numeral_preceder = " + std::to_string(numeral_preceder) + " Analog_error = " + std::to_string(Analog_error));
|
|
return result;
|
|
}
|
|
|
|
number_min = number - Analog_error / 10.0;
|
|
number_max = number + Analog_error / 10.0;
|
|
|
|
if ((int) floor(number_max) - (int) floor(number_min) != 0) {
|
|
if (numeral_preceder <= Analog_error) {
|
|
result = ((int) floor(number_max) + 10) % 10;
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogNew - number ambiguous, correction upwards - result = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) + " numeral_preceder = " + std::to_string(numeral_preceder) + " Analog_error = " + std::to_string(Analog_error));
|
|
return result;
|
|
}
|
|
if (numeral_preceder >= 10 - Analog_error) {
|
|
result = ((int) floor(number_min) + 10) % 10;
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogNew - number ambiguous, downward correction - result = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) + " numeral_preceder = " + std::to_string(numeral_preceder) + " Analog_error = " + std::to_string(Analog_error));
|
|
return result;
|
|
}
|
|
}
|
|
|
|
result = ((int) floor(number) + 10) % 10;
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "PointerEvalAnalogNew - number unambiguous, no correction necessary - result = " + std::to_string(result) +
|
|
" number: " + std::to_string(number) + " numeral_preceder = " + std::to_string(numeral_preceder) + " Analog_error = " + std::to_string(Analog_error));
|
|
|
|
return result;
|
|
}
|
|
|
|
bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
|
|
std::vector<string> splitted;
|
|
|
|
aktparamgraph = trim(aktparamgraph);
|
|
|
|
if (aktparamgraph.size() == 0) {
|
|
if (!this->GetNextParagraph(pfile, aktparamgraph)) {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
if ((toUpper(aktparamgraph) != "[ANALOG]") && (toUpper(aktparamgraph) != ";[ANALOG]")
|
|
&& (toUpper(aktparamgraph) != "[DIGIT]") && (toUpper(aktparamgraph) != ";[DIGIT]")
|
|
&& (toUpper(aktparamgraph) != "[DIGITS]") && (toUpper(aktparamgraph) != ";[DIGITS]")) {
|
|
// Paragraph passt nicht
|
|
return false;
|
|
}
|
|
|
|
if (aktparamgraph[0] == ';') {
|
|
disabled = true;
|
|
while (getNextLine(pfile, &aktparamgraph) && !isNewParagraph(aktparamgraph));
|
|
ESP_LOGD(TAG, "[Analog/Digit] is disabled!");
|
|
return true;
|
|
}
|
|
|
|
while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph)) {
|
|
splitted = ZerlegeZeile(aktparamgraph);
|
|
if ((toUpper(splitted[0]) == "ROIIMAGESLOCATION") && (splitted.size() > 1)) {
|
|
this->imagesLocation = "/sdcard" + splitted[1];
|
|
this->isLogImage = true;
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "LOGIMAGESELECT") && (splitted.size() > 1)) {
|
|
LogImageSelect = splitted[1];
|
|
isLogImageSelect = true;
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "ROIIMAGESRETENTION") && (splitted.size() > 1)) {
|
|
if (isStringNumeric(splitted[1])) {
|
|
this->imagesRetention = std::stoi(splitted[1]);
|
|
}
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "MODEL") && (splitted.size() > 1)) {
|
|
this->cnnmodelfile = splitted[1];
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "CNNGOODTHRESHOLD") && (splitted.size() > 1)) {
|
|
if (isStringNumeric(splitted[1])) {
|
|
CNNGoodThreshold = std::stof(splitted[1]);
|
|
}
|
|
}
|
|
|
|
if (splitted.size() >= 5) {
|
|
general* _analog = GetGENERAL(splitted[0], true);
|
|
roi* neuroi = _analog->ROI[_analog->ROI.size()-1];
|
|
neuroi->posx = std::stoi(splitted[1]);
|
|
neuroi->posy = std::stoi(splitted[2]);
|
|
neuroi->deltax = std::stoi(splitted[3]);
|
|
neuroi->deltay = std::stoi(splitted[4]);
|
|
neuroi->CCW = false;
|
|
|
|
if (splitted.size() >= 6) {
|
|
neuroi->CCW = toUpper(splitted[5]) == "TRUE";
|
|
}
|
|
|
|
neuroi->result_float = -1;
|
|
neuroi->image = NULL;
|
|
neuroi->image_org = NULL;
|
|
}
|
|
|
|
if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1)) {
|
|
SaveAllFiles = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
}
|
|
|
|
if (!getNetworkParameter()) {
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "An error occured on setting up the Network -> Disabling it!");
|
|
disabled = true; // An error occured, disable this CNN!
|
|
return false;
|
|
}
|
|
|
|
for (int _ana = 0; _ana < GENERAL.size(); ++_ana) {
|
|
for (int i = 0; i < GENERAL[_ana]->ROI.size(); ++i) {
|
|
GENERAL[_ana]->ROI[i]->image = new CImageBasis("ROI " + GENERAL[_ana]->ROI[i]->name,
|
|
modelxsize, modelysize, modelchannel);
|
|
GENERAL[_ana]->ROI[i]->image_org = new CImageBasis("ROI " + GENERAL[_ana]->ROI[i]->name + " original",
|
|
GENERAL[_ana]->ROI[i]->deltax, GENERAL[_ana]->ROI[i]->deltay, 3);
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
general* ClassFlowCNNGeneral::FindGENERAL(string _name_number) {
|
|
for (int i = 0; i < GENERAL.size(); ++i) {
|
|
if (GENERAL[i]->name == _name_number) {
|
|
return GENERAL[i];
|
|
}
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
general* ClassFlowCNNGeneral::GetGENERAL(string _name, bool _create = true) {
|
|
string _analog, _roi;
|
|
int _pospunkt = _name.find_first_of(".");
|
|
|
|
if (_pospunkt > -1) {
|
|
_analog = _name.substr(0, _pospunkt);
|
|
_roi = _name.substr(_pospunkt+1, _name.length() - _pospunkt - 1);
|
|
}
|
|
else {
|
|
_analog = "default";
|
|
_roi = _name;
|
|
}
|
|
|
|
general *_ret = NULL;
|
|
|
|
for (int i = 0; i < GENERAL.size(); ++i) {
|
|
if (GENERAL[i]->name == _analog) {
|
|
_ret = GENERAL[i];
|
|
}
|
|
}
|
|
|
|
// not found and should not be created
|
|
if (!_create) {
|
|
return _ret;
|
|
}
|
|
|
|
if (_ret == NULL) {
|
|
_ret = new general;
|
|
_ret->name = _analog;
|
|
GENERAL.push_back(_ret);
|
|
}
|
|
|
|
roi* neuroi = new roi;
|
|
neuroi->name = _roi;
|
|
|
|
_ret->ROI.push_back(neuroi);
|
|
|
|
ESP_LOGD(TAG, "GetGENERAL - GENERAL %s - roi %s - CCW: %d", _analog.c_str(), _roi.c_str(), neuroi->CCW);
|
|
|
|
return _ret;
|
|
}
|
|
|
|
string ClassFlowCNNGeneral::getHTMLSingleStep(string host) {
|
|
string result, zw;
|
|
std::vector<HTMLInfo*> htmlinfo;
|
|
|
|
result = "<p>Found ROIs: </p> <p><img src=\"" + host + "/img_tmp/alg_roi.jpg\"></p>\n";
|
|
result = result + "Analog Pointers: <p> ";
|
|
|
|
htmlinfo = GetHTMLInfo();
|
|
|
|
for (int i = 0; i < htmlinfo.size(); ++i) {
|
|
std::stringstream stream;
|
|
stream << std::fixed << std::setprecision(1) << htmlinfo[i]->val;
|
|
zw = stream.str();
|
|
|
|
result = result + "<img src=\"" + host + "/img_tmp/" + htmlinfo[i]->filename + "\"> " + zw;
|
|
delete htmlinfo[i];
|
|
}
|
|
|
|
htmlinfo.clear();
|
|
|
|
return result;
|
|
}
|
|
|
|
bool ClassFlowCNNGeneral::doFlow(string time) {
|
|
#ifdef HEAP_TRACING_CLASS_FLOW_CNN_GENERAL_DO_ALING_AND_CUT
|
|
//register a buffer to record the memory trace
|
|
ESP_ERROR_CHECK( heap_trace_init_standalone(trace_record, NUM_RECORDS) );
|
|
// start tracing
|
|
ESP_ERROR_CHECK( heap_trace_start(HEAP_TRACE_LEAKS) );
|
|
#endif
|
|
|
|
if (disabled) {
|
|
return true;
|
|
}
|
|
|
|
if (!doAlignAndCut(time)){
|
|
return false;
|
|
}
|
|
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "doFlow after alignment");
|
|
|
|
doNeuralNetwork(time);
|
|
|
|
RemoveOldLogs();
|
|
|
|
#ifdef HEAP_TRACING_CLASS_FLOW_CNN_GENERAL_DO_ALING_AND_CUT
|
|
ESP_ERROR_CHECK( heap_trace_stop() );
|
|
heap_trace_dump();
|
|
#endif
|
|
|
|
return true;
|
|
}
|
|
|
|
bool ClassFlowCNNGeneral::doAlignAndCut(string time) {
|
|
if (disabled) {
|
|
return true;
|
|
}
|
|
|
|
CAlignAndCutImage *caic = flowpostalignment->GetAlignAndCutImage();
|
|
|
|
for (int _ana = 0; _ana < GENERAL.size(); ++_ana) {
|
|
for (int i = 0; i < GENERAL[_ana]->ROI.size(); ++i) {
|
|
ESP_LOGD(TAG, "General %d - Align&Cut", i);
|
|
|
|
caic->CutAndSave(GENERAL[_ana]->ROI[i]->posx, GENERAL[_ana]->ROI[i]->posy, GENERAL[_ana]->ROI[i]->deltax, GENERAL[_ana]->ROI[i]->deltay, GENERAL[_ana]->ROI[i]->image_org);
|
|
if (SaveAllFiles) {
|
|
if (GENERAL[_ana]->name == "default") {
|
|
GENERAL[_ana]->ROI[i]->image_org->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->ROI[i]->name + ".jpg"));
|
|
}
|
|
else {
|
|
GENERAL[_ana]->ROI[i]->image_org->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg"));
|
|
}
|
|
}
|
|
|
|
GENERAL[_ana]->ROI[i]->image_org->Resize(modelxsize, modelysize, GENERAL[_ana]->ROI[i]->image);
|
|
if (SaveAllFiles) {
|
|
if (GENERAL[_ana]->name == "default") {
|
|
GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->ROI[i]->name + ".jpg"));
|
|
}
|
|
else {
|
|
GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg"));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void ClassFlowCNNGeneral::DrawROI(CImageBasis *_zw) {
|
|
if (_zw->ImageOkay()) {
|
|
if (CNNType == Analogue || CNNType == Analogue100) {
|
|
int r = 0;
|
|
int g = 255;
|
|
int b = 0;
|
|
|
|
for (int _ana = 0; _ana < GENERAL.size(); ++_ana) {
|
|
for (int i = 0; i < GENERAL[_ana]->ROI.size(); ++i) {
|
|
_zw->drawRect(GENERAL[_ana]->ROI[i]->posx, GENERAL[_ana]->ROI[i]->posy, GENERAL[_ana]->ROI[i]->deltax, GENERAL[_ana]->ROI[i]->deltay, r, g, b, 1);
|
|
_zw->drawEllipse( (int) (GENERAL[_ana]->ROI[i]->posx + GENERAL[_ana]->ROI[i]->deltax/2), (int) (GENERAL[_ana]->ROI[i]->posy + GENERAL[_ana]->ROI[i]->deltay/2), (int) (GENERAL[_ana]->ROI[i]->deltax/2), (int) (GENERAL[_ana]->ROI[i]->deltay/2), r, g, b, 2);
|
|
_zw->drawLine((int) (GENERAL[_ana]->ROI[i]->posx + GENERAL[_ana]->ROI[i]->deltax/2), (int) GENERAL[_ana]->ROI[i]->posy, (int) (GENERAL[_ana]->ROI[i]->posx + GENERAL[_ana]->ROI[i]->deltax/2), (int) (GENERAL[_ana]->ROI[i]->posy + GENERAL[_ana]->ROI[i]->deltay), r, g, b, 2);
|
|
_zw->drawLine((int) GENERAL[_ana]->ROI[i]->posx, (int) (GENERAL[_ana]->ROI[i]->posy + GENERAL[_ana]->ROI[i]->deltay/2), (int) GENERAL[_ana]->ROI[i]->posx + GENERAL[_ana]->ROI[i]->deltax, (int) (GENERAL[_ana]->ROI[i]->posy + GENERAL[_ana]->ROI[i]->deltay/2), r, g, b, 2);
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
for (int _dig = 0; _dig < GENERAL.size(); ++_dig) {
|
|
for (int i = 0; i < GENERAL[_dig]->ROI.size(); ++i) {
|
|
_zw->drawRect(GENERAL[_dig]->ROI[i]->posx, GENERAL[_dig]->ROI[i]->posy, GENERAL[_dig]->ROI[i]->deltax, GENERAL[_dig]->ROI[i]->deltay, 0, 0, (255 - _dig*100), 2);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
bool ClassFlowCNNGeneral::getNetworkParameter() {
|
|
if (disabled) {
|
|
return true;
|
|
}
|
|
|
|
CTfLiteClass *tflite = new CTfLiteClass;
|
|
string zwcnn = "/sdcard" + cnnmodelfile;
|
|
zwcnn = FormatFileName(zwcnn);
|
|
ESP_LOGD(TAG, "%s", zwcnn.c_str());
|
|
|
|
if (!tflite->LoadModel(zwcnn)) {
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't load tflite model " + cnnmodelfile + " -> Init aborted!");
|
|
LogFile.WriteHeapInfo("getNetworkParameter-LoadModel");
|
|
delete tflite;
|
|
return false;
|
|
}
|
|
|
|
if (!tflite->MakeAllocate()) {
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate tflite model -> Init aborted!");
|
|
LogFile.WriteHeapInfo("getNetworkParameter-MakeAllocate");
|
|
delete tflite;
|
|
return false;
|
|
}
|
|
|
|
if (CNNType == AutoDetect) {
|
|
tflite->GetInputDimension(false);
|
|
modelxsize = tflite->ReadInputDimenstion(0);
|
|
modelysize = tflite->ReadInputDimenstion(1);
|
|
modelchannel = tflite->ReadInputDimenstion(2);
|
|
|
|
int _anzoutputdimensions = tflite->GetAnzOutPut();
|
|
switch (_anzoutputdimensions) {
|
|
case 2:
|
|
CNNType = Analogue;
|
|
ESP_LOGD(TAG, "TFlite-Type set to Analogue");
|
|
break;
|
|
case 10:
|
|
CNNType = DoubleHyprid10;
|
|
ESP_LOGD(TAG, "TFlite-Type set to DoubleHyprid10");
|
|
break;
|
|
case 11:
|
|
CNNType = Digit;
|
|
ESP_LOGD(TAG, "TFlite-Type set to Digit");
|
|
break;
|
|
/* case 20:
|
|
CNNType = DigitHyprid10;
|
|
ESP_LOGD(TAG, "TFlite-Type set to DigitHyprid10");
|
|
break;
|
|
*/
|
|
// case 22:
|
|
// CNNType = DigitHyprid;
|
|
// ESP_LOGD(TAG, "TFlite-Type set to DigitHyprid");
|
|
// break;
|
|
case 100:
|
|
if (modelxsize==32 && modelysize == 32) {
|
|
CNNType = Analogue100;
|
|
ESP_LOGD(TAG, "TFlite-Type set to Analogue100");
|
|
}
|
|
else {
|
|
CNNType = Digit100;
|
|
ESP_LOGD(TAG, "TFlite-Type set to Digit");
|
|
}
|
|
break;
|
|
default:
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "tflite does not fit the firmware (outout_dimension=" + std::to_string(_anzoutputdimensions) + ")");
|
|
}
|
|
}
|
|
|
|
delete tflite;
|
|
return true;
|
|
}
|
|
|
|
bool ClassFlowCNNGeneral::doNeuralNetwork(string time) {
|
|
if (disabled) {
|
|
return true;
|
|
}
|
|
|
|
string logPath = CreateLogFolder(time);
|
|
|
|
CTfLiteClass *tflite = new CTfLiteClass;
|
|
string zwcnn = "/sdcard" + cnnmodelfile;
|
|
zwcnn = FormatFileName(zwcnn);
|
|
ESP_LOGD(TAG, "%s", zwcnn.c_str());
|
|
|
|
if (!tflite->LoadModel(zwcnn)) {
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't load tflite model " + cnnmodelfile + " -> Exec aborted this round!");
|
|
LogFile.WriteHeapInfo("doNeuralNetwork-LoadModel");
|
|
delete tflite;
|
|
return false;
|
|
}
|
|
|
|
if (!tflite->MakeAllocate()) {
|
|
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate tfilte model -> Exec aborted this round!");
|
|
LogFile.WriteHeapInfo("doNeuralNetwork-MakeAllocate");
|
|
delete tflite;
|
|
return false;
|
|
}
|
|
|
|
// For each NUMBER
|
|
for (int n = 0; n < GENERAL.size(); ++n) {
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Processing Number '" + GENERAL[n]->name + "'");
|
|
// For each ROI
|
|
for (int roi = 0; roi < GENERAL[n]->ROI.size(); ++roi) {
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "ROI #" + std::to_string(roi) + " - TfLite");
|
|
//ESP_LOGD(TAG, "General %d - TfLite", i);
|
|
|
|
switch (CNNType) {
|
|
case Analogue:
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CNN Type: Analogue");
|
|
{
|
|
float f1, f2;
|
|
f1 = 0; f2 = 0;
|
|
|
|
tflite->LoadInputImageBasis(GENERAL[n]->ROI[roi]->image);
|
|
tflite->Invoke();
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "After Invoke");
|
|
|
|
f1 = tflite->GetOutputValue(0);
|
|
f2 = tflite->GetOutputValue(1);
|
|
float result = fmod(atan2(f1, f2) / (M_PI * 2) + 2, 1);
|
|
|
|
if(GENERAL[n]->ROI[roi]->CCW) {
|
|
GENERAL[n]->ROI[roi]->result_float = 10 - (result * 10);
|
|
}
|
|
else {
|
|
GENERAL[n]->ROI[roi]->result_float = result * 10;
|
|
}
|
|
|
|
ESP_LOGD(TAG, "General result (Analog)%i - CCW: %d - %f", roi, GENERAL[n]->ROI[roi]->CCW, GENERAL[n]->ROI[roi]->result_float);
|
|
if (isLogImage) {
|
|
LogImage(logPath, GENERAL[n]->ROI[roi]->name, &GENERAL[n]->ROI[roi]->result_float, NULL, time, GENERAL[n]->ROI[roi]->image_org);
|
|
}
|
|
} break;
|
|
|
|
case Digit:
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CNN Type: Digit");
|
|
{
|
|
GENERAL[n]->ROI[roi]->result_klasse = 0;
|
|
GENERAL[n]->ROI[roi]->result_klasse = tflite->GetClassFromImageBasis(GENERAL[n]->ROI[roi]->image);
|
|
ESP_LOGD(TAG, "General result (Digit)%i: %d", roi, GENERAL[n]->ROI[roi]->result_klasse);
|
|
|
|
if (isLogImage) {
|
|
string _imagename = GENERAL[n]->name + "_" + GENERAL[n]->ROI[roi]->name;
|
|
if (isLogImageSelect) {
|
|
if (LogImageSelect.find(GENERAL[n]->ROI[roi]->name) != std::string::npos) {
|
|
LogImage(logPath, _imagename, NULL, &GENERAL[n]->ROI[roi]->result_klasse, time, GENERAL[n]->ROI[roi]->image_org);
|
|
}
|
|
}
|
|
else {
|
|
LogImage(logPath, _imagename, NULL, &GENERAL[n]->ROI[roi]->result_klasse, time, GENERAL[n]->ROI[roi]->image_org);
|
|
}
|
|
}
|
|
} break;
|
|
|
|
case DoubleHyprid10:
|
|
{
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CNN Type: DoubleHyprid10");
|
|
int _num, _numplus, _numminus;
|
|
float _val, _valplus, _valminus;
|
|
float _fit;
|
|
float _result_save_file;
|
|
|
|
tflite->LoadInputImageBasis(GENERAL[n]->ROI[roi]->image);
|
|
tflite->Invoke();
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "After Invoke");
|
|
|
|
_num = tflite->GetOutClassification(0, 9);
|
|
_numplus = (_num + 1) % 10;
|
|
_numminus = (_num - 1 + 10) % 10;
|
|
|
|
_val = tflite->GetOutputValue(_num);
|
|
_valplus = tflite->GetOutputValue(_numplus);
|
|
_valminus = tflite->GetOutputValue(_numminus);
|
|
|
|
float result = _num;
|
|
|
|
if (_valplus > _valminus) {
|
|
result = result + _valplus / (_valplus + _val);
|
|
_fit = _val + _valplus;
|
|
}
|
|
else {
|
|
result = result - _valminus / (_val + _valminus);
|
|
_fit = _val + _valminus;
|
|
}
|
|
|
|
if (result >= 10) {
|
|
result = result - 10;
|
|
}
|
|
|
|
if (result < 0) {
|
|
result = result + 10;
|
|
}
|
|
|
|
string zw = "_num (p, m): " + to_string(_num) + " " + to_string(_numplus) + " " + to_string(_numminus);
|
|
zw = zw + " _val (p, m): " + to_string(_val) + " " + to_string(_valplus) + " " + to_string(_valminus);
|
|
zw = zw + " result: " + to_string(result) + " _fit: " + to_string(_fit);
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zw);
|
|
|
|
_result_save_file = result;
|
|
|
|
if (_fit < CNNGoodThreshold) {
|
|
GENERAL[n]->ROI[roi]->isReject = true;
|
|
result = -1;
|
|
_result_save_file+= 100; // In case fit is not sufficient, the result should still be saved with "-10x.y".
|
|
string zw = "Value Rejected due to Threshold (Fit: " + to_string(_fit) + ", Threshold: " + to_string(CNNGoodThreshold) + ")";
|
|
LogFile.WriteToFile(ESP_LOG_WARN, TAG, zw);
|
|
}
|
|
else {
|
|
GENERAL[n]->ROI[roi]->isReject = false;
|
|
}
|
|
|
|
GENERAL[n]->ROI[roi]->result_float = result;
|
|
ESP_LOGD(TAG, "Result General(Analog)%i: %f", roi, GENERAL[n]->ROI[roi]->result_float);
|
|
|
|
if (isLogImage) {
|
|
string _imagename = GENERAL[n]->name + "_" + GENERAL[n]->ROI[roi]->name;
|
|
if (isLogImageSelect) {
|
|
if (LogImageSelect.find(GENERAL[n]->ROI[roi]->name) != std::string::npos) {
|
|
LogImage(logPath, _imagename, &_result_save_file, NULL, time, GENERAL[n]->ROI[roi]->image_org);
|
|
}
|
|
}
|
|
else {
|
|
LogImage(logPath, _imagename, &_result_save_file, NULL, time, GENERAL[n]->ROI[roi]->image_org);
|
|
}
|
|
}
|
|
} break;
|
|
case Digit100:
|
|
case Analogue100:
|
|
{
|
|
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "CNN Type: Digit100 or Analogue100");
|
|
int _num;
|
|
float _result_save_file;
|
|
|
|
tflite->LoadInputImageBasis(GENERAL[n]->ROI[roi]->image);
|
|
tflite->Invoke();
|
|
|
|
_num = tflite->GetOutClassification();
|
|
|
|
if(GENERAL[n]->ROI[roi]->CCW) {
|
|
GENERAL[n]->ROI[roi]->result_float = 10 - ((float)_num / 10.0);
|
|
}
|
|
else {
|
|
GENERAL[n]->ROI[roi]->result_float = (float)_num / 10.0;
|
|
}
|
|
|
|
_result_save_file = GENERAL[n]->ROI[roi]->result_float;
|
|
|
|
GENERAL[n]->ROI[roi]->isReject = false;
|
|
|
|
ESP_LOGD(TAG, "Result General(Analog)%i - CCW: %d - %f", roi, GENERAL[n]->ROI[roi]->CCW, GENERAL[n]->ROI[roi]->result_float);
|
|
|
|
if (isLogImage) {
|
|
string _imagename = GENERAL[n]->name + "_" + GENERAL[n]->ROI[roi]->name;
|
|
if (isLogImageSelect) {
|
|
if (LogImageSelect.find(GENERAL[n]->ROI[roi]->name) != std::string::npos) {
|
|
LogImage(logPath, _imagename, &_result_save_file, NULL, time, GENERAL[n]->ROI[roi]->image_org);
|
|
}
|
|
}
|
|
else {
|
|
LogImage(logPath, _imagename, &_result_save_file, NULL, time, GENERAL[n]->ROI[roi]->image_org);
|
|
}
|
|
}
|
|
|
|
} break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
delete tflite;
|
|
|
|
return true;
|
|
}
|
|
|
|
bool ClassFlowCNNGeneral::isExtendedResolution(int _number) {
|
|
if (CNNType == Digit) {
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
std::vector<HTMLInfo*> ClassFlowCNNGeneral::GetHTMLInfo() {
|
|
std::vector<HTMLInfo*> result;
|
|
|
|
for (int _ana = 0; _ana < GENERAL.size(); ++_ana) {
|
|
for (int i = 0; i < GENERAL[_ana]->ROI.size(); ++i) {
|
|
ESP_LOGD(TAG, "Image: %d", (int) GENERAL[_ana]->ROI[i]->image);
|
|
if (GENERAL[_ana]->ROI[i]->image) {
|
|
if (GENERAL[_ana]->name == "default") {
|
|
GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->ROI[i]->name + ".jpg"));
|
|
}
|
|
else {
|
|
GENERAL[_ana]->ROI[i]->image->SaveToFile(FormatFileName("/sdcard/img_tmp/" + GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg"));
|
|
}
|
|
}
|
|
|
|
HTMLInfo *zw = new HTMLInfo;
|
|
if (GENERAL[_ana]->name == "default") {
|
|
zw->filename = GENERAL[_ana]->ROI[i]->name + ".jpg";
|
|
zw->filename_org = GENERAL[_ana]->ROI[i]->name + ".jpg";
|
|
}
|
|
else {
|
|
zw->filename = GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg";
|
|
zw->filename_org = GENERAL[_ana]->name + "_" + GENERAL[_ana]->ROI[i]->name + ".jpg";
|
|
}
|
|
|
|
if (CNNType == Digit) {
|
|
zw->val = GENERAL[_ana]->ROI[i]->result_klasse;
|
|
}
|
|
else {
|
|
zw->val = GENERAL[_ana]->ROI[i]->result_float;
|
|
}
|
|
|
|
zw->image = GENERAL[_ana]->ROI[i]->image;
|
|
zw->image_org = GENERAL[_ana]->ROI[i]->image_org;
|
|
|
|
result.push_back(zw);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
int ClassFlowCNNGeneral::getNumberGENERAL() {
|
|
return GENERAL.size();
|
|
}
|
|
|
|
string ClassFlowCNNGeneral::getNameGENERAL(int _analog) {
|
|
if (_analog < GENERAL.size()) {
|
|
return GENERAL[_analog]->name;
|
|
}
|
|
|
|
return "GENERAL DOES NOT EXIST";
|
|
}
|
|
|
|
general* ClassFlowCNNGeneral::GetGENERAL(int _analog) {
|
|
if (_analog < GENERAL.size()) {
|
|
return GENERAL[_analog];
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
void ClassFlowCNNGeneral::UpdateNameNumbers(std::vector<std::string> *_name_numbers) {
|
|
for (int _dig = 0; _dig < GENERAL.size(); _dig++) {
|
|
std::string _name = GENERAL[_dig]->name;
|
|
bool found = false;
|
|
|
|
for (int i = 0; i < (*_name_numbers).size(); ++i) {
|
|
if ((*_name_numbers)[i] == _name) {
|
|
found = true;
|
|
}
|
|
}
|
|
if (!found) {
|
|
(*_name_numbers).push_back(_name);
|
|
}
|
|
}
|
|
}
|
|
|
|
string ClassFlowCNNGeneral::getReadoutRawString(int _analog)
|
|
{
|
|
string rt = "";
|
|
|
|
if (_analog >= GENERAL.size() || GENERAL[_analog]==NULL || GENERAL[_analog]->ROI.size() == 0) {
|
|
return rt;
|
|
}
|
|
|
|
for (int i = 0; i < GENERAL[_analog]->ROI.size(); ++i) {
|
|
if (CNNType == Analogue || CNNType == Analogue100) {
|
|
rt = rt + "," + RundeOutput(GENERAL[_analog]->ROI[i]->result_float, 1);
|
|
}
|
|
|
|
if (CNNType == Digit) {
|
|
if (GENERAL[_analog]->ROI[i]->result_klasse >= 10) {
|
|
rt = rt + ",N";
|
|
}
|
|
else {
|
|
rt = rt + "," + RundeOutput(GENERAL[_analog]->ROI[i]->result_klasse, 0);
|
|
}
|
|
}
|
|
|
|
if ((CNNType == DoubleHyprid10) || (CNNType == Digit100)) {
|
|
rt = rt + "," + RundeOutput(GENERAL[_analog]->ROI[i]->result_float, 1);
|
|
}
|
|
}
|
|
return rt;
|
|
}
|