Fixed detector recall

XHuaSheng · Apr 2, 2018 · 726cebd · 726cebd
1 parent c3c6703
commit 726cebd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/build/darknet/x64/darknet_web_cam_voc.cmd b/build/darknet/x64/darknet_web_cam_voc.cmd
@@ -1,6 +1,9 @@
 # play video from Web-Camera number 0
 
-darknet.exe detector demo data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights -c 0
+rem darknet.exe detector demo data/voc.data cfg/yolov2-voc.cfg yolo-voc.weights -c 0
+
+
+darknet.exe detector demo data/coco.data cfg/yolov3.cfg yolov3.weights -c 0
 
 
 pause
diff --git a/src/detector.c b/src/detector.c
@@ -471,7 +471,7 @@ void validate_detector_recall(char *datacfg, char *cfgfile, char *weightfile)
 			++total;
 			box t = { truth[j].x, truth[j].y, truth[j].w, truth[j].h };
 			float best_iou = 0;
-			for (k = 0; k < l.w*l.h*l.n; ++k) {
+			for (k = 0; k < nboxes; ++k) {
 				float iou = box_iou(dets[k].bbox, t);
 				if (dets[k].objectness > thresh && iou > best_iou) {
 					best_iou = iou;
@@ -828,7 +828,7 @@ int anchors_comparator(const void *pa, const void *pb)
 {
 	anchors_t a = *(anchors_t *)pa;
 	anchors_t b = *(anchors_t *)pb;
-	float diff = b.w - a.w;
+	float diff = b.w*b.h - a.w*a.h;
 	if (diff < 0) return 1;
 	else if (diff > 0) return -1;
 	return 0;