From cf32e7e9b843560eb7ec3ed16e5b19f0f7156724 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Sat, 25 Jun 2016 23:12:00 +0000
Subject: [PATCH] colors

---
 src/data.h |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/data.h b/src/data.h
index f928ade..11363f1 100644
--- a/src/data.h
+++ b/src/data.h
@@ -23,11 +23,14 @@
     int w, h;
     matrix X;
     matrix y;
+    int *indexes;
     int shallow;
+    int *num_boxes;
+    box **boxes;
 } data;
 
 typedef enum {
-    CLASSIFICATION_DATA, DETECTION_DATA, CAPTCHA_DATA, REGION_DATA, IMAGE_DATA, COMPARE_DATA, WRITING_DATA, SWAG_DATA, TAG_DATA, OLD_CLASSIFICATION_DATA
+    CLASSIFICATION_DATA, DETECTION_DATA, CAPTCHA_DATA, REGION_DATA, IMAGE_DATA, COMPARE_DATA, WRITING_DATA, SWAG_DATA, TAG_DATA, OLD_CLASSIFICATION_DATA, STUDY_DATA, DET_DATA
 } data_type;
 
 typedef struct load_args{
@@ -67,9 +70,10 @@
 data load_data_captcha(char **paths, int n, int m, int k, int w, int h);
 data load_data_captcha_encode(char **paths, int n, int m, int w, int h);
 data load_data(char **paths, int n, int m, char **labels, int k, int w, int h);
-data load_data_detection(int n, char **paths, int m, int classes, int w, int h, int num_boxes, int background);
+data load_data_detection(int n, char **paths, int m, int w, int h, int boxes, int classes, float jitter);
 data load_data_tag(char **paths, int n, int m, int k, int min, int max, int size);
 data load_data_augment(char **paths, int n, int m, char **labels, int k, int min, int max, int size);
+data load_data_study(char **paths, int n, int m, char **labels, int k, int min, int max, int size);
 data load_go(char *filename);
 
 box_label *read_boxes(char *filename, int *n);
@@ -90,5 +94,6 @@
 void randomize_data(data d);
 data *split_data(data d, int part, int total);
 data concat_data(data d1, data d2);
+void fill_truth(char *path, char **labels, int k, float *truth);
 
 #endif

--
Gitblit v1.10.0