From 04c0c4fdf84bb7b9e89604e8b9a6079016d5968c Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Wed, 04 Jul 2018 16:06:41 +0000
Subject: [PATCH] Merge pull request #1132 from tinohager/master
---
src/data.c | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/src/data.c b/src/data.c
index a15bc1d..d92e307 100644
--- a/src/data.c
+++ b/src/data.c
@@ -51,6 +51,7 @@
random_paths[i] = paths[index];
//if(i == 0) printf("%s\n", paths[index]);
//printf("grp: %s\n", paths[index]);
+ if (strlen(random_paths[i]) <= 4) printf(" Very small path to the image: %s \n", random_paths[i]);
} while (strlen(random_paths[i]) == 0);
}
pthread_mutex_unlock(&mutex);
@@ -322,17 +323,43 @@
// not detect small objects
//if ((w < 0.001F || h < 0.001F)) continue;
// if truth (box for object) is smaller than 1x1 pix
- if ((w < lowest_w || h < lowest_h)) continue;
+ char buff[256];
+ if (id >= classes) {
+ printf("\n Wrong annotation: class_id = %d. But class_id should be [from 0 to %d] \n", id, classes);
+ sprintf(buff, "echo %s \"Wrong annotation: class_id = %d. But class_id should be [from 0 to %d]\" >> bad_label.list", labelpath, id, classes);
+ system(buff);
+ getchar();
+ continue;
+ }
+ if ((w < lowest_w || h < lowest_h)) {
+ //sprintf(buff, "echo %s \"Very small object: w < lowest_w OR h < lowest_h\" >> bad_label.list", labelpath);
+ //system(buff);
+ continue;
+ }
if (x == 999999 || y == 999999) {
printf("\n Wrong annotation: x = 0, y = 0 \n");
+ sprintf(buff, "echo %s \"Wrong annotation: x = 0 or y = 0\" >> bad_label.list", labelpath);
+ system(buff);
continue;
}
- if (x < 0 || x > 1 || y < 0 || y > 1) {
+ if (x <= 0 || x > 1 || y <= 0 || y > 1) {
printf("\n Wrong annotation: x = %f, y = %f \n", x, y);
+ sprintf(buff, "echo %s \"Wrong annotation: x = %f, y = %f\" >> bad_label.list", labelpath, x, y);
+ system(buff);
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 (w > 1) {
+ printf("\n Wrong annotation: w = %f \n", w);
+ sprintf(buff, "echo %s \"Wrong annotation: w = %f\" >> bad_label.list", labelpath, w);
+ system(buff);
+ w = 1;
+ }
+ if (h > 1) {
+ printf("\n Wrong annotation: h = %f \n", h);
+ sprintf(buff, "echo %s \"Wrong annotation: h = %f\" >> bad_label.list", labelpath, h);
+ system(buff);
+ h = 1;
+ }
if (x == 0) x += lowest_w;
if (y == 0) y += lowest_h;
@@ -486,14 +513,20 @@
return y;
}
-char **get_labels(char *filename)
+char **get_labels_custom(char *filename, int *size)
{
list *plist = get_paths(filename);
+ if(size) *size = plist->size;
char **labels = (char **)list_to_array(plist);
free_list(plist);
return labels;
}
+char **get_labels(char *filename)
+{
+ return get_labels_custom(filename, NULL);
+}
+
void free_data(data d)
{
if(!d.shallow){
@@ -687,8 +720,9 @@
#include "http_stream.h"
-data load_data_detection(int n, char **paths, int m, int w, int h, int boxes, int classes, int use_flip, float jitter, float hue, float saturation, float exposure, int small_object)
+data load_data_detection(int n, char **paths, int m, int w, int h, int c, int boxes, int classes, int use_flip, float jitter, float hue, float saturation, float exposure, int small_object)
{
+ c = c ? c : 3;
char **random_paths = get_random_paths(paths, n, m);
int i;
data d = {0};
@@ -696,13 +730,13 @@
d.X.rows = n;
d.X.vals = calloc(d.X.rows, sizeof(float*));
- d.X.cols = h*w*3;
+ d.X.cols = h*w*c;
d.y = make_matrix(n, 5*boxes);
for(i = 0; i < n; ++i){
const char *filename = random_paths[i];
- int flag = 1;
+ int flag = (c >= 3);
IplImage *src;
if ((src = cvLoadImage(filename, flag)) == 0)
{
@@ -754,8 +788,9 @@
return d;
}
#else // OPENCV
-data load_data_detection(int n, char **paths, int m, int w, int h, int boxes, int classes, int use_flip, float jitter, float hue, float saturation, float exposure, int small_object)
+data load_data_detection(int n, char **paths, int m, int w, int h, int c, int boxes, int classes, int use_flip, float jitter, float hue, float saturation, float exposure, int small_object)
{
+ c = c ? c : 3;
char **random_paths = get_random_paths(paths, n, m);
int i;
data d = { 0 };
@@ -763,11 +798,11 @@
d.X.rows = n;
d.X.vals = calloc(d.X.rows, sizeof(float*));
- d.X.cols = h*w * 3;
+ d.X.cols = h*w*c;
d.y = make_matrix(n, 5 * boxes);
for (i = 0; i < n; ++i) {
- image orig = load_image_color(random_paths[i], 0, 0);
+ image orig = load_image(random_paths[i], 0, 0, c);
int oh = orig.h;
int ow = orig.w;
@@ -827,16 +862,16 @@
} else if (a.type == REGION_DATA){
*a.d = load_data_region(a.n, a.paths, a.m, a.w, a.h, a.num_boxes, a.classes, a.jitter, a.hue, a.saturation, a.exposure);
} else if (a.type == DETECTION_DATA){
- *a.d = load_data_detection(a.n, a.paths, a.m, a.w, a.h, a.num_boxes, a.classes, a.flip, a.jitter, a.hue, a.saturation, a.exposure, a.small_object);
+ *a.d = load_data_detection(a.n, a.paths, a.m, a.w, a.h, a.c, a.num_boxes, a.classes, a.flip, a.jitter, a.hue, a.saturation, a.exposure, a.small_object);
} else if (a.type == SWAG_DATA){
*a.d = load_data_swag(a.paths, a.n, a.classes, a.jitter);
} else if (a.type == COMPARE_DATA){
*a.d = load_data_compare(a.n, a.paths, a.m, a.classes, a.w, a.h);
} else if (a.type == IMAGE_DATA){
- *(a.im) = load_image_color(a.path, 0, 0);
+ *(a.im) = load_image(a.path, 0, 0, a.c);
*(a.resized) = resize_image(*(a.im), a.w, a.h);
}else if (a.type == LETTERBOX_DATA) {
- *(a.im) = load_image_color(a.path, 0, 0);
+ *(a.im) = load_image(a.path, 0, 0, a.c);
*(a.resized) = letterbox_image(*(a.im), a.w, a.h);
} else if (a.type == TAG_DATA){
*a.d = load_data_tag(a.paths, a.n, a.m, a.classes, a.flip, a.min, a.max, a.size, a.angle, a.aspect, a.hue, a.saturation, a.exposure);
--
Gitblit v1.10.0