diff --git a/src/lmm.cpp b/src/lmm.cpp
index 9c66cc4..36a0361 100644
--- a/src/lmm.cpp
+++ b/src/lmm.cpp
@@ -2139,7 +2139,11 @@ void LMM::mdb_analyze(std::function< SnpNameValues2(size_t) >& fetch_snp,
outfile << chr_s << "\t";
outfile << name << "\t";
outfile << m.pos << "\t";
- outfile << m.n_miss << "\t-\t-\t"; // n_miss column + allele1 + allele0
+ // allele1/allele0: from the store's marker record when it carries them
+ // (stores built by geno2mdb.py do), '-' otherwise -- as before.
+ outfile << m.n_miss << "\t"
+ << (m.a_minor.empty() ? "-" : m.a_minor) << "\t"
+ << (m.a_major.empty() ? "-" : m.a_major) << "\t";
outfile << fixed << setprecision(3) << m.maf << "\t";
outfile << scientific << setprecision(6);
if (a_mode != M_LMM2) {
@@ -2331,6 +2335,18 @@ void LMM::mdb_calc_gwa(const gsl_matrix *U, const gsl_vector *eval,
string_view value2;
marker_mdb.get(rtxn,key,value2);
auto marker = string(value2);
+ // "name", or "name<TAB>allele1<TAB>allele0" (see MarkerInfo).
+ string marker_name = marker, allele1, allele0;
+ if (auto tab1 = marker.find('\t'); tab1 != string::npos) {
+ marker_name = marker.substr(0, tab1);
+ auto tab2 = marker.find('\t', tab1 + 1);
+ if (tab2 == string::npos) {
+ allele1 = marker.substr(tab1 + 1);
+ } else {
+ allele1 = marker.substr(tab1 + 1, tab2 - tab1 - 1);
+ allele0 = marker.substr(tab2 + 1);
+ }
+ }
// 1 rs13476251 174792257
// cout << static_cast<int>(chr) << ":" << pos2 << " line " << rest2 << ":" << marker << endl ;
@@ -2370,8 +2386,9 @@ void LMM::mdb_calc_gwa(const gsl_matrix *U, const gsl_vector *eval,
}
double maf = observed ? geno_total / (2.0 * (double)observed) : 0.0;
- markerinfo = MarkerInfo { .name=marker,.chr=chr,.pos=pos,.line_no=num,
- .n_miss=n_miss,.maf=maf };
+ markerinfo = MarkerInfo { .name=marker_name,.chr=chr,.pos=pos,.line_no=num,
+ .n_miss=n_miss,.maf=maf,
+ .a_minor=allele1,.a_major=allele0 };
// -miss
if ((double)n_miss / (double)ni_test > miss_level)
diff --git a/src/lmm.h b/src/lmm.h
index 86b16c4..b3b19b3 100644
--- a/src/lmm.h
+++ b/src/lmm.h
@@ -51,6 +51,11 @@ struct MarkerInfo {
uint8_t chr;
size_t pos, line_no, n_miss;
double maf;
+ // Allele labels, when the lmdb store carries them: the marker record is
+ // "name<TAB>allele1<TAB>allele0" in stores built by gemma-wrapper's
+ // geno2mdb.py. Stores built before that hold the name alone, and the assoc
+ // then prints '-' in those columns, which is what it always did.
+ string a_minor, a_major;
} ;
typedef vector<MarkerInfo> Markers;
|