From 1fd10265f8a63d1b1305f40111a97518f5541da2 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Tue, 07 Apr 2015 22:25:30 +0000
Subject: [PATCH] detection better?

---
 src/network.h |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/network.h b/src/network.h
index 66873d2..ed8872b 100644
--- a/src/network.h
+++ b/src/network.h
@@ -3,6 +3,8 @@
 #define NETWORK_H
 
 #include "image.h"
+#include "detection_layer.h"
+#include "params.h"
 #include "data.h"
 
 typedef enum {
@@ -11,9 +13,9 @@
     CONNECTED,
     MAXPOOL,
     SOFTMAX,
+    DETECTION,
     NORMALIZATION,
     DROPOUT,
-    FREEWEIGHT,
     CROP,
     COST
 } LAYER_TYPE;
@@ -22,6 +24,7 @@
     int n;
     int batch;
     int seen;
+    int subdivisions;
     float learning_rate;
     float momentum;
     float decay;
@@ -30,6 +33,9 @@
     int outputs;
     float *output;
 
+    int inputs;
+    int h, w, c;
+
     #ifdef GPU
     float **input_gpu;
     float **truth_gpu;
@@ -46,9 +52,9 @@
 void compare_networks(network n1, network n2, data d);
 char *get_layer_string(LAYER_TYPE a);
 
-network make_network(int n, int batch);
-void forward_network(network net, float *input, float *truth, int train);
-void backward_network(network net, float *input);
+network make_network(int n);
+void forward_network(network net, network_state state);
+void backward_network(network net, network_state state);
 void update_network(network net);
 
 float train_network(network net, data d);
@@ -74,9 +80,12 @@
 void visualize_network(network net);
 int resize_network(network net, int h, int w, int c);
 void set_batch_network(network *net, int b);
-void set_learning_network(network *net, float rate, float momentum, float decay);
 int get_network_input_size(network net);
 float get_network_cost(network net);
+detection_layer *get_network_detection_layer(network net);
+
+int get_network_nuisance(network net);
+int get_network_background(network net);
 
 #endif
 

--
Gitblit v1.10.0