From 39c443ef8eb37a1995cf84ff16a14d07a8c7fa0c Mon Sep 17 00:00:00 2001
From: Gertjan van den Burg <burg@ese.eur.nl>
Date: Wed, 7 Dec 2016 12:59:42 +0100
Subject: merge types into globals

---
 include/gensvm_globals.h | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

(limited to 'include/gensvm_globals.h')

diff --git a/include/gensvm_globals.h b/include/gensvm_globals.h
index eaccda8..8ca3189 100644
--- a/include/gensvm_globals.h
+++ b/include/gensvm_globals.h
@@ -37,7 +37,6 @@
 #define GENSVM_GLOBALS_H
 
 #include "gensvm_memory.h"
-#include "gensvm_types.h"
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -48,6 +47,28 @@
 #include <time.h>
 #include <cblas.h>
 
+// ########################### Type definitions ########################### //
+
+/**
+ * @brief type of training used in parameter grid search
+ */
+typedef enum {
+	CV=0, /**< cross validation */
+	TT=1  /**< data with existing train/test split */
+} TrainType;
+
+/**
+ * @brief type of kernel used in training
+ */
+typedef enum {
+	K_LINEAR=0, 	/**< Linear kernel */
+	K_POLY=1, 	/**< Polynomial kernel */
+	K_RBF=2, 	/**< RBF kernel */
+	K_SIGMOID=3,  	/**< Sigmoid kernel */
+} KernelType;
+
+// ########################### Global constants ########################### //
+
 /**
  * Maximum line length of files that are read into GenSVM.
  */
@@ -55,6 +76,8 @@
   #define GENSVM_MAX_LINE_LENGTH 1024
 #endif
 
+// ###################### Min/Max Utility Functions ####################### //
+
 #ifndef MIN_MAX_DEFINE
   /**
    * Flag to check if minimum/maximum macro's are already defined. This can be 
@@ -71,6 +94,8 @@
   #define minimum(a, b) (a) < (b) ? (a) : (b)
 #endif
 
+// ####################### Matrix Utility Functions ####################### //
+
 /**
  * Macro for setting a matrix element (RowMajor order)
  */
-- 
cgit v1.2.3