aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDannyArends2018-02-28 16:34:05 +0100
committerDannyArends2018-02-28 16:34:05 +0100
commit356f528e52b5cdd13812f64308cbedd87cc0c74f (patch)
tree922e029941ff139900f90922a161c1fe5e242cd3
parent421355faac3b1aae1fb165fd99ff8f393d3c492a (diff)
downloadpangemma-356f528e52b5cdd13812f64308cbedd87cc0c74f.tar.gz
renamed import io.h to gemma_io.h
-rw-r--r--src/bslmmdap.cpp2
-rw-r--r--src/gemma.cpp2
-rw-r--r--src/gemma_io.cpp2
-rw-r--r--src/lm.h2
-rw-r--r--src/lmm.cpp2
-rw-r--r--src/lmm.h2
-rw-r--r--src/mvlmm.cpp2
-rw-r--r--src/mvlmm.h2
-rw-r--r--src/param.cpp2
-rw-r--r--src/prdt.cpp3
-rw-r--r--src/varcov.cpp2
-rw-r--r--src/varcov.h2
-rw-r--r--src/vc.cpp2
-rw-r--r--src/vc.h2
14 files changed, 14 insertions, 15 deletions
diff --git a/src/bslmmdap.cpp b/src/bslmmdap.cpp
index e9900e3..6220bb5 100644
--- a/src/bslmmdap.cpp
+++ b/src/bslmmdap.cpp
@@ -39,7 +39,7 @@
#include "gsl/gsl_vector.h"
#include "bslmmdap.h"
-#include "io.h"
+#include "gemma_io.h"
#include "lapack.h"
#include "lm.h"
#include "lmm.h"
diff --git a/src/gemma.cpp b/src/gemma.cpp
index edd79d7..5f742bd 100644
--- a/src/gemma.cpp
+++ b/src/gemma.cpp
@@ -48,7 +48,7 @@ extern "C" {
#include "bslmm.h"
#include "bslmmdap.h"
#include "gemma.h"
-#include "io.h"
+#include "gemma_io.h"
#include "lapack.h"
#include "ldr.h"
#include "lm.h"
diff --git a/src/gemma_io.cpp b/src/gemma_io.cpp
index d20b473..1876a7b 100644
--- a/src/gemma_io.cpp
+++ b/src/gemma_io.cpp
@@ -45,7 +45,7 @@
// #include "eigenlib.h"
#include "fastblas.h"
#include "gzstream.h"
-#include "io.h"
+#include "gemma_io.h"
#include "lapack.h"
#include "mathfunc.h"
diff --git a/src/lm.h b/src/lm.h
index 030e6f9..bcec0ab 100644
--- a/src/lm.h
+++ b/src/lm.h
@@ -21,7 +21,7 @@
#include "gsl/gsl_matrix.h"
#include "gsl/gsl_vector.h"
-#include "io.h"
+#include "gemma_io.h"
#include "param.h"
using namespace std;
diff --git a/src/lmm.cpp b/src/lmm.cpp
index 4198fab..c0a9785 100644
--- a/src/lmm.cpp
+++ b/src/lmm.cpp
@@ -43,7 +43,7 @@
// #include "eigenlib.h"
#include "gzstream.h"
-#include "io.h"
+#include "gemma_io.h"
#include "fastblas.h"
#include "lapack.h"
#include "lmm.h"
diff --git a/src/lmm.h b/src/lmm.h
index e9740d5..f603599 100644
--- a/src/lmm.h
+++ b/src/lmm.h
@@ -23,7 +23,7 @@
#include "gsl/gsl_matrix.h"
#include "gsl/gsl_vector.h"
-#include "io.h"
+#include "gemma_io.h"
#include "param.h"
#include <functional>
#include <tuple>
diff --git a/src/mvlmm.cpp b/src/mvlmm.cpp
index eee562d..14f8b4a 100644
--- a/src/mvlmm.cpp
+++ b/src/mvlmm.cpp
@@ -39,7 +39,7 @@
#include "fastblas.h"
#include "gzstream.h"
-#include "io.h"
+#include "gemma_io.h"
#include "lapack.h"
#include "lmm.h"
#include "mvlmm.h"
diff --git a/src/mvlmm.h b/src/mvlmm.h
index 4329ad1..b92bd5e 100644
--- a/src/mvlmm.h
+++ b/src/mvlmm.h
@@ -21,7 +21,7 @@
#include "gsl/gsl_matrix.h"
#include "gsl/gsl_vector.h"
-#include "io.h"
+#include "gemma_io.h"
#include "param.h"
using namespace std;
diff --git a/src/param.cpp b/src/param.cpp
index bf6c195..cd4274a 100644
--- a/src/param.cpp
+++ b/src/param.cpp
@@ -35,7 +35,7 @@
#include "gsl/gsl_vector.h"
#include "eigenlib.h"
-#include "io.h"
+#include "gemma_io.h"
#include "mathfunc.h"
#include "param.h"
diff --git a/src/prdt.cpp b/src/prdt.cpp
index fc0abe8..42912a8 100644
--- a/src/prdt.cpp
+++ b/src/prdt.cpp
@@ -32,8 +32,7 @@
#include <vector>
#include "gzstream.h"
-#include "io.h"
-#include "io.h"
+#include "gemma_io.h"
#include "lapack.h"
#include "mathfunc.h"
#include "prdt.h"
diff --git a/src/varcov.cpp b/src/varcov.cpp
index e9c7295..055d3b1 100644
--- a/src/varcov.cpp
+++ b/src/varcov.cpp
@@ -37,7 +37,7 @@
#include "gsl/gsl_vector.h"
#include "gzstream.h"
-#include "io.h"
+#include "gemma_io.h"
#include "lapack.h"
#include "mathfunc.h"
#include "param.h"
diff --git a/src/varcov.h b/src/varcov.h
index 47b4f9d..fa707d5 100644
--- a/src/varcov.h
+++ b/src/varcov.h
@@ -21,7 +21,7 @@
#include "gsl/gsl_matrix.h"
#include "gsl/gsl_vector.h"
-#include "io.h"
+#include "gemma_io.h"
#include "param.h"
using namespace std;
diff --git a/src/vc.cpp b/src/vc.cpp
index 1a16c07..416a3e4 100644
--- a/src/vc.cpp
+++ b/src/vc.cpp
@@ -45,7 +45,7 @@
#include "eigenlib.h"
#include "gzstream.h"
-#include "io.h"
+#include "gemma_io.h"
#include "lapack.h"
#include "lmm.h"
#include "mathfunc.h"
diff --git a/src/vc.h b/src/vc.h
index 49397bb..3586433 100644
--- a/src/vc.h
+++ b/src/vc.h
@@ -21,7 +21,7 @@
#include "gsl/gsl_matrix.h"
#include "gsl/gsl_vector.h"
-#include "io.h"
+#include "gemma_io.h"
#include "param.h"
using namespace std;