Rename to MarkerInfo

2 files changed, 8 insertions, 8 deletions

diff --git a/src/lmm.cpp b/src/lmm.cpp
index 44f2a55..08b4d41 100644
--- a/src/lmm.cpp
+++ b/src/lmm.cpp
@@ -2018,7 +2018,7 @@ void LMM::mdb_analyze(std::function< SnpNameValues2(size_t) >& fetch_snp,
     auto success = get<0>(tup);
     if (!success)
       continue;
-    // typedef tuple< bool,MarkerChrPos,vector<double> > SnpNameValues2;
+    // typedef tuple< bool,MarkerInfo,vector<double> > SnpNameValues2;
     // auto marker = get<1>(tup);
     // auto chr = get<2>(tup);
     // auto mpos = get<3>(tup);
@@ -2216,7 +2216,7 @@ void LMM::mdb_calc_gwa(const gsl_matrix *U, const gsl_vector *eval,
 
     // uint8_t chr;
     vector<double> gs;
-    MarkerChrPos markerinfo;
+    MarkerInfo markerinfo;
 
     if (success) {
       size_t num_floats = value.size() / sizeof(float);
@@ -2255,7 +2255,7 @@ void LMM::mdb_calc_gwa(const gsl_matrix *U, const gsl_vector *eval,
       size_t n_miss = 0; // count NAs: FIXME
       double maf = compute_maf(ni_total, ni_test, n_miss, gs.data());
 
-      markerinfo = MarkerChrPos { .name=marker,.chr=chr,.pos=pos,.line_no=num };
+      markerinfo = MarkerInfo { .name=marker,.chr=chr,.pos=pos,.line_no=num };
 
       // cout << "!!!!" << size << marker << ": af" << maf << " " << gs[0] << "," << gs[1] << "," << gs[2] << "," << gs[3] << endl;
     }
diff --git a/src/lmm.h b/src/lmm.h
index d382e48..7643984 100644
--- a/src/lmm.h
+++ b/src/lmm.h
@@ -45,19 +45,19 @@ public:
   size_t e_mode;
 };
 
-// typedef tuple< string, uint16_t, uint32_t, uint32_t > MarkerChrPos; // name, chr, pos, line
-struct MarkerChrPos {
+// typedef tuple< string, uint16_t, uint32_t, uint32_t > MarkerInfo; // name, chr, pos, line
+struct MarkerInfo {
   string name;
   size_t chr, pos, line_no;
 } ;
 
-typedef vector<MarkerChrPos> Markers;
+typedef vector<MarkerInfo> Markers;
 typedef tuple< string,vector<double> > SnpNameValues;
-typedef tuple< bool,MarkerChrPos,vector<double> > SnpNameValues2; // success, markerinfo (maf and n_miss are computed)
+typedef tuple< bool,MarkerInfo,vector<double> > SnpNameValues2; // success, markerinfo (maf and n_miss are computed)
 // Results for LMM.
 class SUMSTAT2 {
 public:
-  MarkerChrPos markerinfo;
+  MarkerInfo markerinfo;
   double beta;         // REML estimator for beta.
   double se;           // SE for beta.
   double lambda_remle; // REML estimator for lambda.