From 4528f9b4b49dc701d3de7b38fa59c17c41702679 Mon Sep 17 00:00:00 2001
From: AlexeyAB <alexeyab84@gmail.com>
Date: Tue, 08 Aug 2017 15:23:57 +0000
Subject: [PATCH] Fixed - use individual track_id for each class of object

---
 src/detection_layer.h |   34 +++++++++-------------------------
 1 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/src/detection_layer.h b/src/detection_layer.h
index 0aa5f66..e847a09 100644
--- a/src/detection_layer.h
+++ b/src/detection_layer.h
@@ -1,35 +1,19 @@
 #ifndef DETECTION_LAYER_H
 #define DETECTION_LAYER_H
 
-#include "params.h"
+#include "layer.h"
+#include "network.h"
 
-typedef struct {
-    int batch;
-    int inputs;
-    int classes;
-    int coords;
-    int background;
-    int rescore;
-    int nuisance;
-    int does_cost;
-    float *cost;
-    float *output;
-    float *delta;
-    #ifdef GPU
-    float * output_gpu;
-    float * delta_gpu;
-    #endif
-} detection_layer;
+typedef layer detection_layer;
 
-detection_layer *make_detection_layer(int batch, int inputs, int classes, int coords, int rescore, int background, int nuisance);
-void forward_detection_layer(const detection_layer layer, network_state state);
-void backward_detection_layer(const detection_layer layer, network_state state);
-int get_detection_layer_output_size(detection_layer layer);
-int get_detection_layer_locations(detection_layer layer);
+detection_layer make_detection_layer(int batch, int inputs, int n, int size, int classes, int coords, int rescore);
+void forward_detection_layer(const detection_layer l, network_state state);
+void backward_detection_layer(const detection_layer l, network_state state);
+void get_detection_boxes(layer l, int w, int h, float thresh, float **probs, box *boxes, int only_objectness);
 
 #ifdef GPU
-void forward_detection_layer_gpu(const detection_layer layer, network_state state);
-void backward_detection_layer_gpu(detection_layer layer, network_state state);
+void forward_detection_layer_gpu(const detection_layer l, network_state state);
+void backward_detection_layer_gpu(detection_layer l, network_state state);
 #endif
 
 #endif

--
Gitblit v1.10.0