merge types into globals

2 files changed, 26 insertions, 52 deletions

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)
  */
diff --git a/include/gensvm_types.h b/include/gensvm_types.h
deleted file mode 100644
index 61a02a4..0000000
--- a/include/gensvm_types.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * @file gensvm_types.h
- * @author G.J.J. van den Burg
- * @date 2013-08-01
- * @brief Definitions of common types
- *
- * @details
- * Here common types used throughout the program are defined.
- *
- * @copyright
- Copyright 2016, G.J.J. van den Burg.
-
- This file is part of GenSVM.
-
- GenSVM is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- GenSVM is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GenSVM. If not, see <http://www.gnu.org/licenses/>.
-
- */
-
-#ifndef GENSVM_TYPES_H
-#define GENSVM_TYPES_H
-
-/**
- * @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;
-
-#endif