diff options
author | Pjotr Prins | 2020-12-16 08:40:33 +0000 |
---|---|---|
committer | Pjotr Prins | 2020-12-16 08:40:33 +0000 |
commit | 0682daf536e9c5ec6fb06594fc232b8b9b3c368d (patch) | |
tree | 8ac8adadd305ef87a79dfff58665e51c819af87c /src | |
parent | 79992ceddc1f90a61adbf0c7871dd5f213d73f65 (diff) | |
download | pangemma-0682daf536e9c5ec6fb06594fc232b8b9b3c368d.tar.gz |
Fix checks for `-lmm 9` mode
Diffstat (limited to 'src')
-rw-r--r-- | src/gemma.cpp | 5 | ||||
-rw-r--r-- | src/param.cpp | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/gemma.cpp b/src/gemma.cpp index 5a6d4d8..eec9f8f 100644 --- a/src/gemma.cpp +++ b/src/gemma.cpp @@ -3383,7 +3383,8 @@ void GEMMA::WriteLog(int argc, char **argv, PARAM &cPar) { } if (cPar.a_mode == 1 || cPar.a_mode == 2 || cPar.a_mode == 3 || - cPar.a_mode == 4 || cPar.a_mode == 5 || cPar.a_mode == 11 || + cPar.a_mode == 4 || cPar.a_mode == 5 || cpar.a_mode == 9 || + cPar.a_mode == 11 || cPar.a_mode == 12 || cPar.a_mode == 13) { outfile << "## REMLE log-likelihood in the null model = " << cPar.logl_remle_H0 << endl; @@ -3552,7 +3553,7 @@ void GEMMA::WriteLog(int argc, char **argv, PARAM &cPar) { outfile << "## time on calculating UtX = " << cPar.time_UtX << " min " << endl; } - if ((cPar.a_mode >= 1 && cPar.a_mode <= 4) || + if ((cPar.a_mode >= 1 && cPar.a_mode <= 4) || cPar.a_mode == 9 || (cPar.a_mode >= 51 && cPar.a_mode <= 54)) { outfile << "## time on optimization = " << cPar.time_opt << " min " << endl; diff --git a/src/param.cpp b/src/param.cpp index 5f2871e..c5f60c6 100644 --- a/src/param.cpp +++ b/src/param.cpp @@ -650,7 +650,7 @@ void PARAM::CheckParam(void) { // Only LMM option (and one prediction option) can deal with // multiple phenotypes and no gene expression files. if (n_ph > 1 && a_mode != 1 && a_mode != 2 && a_mode != 3 && a_mode != 4 && - a_mode != 43) { + a_mode != 9 && a_mode != 43) { cout << "error! the current analysis mode " << a_mode << " can not deal with multiple phenotypes." << endl; error = true; @@ -920,7 +920,7 @@ void PARAM::CheckParam(void) { enforce_fexists(file_anno, "open file"); if (!loco.empty()) { - enforce_msg((a_mode >= 1 && a_mode <= 4) || a_mode == 21 || a_mode == 22, + enforce_msg((a_mode >= 1 && a_mode <= 4) || a_mode == 9 || a_mode == 21 || a_mode == 22, "LOCO only works with LMM and K"); // enforce_msg(file_bfile.empty(), "LOCO does not work with PLink (yet)"); enforce_msg(file_gxe.empty(), "LOCO does not support GXE (yet)"); @@ -948,7 +948,7 @@ void PARAM::CheckParam(void) { } if ((a_mode == 1 || a_mode == 2 || a_mode == 3 || a_mode == 4 || - a_mode == 5 || a_mode == 31) && + a_mode == 5 || a_mode == 9 || a_mode == 31) && (file_kin.empty() && (file_ku.empty() || file_kd.empty()))) { cout << "error! missing relatedness file. " << endl; error = true; |