Merge with master

Signed-off-by: Micaela Verucchi <micaelaverucchi@gmail.com>

demo/config.yaml

@@ -3,5 +3,5 @@ map_points  : 101   #number of recall points (0 for all, 101 for COCO, 11 Pascal
 map_levels  : 10    #number of IoU step for the AP
 map_step    : 0.05  #step of IoU
 IoU_thresh  : 0.5   #starting IoU threshold
-conf_thresh : 0.0   #threshold on the condifence of the bbox
+conf_thresh : 0.001   #threshold on the condifence of the bbox
 verbose     : false #print on screen information

demo/demo/demo.cpp

@@ -40,6 +40,9 @@ int main(int argc, char *argv[]) {
     bool show = true;
     if(argc > 6)
         show = atoi(argv[6]); 
+    float conf_thresh=0.3;
+    if(argc > 7)
+        conf_thresh = atof(argv[7]);     
 
     if(n_batch < 1 || n_batch > 64)
         FatalError("Batch dim not supported");
@@ -69,8 +72,7 @@ int main(int argc, char *argv[]) {
         FatalError("Network type not allowed (3rd parameter)\n");
     }
 
-    float conf_thresh = 0.3;
-    detNN->init(net, conf_thresh, n_classes, n_batch);
+    detNN->init(net, n_classes, n_batch, conf_thresh);
 
     gRun = true;
 

demo/demo/map.cpp

@@ -113,7 +113,7 @@ int main(int argc, char *argv[])
         default:
             FatalError("Network type not allowed (3rd parameter)\n");
     }
-    detNN->init(net, confidence_thresh, n_classes, n_batches);
+    detNN->init(net, n_classes, 1, conf_thresh);
 
     //read images 
     std::ifstream all_labels(labels_path);