From ae43c2bc32fbb838bfebeeaf2c2b058ccab5c83c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@burninator.cs.washington.edu>
Date: Thu, 23 Jun 2016 05:31:14 +0000
Subject: [PATCH] hi
---
src/data.h | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/data.h b/src/data.h
index 0dacea2..11363f1 100644
--- a/src/data.h
+++ b/src/data.h
@@ -20,13 +20,17 @@
}
typedef struct{
+ 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
+ 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{
@@ -42,6 +46,7 @@
int nh;
int nw;
int num_boxes;
+ int min, max, size;
int classes;
int background;
float jitter;
@@ -65,7 +70,11 @@
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);
data load_cifar10_data(char *filename);
@@ -76,6 +85,7 @@
list *get_paths(char *filename);
char **get_labels(char *filename);
void get_random_batch(data d, int n, float *X, float *y);
+data get_random_data(data d, int num);
void get_next_batch(data d, int n, int offset, float *X, float *y);
data load_categorical_data_csv(char *filename, int target, int k);
void normalize_data_rows(data d);
@@ -84,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