make dependence on globals.h explicit

25 files changed, 11 insertions, 26 deletions

diff --git a/doc/mainpage.dox b/doc/mainpage.dox
index 8e3aaaf..7af0f4c 100644
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -1,6 +1,6 @@
 /**
  * @mainpage 	GenSVM C Package Documentation
- * @author 	Gertjan van den Burg (add future safe email adres)
+ * @author 	Gertjan van den Burg (<gertjanvandenburg@gmail.com>)
  * @date 	January, 2014
  * @version 	0.01a
  *
diff --git a/include/gensvm.h b/include/gensvm.h
index ef85157..24708bc 100644
--- a/include/gensvm.h
+++ b/include/gensvm.h
@@ -12,7 +12,6 @@
 #ifndef GENSVM_H
 #define GENSVM_H
 
-#include "globals.h"
 #include "types.h"
 
 /**
diff --git a/include/gensvm_crossval.h b/include/gensvm_crossval.h
index fa3cca7..3ac5fa9 100644
--- a/include/gensvm_crossval.h
+++ b/include/gensvm_crossval.h
@@ -13,8 +13,6 @@
 #ifndef GENSVM_CROSSVAL_H
 #define GENSVM_CROSSVAL_H
 
-#include "globals.h"
-
 // forward delaration
 struct GenData;
 
diff --git a/include/gensvm_io.h b/include/gensvm_io.h
index 73c24bd..4581c5f 100644
--- a/include/gensvm_io.h
+++ b/include/gensvm_io.h
@@ -12,8 +12,6 @@
 #ifndef GENSVM_IO_H
 #define GENSVM_IO_H
 
-#include "globals.h"
-
 // forward declarations
 struct GenData;
 struct GenModel;
diff --git a/include/gensvm_kernel.h b/include/gensvm_kernel.h
index d01eb88..45b7e62 100644
--- a/include/gensvm_kernel.h
+++ b/include/gensvm_kernel.h
@@ -14,8 +14,6 @@
 #ifndef GENSVM_KERNEL_H
 #define GENSVM_KERNEL_H
 
-#include "globals.h"
-
 // forward declarations
 struct GenData;
 struct GenModel;
diff --git a/include/gensvm_lapack.h b/include/gensvm_lapack.h
index a664cba..c4e58e8 100644
--- a/include/gensvm_lapack.h
+++ b/include/gensvm_lapack.h
@@ -12,8 +12,6 @@
 #ifndef GENSVM_LAPACK_H
 #define GENSVM_LAPACK_H
 
-#include "globals.h"
-
 int dposv(char UPLO, int N, int NRHS, double *A, int LDA, double *B,
 		int LDB);
 int dsysv(char UPLO, int N, int NRHS, double *A, int LDA, int *IPIV,
diff --git a/include/gensvm_matrix.h b/include/gensvm_matrix.h
index 01be3da..5c88f0b 100644
--- a/include/gensvm_matrix.h
+++ b/include/gensvm_matrix.h
@@ -12,8 +12,6 @@
 #ifndef GENSVM_MATRIX_H
 #define GENSVM_MATRIX_H
 
-#include "globals.h"
-
 // Set a matrix element (RowMajor)
 #define matrix_set(M, cols, i, j, val) M[(i)*(cols)+j] = val
 
diff --git a/include/gensvm_pred.h b/include/gensvm_pred.h
index 76b3ad3..97af01f 100644
--- a/include/gensvm_pred.h
+++ b/include/gensvm_pred.h
@@ -12,8 +12,6 @@
 #ifndef GENSVM_PRED_H
 #define GENSVM_PRED_H
 
-#include "globals.h"
-
 // forward declarations
 struct GenData;
 struct GenModel;
diff --git a/include/gensvm_strutil.h b/include/gensvm_strutil.h
index 2255d6e..c51422f 100644
--- a/include/gensvm_strutil.h
+++ b/include/gensvm_strutil.h
@@ -13,7 +13,6 @@
 #ifndef GENSVM_STRUTIL_H
 #define GENSVM_STRUTIL_H
 
-#include "globals.h"
 #include "types.h"
 
 bool str_startswith(const char *str, const char *pre);
diff --git a/include/gensvm_sv.h b/include/gensvm_sv.h
index 5664f83..2c7cf57 100644
--- a/include/gensvm_sv.h
+++ b/include/gensvm_sv.h
@@ -12,8 +12,6 @@
 #ifndef GENSVM_SV_H
 #define GENSVM_SV_H
 
-#include "globals.h"
-
 long gensvm_num_sv(struct GenModel *model, struct GenData *data);
 
 #endif
diff --git a/include/gensvm_timer.h b/include/gensvm_timer.h
index a1b60a7..29c45cd 100644
--- a/include/gensvm_timer.h
+++ b/include/gensvm_timer.h
@@ -12,8 +12,6 @@
 #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);
diff --git a/include/gensvm_train.h b/include/gensvm_train.h
index f59359d..466b8e2 100644
--- a/include/gensvm_train.h
+++ b/include/gensvm_train.h
@@ -13,8 +13,6 @@
 #ifndef GENSVM_TRAIN_H
 #define GENSVM_TRAIN_H
 
-#include "globals.h"
-
 //forward declarations
 struct GenData;
 struct GenModel;
diff --git a/include/gensvm_train_dataset.h b/include/gensvm_train_dataset.h
index c743bd7..9a3fe86 100644
--- a/include/gensvm_train_dataset.h
+++ b/include/gensvm_train_dataset.h
@@ -15,7 +15,6 @@
 #ifndef GENSVM_TRAIN_DATASET_H
 #define GENSVM_TRAIN_DATASET_H
 
-#include "globals.h"
 #include "types.h"
 
 // forward declarations
diff --git a/include/gensvm_util.h b/include/gensvm_util.h
index 2fd60e7..5ea2198 100644
--- a/include/gensvm_util.h
+++ b/include/gensvm_util.h
@@ -12,8 +12,6 @@
 #ifndef GENSVM_UTIL_H
 #define GENSVM_UTIL_H
 
-#include "globals.h"
-
 // forward declarations
 struct GenData;
 struct GenModel;
diff --git a/include/libGenSVM.h b/include/libGenSVM.h
index dbf0903..9e2d4c2 100644
--- a/include/libGenSVM.h
+++ b/include/libGenSVM.h
@@ -18,8 +18,6 @@
 #ifndef LIBGENSVM_H
 #define LIBGENSVM_H
 
-#include "globals.h"
-
 // forward declarations
 struct GenData;
 struct GenModel;
diff --git a/src/GenSVMgrid.c b/src/GenSVMgrid.c
index 3cf1346..89b85a7 100644
--- a/src/GenSVMgrid.c
+++ b/src/GenSVMgrid.c
@@ -21,6 +21,7 @@
 
 #include <time.h>
 
+#include "globals.h"
 #include "gensvm.h"
 #include "gensvm_crossval.h"
 #include "gensvm_io.h"
diff --git a/src/GenSVMtraintest.c b/src/GenSVMtraintest.c
index 955f4fa..0199725 100644
--- a/src/GenSVMtraintest.c
+++ b/src/GenSVMtraintest.c
@@ -12,6 +12,7 @@
 
 #include <time.h>
 
+#include "globals.h"
 #include "gensvm.h"
 #include "gensvm_io.h"
 #include "gensvm_init.h"
diff --git a/src/gensvm_crossval.c b/src/gensvm_crossval.c
index 6930166..8f09cb5 100644
--- a/src/gensvm_crossval.c
+++ b/src/gensvm_crossval.c
@@ -13,6 +13,7 @@
  *
  */
 
+#include "globals.h"
 #include "gensvm.h"
 #include "gensvm_crossval.h"
 #include "gensvm_matrix.h"
diff --git a/src/gensvm_kernel.c b/src/gensvm_kernel.c
index 76413d1..1d7e5e4 100644
--- a/src/gensvm_kernel.c
+++ b/src/gensvm_kernel.c
@@ -14,6 +14,7 @@
 #include <cblas.h>
 #include <math.h>
 
+#include "globals.h"
 #include "gensvm.h"
 #include "gensvm_kernel.h"
 #include "gensvm_lapack.h"
diff --git a/src/gensvm_pred.c b/src/gensvm_pred.c
index 25a4cc5..15a6be6 100644
--- a/src/gensvm_pred.c
+++ b/src/gensvm_pred.c
@@ -14,6 +14,7 @@
 #include <cblas.h>
 #include <math.h>
 
+#include "globals.h"
 #include "libGenSVM.h"
 #include "gensvm.h"
 #include "gensvm_kernel.h"
diff --git a/src/gensvm_strutil.c b/src/gensvm_strutil.c
index 57e9399..97dec81 100644
--- a/src/gensvm_strutil.c
+++ b/src/gensvm_strutil.c
@@ -9,6 +9,7 @@
  * format and checking start and ends of strings.
  */
 
+#include "globals.h"
 #include "gensvm_strutil.h"
 
 /**
diff --git a/src/gensvm_timer.c b/src/gensvm_timer.c
index 93cd77e..9802091 100644
--- a/src/gensvm_timer.c
+++ b/src/gensvm_timer.c
@@ -12,6 +12,7 @@
 
 #include <time.h>
 
+#include "globals.h"
 #include "gensvm_timer.h"
 
 /**
diff --git a/src/gensvm_train_dataset.c b/src/gensvm_train_dataset.c
index a70b457..d1650a7 100644
--- a/src/gensvm_train_dataset.c
+++ b/src/gensvm_train_dataset.c
@@ -12,6 +12,7 @@
 #include <math.h>
 #include <time.h>
 
+#include "globals.h"
 #include "libGenSVM.h"
 #include "gensvm.h"
 #include "gensvm_crossval.h"
diff --git a/src/gensvm_util.c b/src/gensvm_util.c
index 4353b40..d12a85c 100644
--- a/src/gensvm_util.c
+++ b/src/gensvm_util.c
@@ -11,6 +11,7 @@
  */
 #include <stdarg.h>
 
+#include "globals.h"
 #include "gensvm_util.h"
 
 FILE *GENSVM_OUTPUT_FILE; 	///< The #GENSVM_OUTPUT_FILE specifies the
diff --git a/src/libGenSVM.c b/src/libGenSVM.c
index c9b0b3c..8c22f3e 100644
--- a/src/libGenSVM.c
+++ b/src/libGenSVM.c
@@ -15,6 +15,7 @@
 #include <cblas.h>
 #include <math.h>
 
+#include "globals.h"
 #include "libGenSVM.h"
 #include "gensvm.h"
 #include "gensvm_matrix.h"