From f7a17f82eb43de864a4f980f235055da9685eef8 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Wed, 29 Jan 2014 00:28:42 +0000
Subject: [PATCH] Convolutional layers working w/ matrices

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

diff --git a/src/data.h b/src/data.h
index fbcb144..e887d0b 100644
--- a/src/data.h
+++ b/src/data.h
@@ -1,18 +1,24 @@
 #ifndef DATA_H
 #define DATA_H
 
-#include "image.h"
+#include "matrix.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);
 
+data load_data_image_pathfile(char *filename, char **labels, int k);
+void free_data(data d);
+data load_data_image_pathfile(char *filename, char **labels, int k);
+data load_data_image_pathfile_part(char *filename, int part, int total, 
+                                                char **labels, int k);
+data load_data_image_pathfile_random(char *filename, int n, char **labels, int k);
+data load_categorical_data_csv(char *filename, int target, int k);
+void normalize_data_rows(data d);
+void randomize_data(data d);
+data *split_data(data d, int part, int total);
 
 #endif

--
Gitblit v1.10.0