From 993c503ce1b440be6947bc91fbf1fa6098569b51 Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <gertjanvandenburg@gmail.com>
Date: Mon, 9 May 2016 20:45:06 +0200
Subject: use gensvm namespace for all crossval/timer/util

---
 include/crossval.h        | 25 -------------------------
 include/gensvm_crossval.h | 25 +++++++++++++++++++++++++
 include/gensvm_timer.h    | 21 +++++++++++++++++++++
 include/gensvm_util.h     | 27 +++++++++++++++++++++++++++
 include/timer.h           | 21 ---------------------
 include/util.h            | 27 ---------------------------
 6 files changed, 73 insertions(+), 73 deletions(-)
 delete mode 100644 include/crossval.h
 create mode 100644 include/gensvm_crossval.h
 create mode 100644 include/gensvm_timer.h
 create mode 100644 include/gensvm_util.h
 delete mode 100644 include/timer.h
 delete mode 100644 include/util.h

(limited to 'include')

diff --git a/include/crossval.h b/include/crossval.h
deleted file mode 100644
index fa3cca7..0000000
--- a/include/crossval.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * @file crossval.h
- * @author Gertjan van den Burg
- * @date January, 2014
- * @brief Header file for crossval.c
- *
- * @details
- * Contains function declarations for functions needed for performing cross
- * validation on GenData structures.
- *
- */
-
-#ifndef GENSVM_CROSSVAL_H
-#define GENSVM_CROSSVAL_H
-
-#include "globals.h"
-
-// forward delaration
-struct GenData;
-
-void gensvm_make_cv_split(long N, long folds, long *cv_idx);
-void gensvm_get_tt_split(struct GenData *full_data, struct GenData *train_data,
-		struct GenData *test_data, long *cv_idx, long fold_idx);
-
-#endif
diff --git a/include/gensvm_crossval.h b/include/gensvm_crossval.h
new file mode 100644
index 0000000..fa3cca7
--- /dev/null
+++ b/include/gensvm_crossval.h
@@ -0,0 +1,25 @@
+/**
+ * @file crossval.h
+ * @author Gertjan van den Burg
+ * @date January, 2014
+ * @brief Header file for crossval.c
+ *
+ * @details
+ * Contains function declarations for functions needed for performing cross
+ * validation on GenData structures.
+ *
+ */
+
+#ifndef GENSVM_CROSSVAL_H
+#define GENSVM_CROSSVAL_H
+
+#include "globals.h"
+
+// forward delaration
+struct GenData;
+
+void gensvm_make_cv_split(long N, long folds, long *cv_idx);
+void gensvm_get_tt_split(struct GenData *full_data, struct GenData *train_data,
+		struct GenData *test_data, long *cv_idx, long fold_idx);
+
+#endif
diff --git a/include/gensvm_timer.h b/include/gensvm_timer.h
new file mode 100644
index 0000000..a1b60a7
--- /dev/null
+++ b/include/gensvm_timer.h
@@ -0,0 +1,21 @@
+/**
+ * @file timer.h
+ * @author Gertjan van den Burg
+ * @date August, 2013
+ * @brief Header file for timer.c
+ *
+ * @details
+ * Function declaration for timer function used to measure computation time.
+ *
+ */
+
+#ifndef GENSVM_TIMER_H
+#define GENSVM_TIMER_H
+
+#include "globals.h"
+
+double elapsed_time(clock_t s_time, clock_t e_time);
+
+void get_time_string(char *buffer);
+
+#endif
diff --git a/include/gensvm_util.h b/include/gensvm_util.h
new file mode 100644
index 0000000..fe8d2a3
--- /dev/null
+++ b/include/gensvm_util.h
@@ -0,0 +1,27 @@
+/**
+ * @file util.h
+ * @author Gertjan van den Burg
+ * @date August, 2013
+ * @brief Header file for util.c
+ * 
+ * @details
+ * Function declarations for utility functions of the program.
+ *
+ */
+
+#ifndef GENSVM_UTIL_H
+#define GENSVM_UTIL_H
+
+#include "globals.h"
+
+// forward declarations
+struct GenData;
+struct GenModel;
+
+// function declarations
+int gensvm_check_argv(int argc, char **argv, char *str);
+int gensvm_check_argv_eq(int argc, char **argv, char *str);
+
+void note(const char *fmt,...);
+
+#endif
diff --git a/include/timer.h b/include/timer.h
deleted file mode 100644
index a1b60a7..0000000
--- a/include/timer.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * @file timer.h
- * @author Gertjan van den Burg
- * @date August, 2013
- * @brief Header file for timer.c
- *
- * @details
- * Function declaration for timer function used to measure computation time.
- *
- */
-
-#ifndef GENSVM_TIMER_H
-#define GENSVM_TIMER_H
-
-#include "globals.h"
-
-double elapsed_time(clock_t s_time, clock_t e_time);
-
-void get_time_string(char *buffer);
-
-#endif
diff --git a/include/util.h b/include/util.h
deleted file mode 100644
index fe8d2a3..0000000
--- a/include/util.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @file util.h
- * @author Gertjan van den Burg
- * @date August, 2013
- * @brief Header file for util.c
- * 
- * @details
- * Function declarations for utility functions of the program.
- *
- */
-
-#ifndef GENSVM_UTIL_H
-#define GENSVM_UTIL_H
-
-#include "globals.h"
-
-// forward declarations
-struct GenData;
-struct GenModel;
-
-// function declarations
-int gensvm_check_argv(int argc, char **argv, char *str);
-int gensvm_check_argv_eq(int argc, char **argv, char *str);
-
-void note(const char *fmt,...);
-
-#endif
-- 
cgit v1.2.3