From 665b821e6e78cdb7ded80cae2949ebf6b19b00a0 Mon Sep 17 00:00:00 2001
From: nilboy <jiangxinghuuua@gmail.com>
Date: Wed, 15 Mar 2017 13:13:59 +0800
Subject: [PATCH] fix yolo_net loss bug

---
 yolo/net/yolo_net.py | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/yolo/net/yolo_net.py b/yolo/net/yolo_net.py
index 0dfa034..39866f6 100644
--- a/yolo/net/yolo_net.py
+++ b/yolo/net/yolo_net.py
@@ -165,6 +165,26 @@ def body1(self, num, object_num, loss, predict, labels, nilboy):
     label = labels[num:num+1, :]
     label = tf.reshape(label, [-1])
 
+    #calculate objects  tensor [CELL_SIZE, CELL_SIZE]
+    min_x = (label[0] - label[2] / 2) / (self.image_size / self.cell_size)
+    max_x = (label[0] + label[2] / 2) / (self.image_size / self.cell_size)
+
+    min_y = (label[1] - label[3] / 2) / (self.image_size / self.cell_size)
+    max_y = (label[1] + label[3] / 2) / (self.image_size / self.cell_size)
+
+    min_x = tf.floor(min_x)
+    min_y = tf.floor(min_y)
+
+    max_x = tf.ceil(max_x)
+    max_y = tf.ceil(max_y)
+
+    temp = tf.cast(tf.stack([max_y - min_y, max_x - min_x]), dtype=tf.int32)
+    objects = tf.ones(temp, tf.float32)
+
+    temp = tf.cast(tf.stack([min_y, self.cell_size - max_y, min_x, self.cell_size - max_x]), tf.int32)
+    temp = tf.reshape(temp, (2, 2))
+    objects = tf.pad(objects, temp, "CONSTANT")
+
     #calculate objects  tensor [CELL_SIZE, CELL_SIZE]
     #calculate responsible tensor [CELL_SIZE, CELL_SIZE]
     center_x = label[0] / (self.image_size / self.cell_size)
@@ -175,10 +195,10 @@ def body1(self, num, object_num, loss, predict, labels, nilboy):
 
     response = tf.ones([1, 1], tf.float32)
 
-    temp = tf.cast(tf.pack([center_y, self.cell_size - center_y - 1, center_x, self.cell_size -center_x - 1]), tf.int32)
+    temp = tf.cast(tf.stack([center_y, self.cell_size - center_y - 1, center_x, self.cell_size -center_x - 1]), tf.int32)
     temp = tf.reshape(temp, (2, 2))
     response = tf.pad(response, temp, "CONSTANT")
-    objects = response
+    #objects = response
 
     #calculate iou_predict_truth [CELL_SIZE, CELL_SIZE, BOXES_PER_CELL]
     predict_boxes = predict[:, :, self.num_classes + self.boxes_per_cell:]
@@ -200,7 +220,7 @@ def body1(self, num, object_num, loss, predict, labels, nilboy):
 
     iou_predict_truth = self.iou(predict_boxes, label[0:4])
     #calculate C [cell_size, cell_size, boxes_per_cell]
-    C = iou_predict_truth * tf.reshape(objects, [self.cell_size, self.cell_size, 1])
+    C = iou_predict_truth * tf.reshape(response, [self.cell_size, self.cell_size, 1])
 
     #calculate I tensor [CELL_SIZE, CELL_SIZE, BOXES_PER_CELL]
     I = iou_predict_truth * tf.reshape(response, (self.cell_size, self.cell_size, 1))
@@ -265,7 +285,6 @@ def body1(self, num, object_num, loss, predict, labels, nilboy):
     return num + 1, object_num, [loss[0] + class_loss, loss[1] + object_loss, loss[2] + noobject_loss, loss[3] + coord_loss], predict, labels, nilboy
 
 
-
   def loss(self, predicts, labels, objects_num):
     """Add Loss to all the trainable variables