moved input/output functions to seperate file

3 files changed, 34 insertions, 12 deletions

diff --git a/include/msvmmaj_init.h b/include/msvmmaj_init.h
index 6e2e36f..febfb4a 100644
--- a/include/msvmmaj_init.h
+++ b/include/msvmmaj_init.h
@@ -20,4 +20,8 @@ struct MajModel *msvmmaj_init_model();
 
 struct MajData *msvmmaj_init_data();
 
+void msvmmaj_allocate_model(struct MajModel *model);
+void msvmmaj_free_model(struct MajModel *model);
+void msvmmaj_free_data(struct MajData *data);
+
 #endif
diff --git a/include/msvmmaj_io.h b/include/msvmmaj_io.h
new file mode 100644
index 0000000..99fb4dc
--- /dev/null
+++ b/include/msvmmaj_io.h
@@ -0,0 +1,30 @@
+/**
+ * @file msvmmaj_io.h
+ * @author Gertjan van den Burg
+ * @date January, 2014
+ * @brief Header files for msvmmaj_io.c
+ *
+ * @details
+ * Function declarations for input/output functions.
+ *
+ */
+
+#ifndef MSVMMAJ_IO_H
+#define MSVMMAJ_IO_H
+
+#include "globals.h"
+
+// forward declarations
+struct MajData;
+struct MajModel;
+
+// function declarations
+void msvmmaj_read_data(struct MajData *dataset, char *data_file);
+
+void msvmmaj_read_model(struct MajModel *model, char *model_filename);
+void msvmmaj_write_model(struct MajModel *model, char *output_filename);
+
+void msvmmaj_write_predictions(struct MajData *data, long *predy, 
+		char *output_filename);
+
+#endif
diff --git a/include/util.h b/include/util.h
index 995a927..375a9c2 100644
--- a/include/util.h
+++ b/include/util.h
@@ -19,21 +19,9 @@ struct MajData;
 struct MajModel;
 
 // function declarations
-void msvmmaj_read_data(struct MajData *dataset, char *data_file);
-
-void msvmmaj_read_model(struct MajModel *model, char *model_filename);
-void msvmmaj_write_model(struct MajModel *model, char *output_filename);
-
-void msvmmaj_write_predictions(struct MajData *data, long *predy, 
-		char *output_filename);
-
 int msvmmaj_check_argv(int argc, char **argv, char *str);
 int msvmmaj_check_argv_eq(int argc, char **argv, char *str);
 
 void note(const char *fmt,...);
 
-void msvmmaj_allocate_model(struct MajModel *model);
-void msvmmaj_free_model(struct MajModel *model);
-void msvmmaj_free_data(struct MajData *data);
-
 #endif