From b4b729a15e577c68f64e0ac69fb299de6f5f706c Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Thu, 17 Apr 2014 16:58:24 +0000
Subject: [PATCH] Merge branch 'master' of pjreddie.com:jnet
---
src/data.h | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/data.h b/src/data.h
index 3c16574..dfbbf72 100644
--- a/src/data.h
+++ b/src/data.h
@@ -2,6 +2,7 @@
#define DATA_H
#include "matrix.h"
+#include "list.h"
typedef struct{
matrix X;
@@ -10,15 +11,18 @@
} data;
-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(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);
-data load_data_image_pathfile_random(char *filename, int n, char **labels, int k);
+ 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);
+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 randomize_data(data d);
-data *cv_split_data(data d, int part, int total);
+data *split_data(data d, int part, int total);
#endif
--
Gitblit v1.10.0