From d9f1b0b16edeb59281355a855e18a8be343fc33c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 08 Aug 2014 19:04:15 +0000
Subject: [PATCH] probably how maxpool layers should be

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

diff --git a/src/data.h b/src/data.h
index fbcb144..0a1830e 100644
--- a/src/data.h
+++ b/src/data.h
@@ -1,18 +1,30 @@
 #ifndef DATA_H
 #define DATA_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);
-batch random_batch(char *filename, int n);
-batch get_batch(char *filename, int curr, int total);
-void free_batch(batch b);
 
+void free_data(data d);
+data load_data_image_pathfile(char *filename, char **labels, int k, int h, int w);
+data load_data_image_pathfile_part(char *filename, int part, int total, 
+                                    char **labels, int k, int h, int w);
+data load_data_image_pathfile_random(char *filename, int n, char **labels, 
+                                        int k, int h, int w);
+data load_cifar10_data(char *filename);
+data load_all_cifar10();
+list *get_paths(char *filename);
+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