From 0f645836f193e75c4c3b718369e6fab15b5d19c5 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 11 Feb 2015 03:41:03 +0000
Subject: [PATCH] Detection is back, baby\!

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

diff --git a/src/data.h b/src/data.h
index c01384c..13b62d8 100644
--- a/src/data.h
+++ b/src/data.h
@@ -1,18 +1,38 @@
 #ifndef DATA_H
 #define DATA_H
+#include <pthread.h>
 
-#include "image.h"
+#include "matrix.h"
+#include "list.h"
 
 typedef struct{
-    int n;
-    image *images;
-    double **truth;
-} batch;
+    matrix X;
+    matrix y;
+    int shallow;
+} data;
 
-batch get_all_data(char *filename, char **labels, int k);
-batch random_batch(char *filename, int n, char **labels, int k);
-batch get_batch(char *filename, int curr, int total, char **labels, int k);
-void free_batch(batch b);
 
+void free_data(data d);
+
+data load_data(char **paths, int n, int m, char **labels, int k, int h, int w);
+pthread_t load_data_thread(char **paths, int n, int m, char **labels, int k, int h, int w, data *d);
+
+pthread_t load_data_detection_thread(int n, char **paths, int m, int h, int w, int nh, int nw, int jitter, data *d);
+data load_data_detection_jitter_random(int n, char **paths, int m, int h, int w, int nh, int nw, int jitter);
+data load_data_detection_random(int n, char **paths, int m, int h, int w, int nh, int nw);
+
+data load_data_image_pathfile(char *filename, char **labels, int k, int h, int w);
+data load_cifar10_data(char *filename);
+data load_all_cifar10();
+list *get_paths(char *filename);
+char **get_labels(char *filename);
+void get_random_batch(data d, int n, float *X, float *y);
+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);
+void scale_data_rows(data d, float s);
+void translate_data_rows(data d, float s);
+void randomize_data(data d);
+data *split_data(data d, int part, int total);
 
 #endif

--
Gitblit v1.10.0