From 23d94e4846bf4ec13069703a28b1d776f4bbe44f Mon Sep 17 00:00:00 2001
From: Edmond Yoo <hj3yoo@uwaterloo.ca>
Date: Sat, 13 Oct 2018 18:49:47 +0000
Subject: [PATCH] Cleaning & commenting #3 - refactoring constants to Config class
---
src/box.h | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/box.h b/src/box.h
index 0aa0c59..6063a48 100644
--- a/src/box.h
+++ b/src/box.h
@@ -1,11 +1,6 @@
#ifndef BOX_H
#define BOX_H
-#ifdef _DEBUG
-#include <stdlib.h>
-#include <crtdbg.h>
-#endif
-
#ifdef YOLODLL_EXPORTS
#if defined(_MSC_VER)
#define YOLODLL_API __declspec(dllexport)
@@ -37,6 +32,13 @@
int sort_class;
} detection;
+typedef struct detection_with_class {
+ detection det;
+ // The most probable class id: the best class index in this->prob.
+ // Is filled temporary when processing results, otherwise not initialized
+ int best_class;
+} detection_with_class;
+
box float_to_box(float *f);
float box_iou(box a, box b);
float box_rmse(box a, box b);
@@ -48,4 +50,8 @@
box decode_box(box b, box anchor);
box encode_box(box b, box anchor);
+// Creates array of detections with prob > thresh and fills best_class for them
+// Return number of selected detections in *selected_detections_num
+detection_with_class* get_actual_detections(detection *dets, int dets_num, float thresh, int* selected_detections_num);
+
#endif
--
Gitblit v1.10.0