about summary refs log tree commit diff
path: root/src/lmm.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/lmm.h')
-rw-r--r--src/lmm.h15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/lmm.h b/src/lmm.h
index 8a65f8d..295602a 100644
--- a/src/lmm.h
+++ b/src/lmm.h
@@ -27,7 +27,6 @@
 #include "param.h"
 #include <functional>
 #include <tuple>
-#include <cstdint>
 
 using namespace std;
 
@@ -46,10 +45,6 @@ public:
 };
 
 
-constexpr uint8_t CHR_X = 'X';
-constexpr uint8_t CHR_Y = 'Y';
-constexpr uint8_t CHR_M = 'M';
-
 // typedef tuple< string, uint16_t, uint32_t, uint32_t > MarkerInfo; // name, chr, pos, line
 struct MarkerInfo {
   string name;
@@ -60,7 +55,15 @@ struct MarkerInfo {
 
 typedef vector<MarkerInfo> Markers;
 typedef tuple< string,vector<double> > SnpNameValues;
-typedef tuple< bool,MarkerInfo,vector<double> > SnpNameValues2; // success, markerinfo (maf and n_miss are computed)
+
+enum MarkerState {
+  FAIL,
+  COMPUTE,
+  SKIP,
+  LAST
+};
+
+typedef tuple< MarkerState,MarkerInfo,vector<double> > SnpNameValues2; // success, markerinfo (maf and n_miss are computed)
 // Results for LMM.
 class SUMSTAT2 {
 public: