From acc4f38376b329e964c7d74d659312cdd8b4d71f Mon Sep 17 00:00:00 2001 From: Christopher Chang Date: Fri, 6 Dec 2024 19:51:31 -0500 Subject: [PATCH] unbreak --import-dosage + --map --- 2.0/plink2.cc | 8 ++++---- 2.0/plink2_help.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/2.0/plink2.cc b/2.0/plink2.cc index 52037e6d..0bf8f9c3 100644 --- a/2.0/plink2.cc +++ b/2.0/plink2.cc @@ -44,7 +44,7 @@ namespace plink2 { #endif -static const char ver_str[] = "PLINK v2.0.0-a.6.3" +static const char ver_str[] = "PLINK v2.0.0-a.6.4" #ifdef NOLAPACK "NL" #elif defined(LAPACK_ILP64) @@ -72,7 +72,7 @@ static const char ver_str[] = "PLINK v2.0.0-a.6.3" #elif defined(USE_AOCL) " AMD" #endif - " (3 Dec 2024)"; + " (6 Dec 2024)"; static const char ver_str2[] = // include leading space if day < 10, so character length stays the same " " @@ -12024,8 +12024,8 @@ int main(int argc, char** argv) { logerrputs("Error: No input dataset.\n"); goto main_ret_INVALID_CMDLINE_A; } - if (unlikely((xload & kfXloadMap) && (!(xload & kfXloadPed)))) { - logerrputs("Error: --map must be used with --ped.\n"); + if (unlikely((xload & kfXloadMap) && (!(xload & (kfXloadPed | kfXloadPlink1Dosage))))) { + logerrputs("Error: --map must be used with --import-dosage or --ped.\n"); goto main_ret_INVALID_CMDLINE_A; } if (unlikely((xload & kfXloadOxGen) && (!(xload & kfXloadOxSample)))) { diff --git a/2.0/plink2_help.cc b/2.0/plink2_help.cc index 5d911160..1bdc2f95 100644 --- a/2.0/plink2_help.cc +++ b/2.0/plink2_help.cc @@ -205,7 +205,7 @@ PglErr DispHelp(const char* const* argvk, uint32_t param_ct) { " --tped : Specify full name of .tped file.\n" " --tfam : Specify full name of .tfam file.\n\n" ); - HelpPrint("import-dosage\0dosage\0", &help_ctrl, 1, + HelpPrint("import-dosage\0dosage\0map\0", &help_ctrl, 1, " --import-dosage ['noheader'] ['id-delim=']\n" " ['skip0='] ['skip1='] ['skip2='] ['dose1']\n" " ['format='] [{ref-first | ref-last}]\n"