mirror/darknet
1
0
Fork 0
mirror of https://github.com/pjreddie/darknet.git synced 2023-08-10 21:13:14 +03:00
Code Issues Projects Releases Wiki Activity

Fix: Ignore incorrect dataset labels instead of causing seg-fault error.

Browse Source
This commit is contained in:
AlexeyAB
2018-05-28 22:57:53 +03:00
parent 1b7a1a0f33
commit 6fd90762c5
1 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/data.c
View File

@ -287,15 +287,15 @@ void fill_truth_region(char *path, float *truth, int classes, int num_boxes, int
free(boxes); free(boxes);
} }
void fill_truth_detection(char *path, int num_boxes, float *truth, int classes, int flip, float dx, float dy, float sx, float sy, void fill_truth_detection(char *path, int num_boxes, float *truth, int classes, int flip, float dx, float dy, float sx, float sy,
int small_object, int net_w, int net_h) int small_object, int net_w, int net_h)
{ {
char labelpath[4096]; char labelpath[4096];
replace_image_to_label(path, labelpath); replace_image_to_label(path, labelpath);
int count = 0; int count = 0;
int i; int i;
box_label *boxes = read_boxes(labelpath, &count); box_label *boxes = read_boxes(labelpath, &count);
float lowest_w = 1.F / net_w; float lowest_w = 1.F / net_w;
float lowest_h = 1.F / net_h; float lowest_h = 1.F / net_h;
if (small_object == 1) { if (small_object == 1) {
@ -304,23 +304,35 @@ void fill_truth_detection(char *path, int num_boxes, float *truth, int classes,
if (boxes[i].h < lowest_h) boxes[i].h = lowest_h; if (boxes[i].h < lowest_h) boxes[i].h = lowest_h;
} }
} }
randomize_boxes(boxes, count); randomize_boxes(boxes, count);
correct_boxes(boxes, count, dx, dy, sx, sy, flip); correct_boxes(boxes, count, dx, dy, sx, sy, flip);
if(count > num_boxes) count = num_boxes; if (count > num_boxes) count = num_boxes;
float x,y,w,h; float x, y, w, h;
int id; int id;
for (i = 0; i < count; ++i) { for (i = 0; i < count; ++i) {
x = boxes[i].x; x = boxes[i].x;
y = boxes[i].y; y = boxes[i].y;
w = boxes[i].w; w = boxes[i].w;
h = boxes[i].h; h = boxes[i].h;
id = boxes[i].id; id = boxes[i].id;
// not detect small objects // not detect small objects
//if ((w < 0.001F || h < 0.001F)) continue; //if ((w < 0.001F || h < 0.001F)) continue;
// if truth (box for object) is smaller than 1x1 pix // if truth (box for object) is smaller than 1x1 pix
if ((w < lowest_w || h < lowest_h)) continue; if ((w < lowest_w || h < lowest_h)) continue;
if (x == 999999 || y == 999999) {
printf("\n Wrong annotation: x = 0, y = 0 \n");
continue;
}
if (x < 0 || x > 1 || y < 0 || y > 1) {
printf("\n Wrong annotation: x = %f, y = %f \n", x, y);
continue;
}
if (w > 1) printf("\n Wrong annotation: w = %f \n", w), w = 1;
if (h > 1) printf("\n Wrong annotation: h = %f \n", h), h = 1;
if (x == 0) x += lowest_w;
if (y == 0) y += lowest_h;
truth[i*5+0] = x; truth[i*5+0] = x;
truth[i*5+1] = y; truth[i*5+1] = y;