diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lmm.cpp | 14 | ||||
| -rw-r--r-- | src/lmm.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lmm.cpp b/src/lmm.cpp index d3bfbbf..1d3b8e0 100644 --- a/src/lmm.cpp +++ b/src/lmm.cpp @@ -2015,10 +2015,12 @@ 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; // auto marker = get<1>(tup); // auto chr = get<2>(tup); - auto mpos = get<3>(tup); - auto gs = get<4>(tup); + // auto mpos = get<3>(tup); + auto markerinfo = get<1>(tup); + auto gs = get<2>(tup); // cout << t << " SNP: " << snp << endl; // check whether SNP is included in gwasnps (used by LOCO) @@ -2195,9 +2197,7 @@ void LMM::mdb_calc_gwa(const gsl_matrix *U, const gsl_vector *eval, auto success = cursor.get(key, value, mdb_fetch); mdb_fetch = MDB_NEXT; - uint8_t chr; - uint32_t pos; - // size_t pos; + // uint8_t chr; vector<double> gs; MarkerChrPos markerinfo; @@ -2213,7 +2213,7 @@ void LMM::mdb_calc_gwa(const gsl_matrix *U, const gsl_vector *eval, } // "S>L>L>" const uint8_t* data = reinterpret_cast<const uint8_t*>(key.data()); - chr = static_cast<uint8_t>(data[1]); + auto chr = static_cast<uint8_t>(data[1]); // Extract big-endian uint32 // uint32_t rest = static_cast<uint32_t>(data[2]); uint32_t pos = (data[2] << 24) | (data[3] << 16) | @@ -2236,7 +2236,7 @@ void LMM::mdb_calc_gwa(const gsl_matrix *U, const gsl_vector *eval, } // cout << "!!!!" << size << snp << ": " << gs[0] << "," << gs[1] << "," << gs[2] << "," << gs[3] << endl; } - return make_tuple(success, chr, pos, markerinfo, gs); + return make_tuple(success, markerinfo, gs); }; LMM::mdb_analyze(fetch_snp,U,eval,UtW,Uty,W,y,gwasnps,num_markers); } diff --git a/src/lmm.h b/src/lmm.h index 10dacde..c24872c 100644 --- a/src/lmm.h +++ b/src/lmm.h @@ -63,7 +63,7 @@ public: typedef tuple< string, uint16_t, uint32_t, uint32_t > MarkerChrPos; typedef tuple< string,vector<double> > SnpNameValues; -typedef tuple< bool,uint8_t,size_t,MarkerChrPos,vector<double> > SnpNameValues2; +typedef tuple< bool,MarkerChrPos,vector<double> > SnpNameValues2; class LMM { |