Dylan Aïssi pushed to branch upstream at Debian Med / plink1.9
Commits:
179bb503 by Dylan Aïssi at 2018-03-08T21:45:50+01:00
New upstream version 1.90~b5.3-180221
- - - - -
2 changed files:
- plink.c
- plink_data.c
Changes:
=====================================
plink.c
=====================================
--- a/plink.c
+++ b/plink.c
@@ -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,10 +105,10 @@ 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
- " "
+ ""
#ifdef STABLE_BUILD
" " // (don't want this when version number has two trailing digits)
#else
=====================================
plink_data.c
=====================================
--- a/plink_data.c
+++ b/plink_data.c
@@ -16203,11 +16203,11 @@ int32_t merge_datasets(char* bedname, char* bimname,
char* famname, char* outnam
}
if (is_dichot_pheno) {
if (qsort_ext(sample_fids, tot_sample_ct, max_sample_full_len,
merge_nsort? strcmp_natural_deref : strcmp_deref, pheno_c_char, 1)) {
- goto merge_datasets_ret_NOMEM;
+ goto merge_datasets_ret_NOMEM;
}
} else {
if (qsort_ext(sample_fids, tot_sample_ct, max_sample_full_len,
merge_nsort? strcmp_natural_deref : strcmp_deref, (char*)pheno_d,
sizeof(double))) {
- goto merge_datasets_ret_NOMEM;
+ goto merge_datasets_ret_NOMEM;
}
}
if (sample_sort == SAMPLE_SORT_FILE) {
@@ -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]);
}
}
}
View it on GitLab:
https://salsa.debian.org/med-team/plink1-9/commit/179bb50324fe8f8939714696a3c0e31323b16eb9
---
View it on GitLab:
https://salsa.debian.org/med-team/plink1-9/commit/179bb50324fe8f8939714696a3c0e31323b16eb9
You're receiving this email because of your account on salsa.debian.org.
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
