From 974369793ae64989e46ff3f6751d7f46a52c8f69 Mon Sep 17 00:00:00 2001
From: Tim <tim.vandaalen@wur.nl>
Date: Tue, 13 Apr 2021 16:09:19 +0200
Subject: [PATCH] cfg update: removed redundant parameters, made file-paths
 explicit for the shortcuts

---
 cfg/classification.yaml         | 14 +++++---------
 cfg/classification_patches.yaml | 14 +++++---------
 cfg/detection.yaml              | 13 ++++---------
 3 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/cfg/classification.yaml b/cfg/classification.yaml
index 9d744b6..e44afba 100644
--- a/cfg/classification.yaml
+++ b/cfg/classification.yaml
@@ -6,9 +6,6 @@ img-size: 545
 img-patches: False
 max-img-width: 1600
 max-img-height: 1200
-conf-thres: 0.7
-nms-thres: 0.3
-view-img: True 
 
 #general
 logging: False #logging is the only process which can cause out of memory crashes! 
@@ -18,17 +15,16 @@ AGENSO: True
 save-GPS: True
 save-IMGS: True
 save-every-x: 10 #dont save all imgs & GPS coordinates, its simply to much
-min-movement-frame: 0.1 #M between GPS pulses (1 puls/2min) 
+min-movement-pulse: 0.6 #M between GPS pulses (1 puls/2min) 
 GPS-checks: False  #enable/disable GPS moving checks to facilitate desk debugging
-Visualize-output: True
 
 #AGENSO
 AGENSO-batchsize: 20 #number of detections we send in one file
 AGENSO-send-interval: 15 #300 #send stored results in a burst every x secs
 
 #folders
-weights-folder: weights
+weights-folder: /home/adlink/inference/weights
 img-input-folder: /home/adlink/inference/data/images/apple_scab
-nn-output-folder: results/adlink_acquistion_session1
-AGENSO-messages-folder: results/AGENSO/to_send
-AGENSO-error-folder: results/AGENSO/error
+nn-output-folder: /home/adlink/inference/results/adlink_acquistion_session1
+AGENSO-messages-folder: /home/adlink/inference/results/AGENSO/to_send
+AGENSO-error-folder: /home/adlink/inference/results/AGENSO/error
diff --git a/cfg/classification_patches.yaml b/cfg/classification_patches.yaml
index 234fbec..bf5880e 100644
--- a/cfg/classification_patches.yaml
+++ b/cfg/classification_patches.yaml
@@ -6,9 +6,6 @@ img-size: 224
 img-patches: True
 max-img-width: 1600
 max-img-height: 1200
-conf-thres: 0.7
-nms-thres: 0.3
-view-img: True 
 
 #general
 logging: False #logging is the only process which can cause out of memory crashes! 
@@ -18,17 +15,16 @@ AGENSO: True
 save-GPS: True
 save-IMGS: True
 save-every-x: 10 #dont save all imgs & GPS coordinates, its simply to much
-min-movement-frame: 0.1 #M between GPS pulses (1 puls/2min) 
+min-movement-pulse: 0.6 #M between GPS pulses (1 puls/2min) 
 GPS-checks: False  #enable/disable GPS moving checks to facilitate desk debugging
-Visualize-output: True
 
 #AGENSO
 AGENSO-batchsize: 20 #number of detections we send in one file
 AGENSO-send-interval: 15 #300 #send stored results in a burst every x secs
 
 #folders
-weights-folder: weights
+weights-folder: /home/adlink/inference/weights
 img-input-folder: /home/adlink/inference/data/images/apple_scab
-nn-output-folder: results/adlink_acquistion_session1
-AGENSO-messages-folder: results/AGENSO/to_send
-AGENSO-error-folder: results/AGENSO/error
+nn-output-folder: /home/adlink/inference/results/adlink_acquistion_session1
+AGENSO-messages-folder: /home/adlink/inference/results/AGENSO/to_send
+AGENSO-error-folder: /home/adlink/inference/results/AGENSO/error
diff --git a/cfg/detection.yaml b/cfg/detection.yaml
index e57c889..603694d 100644
--- a/cfg/detection.yaml
+++ b/cfg/detection.yaml
@@ -3,12 +3,8 @@ dl-mode: detection
 tensorrt: False
 use-case: apple_scab
 img-size: 640
-img-patches: False
-max-img-width: 1600
-max-img-height: 1200
 conf-thres: 0.7
 nms-thres: 0.3
-view-img: True 
 
 #general
 logging: False #logging is the only process which can cause out of memory crashes! 
@@ -20,15 +16,14 @@ save-IMGS: True
 save-every-x: 10 #dont save all imgs & GPS coordinates, its simply to much
 min-movement-pulse: 0.6 #M between GPS pulses (1 puls/2 seconds, 0.6 = 0.3 m/s and 1 km/h) 
 GPS-checks: True  #enable/disable GPS moving checks to facilitate desk debugging
-Visualize-output: True
 
 #AGENSO
 AGENSO-batchsize: 20 #number of detections we send in one file
 AGENSO-send-interval: 15 #300 #send stored results in a burst every x secs
 
 #folders
-weights-folder: weights
+weights-folder: /home/adlink/inference/weights
 img-input-folder: /home/adlink/inference/data/images/apple_scab
-nn-output-folder: results/adlink_acquistion_session1
-AGENSO-messages-folder: results/AGENSO/to_send
-AGENSO-error-folder: results/AGENSO/error
+nn-output-folder: /home/adlink/inference/results/adlink_acquistion_session1
+AGENSO-messages-folder: /home/adlink/inference/results/AGENSO/to_send
+AGENSO-error-folder: /home/adlink/inference/results/AGENSO/error
-- 
GitLab