Commit 179bb503 authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

New upstream version 1.90~b5.3-180221

parent f45c5633

plink.c

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 








static const char ver_str[] =









#ifdef STABLE_BUILD









  "PLINK v1.90b5.2"









  "PLINK v1.90b5.3"









#else









  "PLINK v1.90p"









#endif








@@ -105,7 +105,7 @@ static const char ver_str[] =







#else









  " 32-bit"









#endif









  " (9 Jan 2018)";









  " (21 Feb 2018)";









static const char ver_str2[] =









  // include leading space if day < 10, so character length stays the same









  ""
































plink_data.c



+6
−4






























Original line number
Diff line number
Diff line







@@ -16284,10 +16284,12 @@ int32_t merge_datasets(char* bedname, char* bimname, char* famname, char* outnam







	  goto merge_datasets_ret_WRITE_FAIL;









	}









	if (is_dichot_pheno) {









	  cc = pheno_c_char[ulii];









          // bugfix (21 Feb 2018): need to use the map_reverse index here,









          // since the phenotypes correspond to ASCII-sorted sample ID order.









	  cc = pheno_c_char[ujj];









	  fprintf(outfile, "\t%s\n", cc? ((cc == 1)? "2" : "-9") : "1");









	} else {









	  fprintf(outfile, "\t%g\n", pheno_d[ulii]);









	  fprintf(outfile, "\t%g\n", pheno_d[ujj]);









	}









      }









    }