diff options
| author | Pjotr Prins | 2017-10-20 08:10:39 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2017-10-23 13:54:05 +0000 |
| commit | b42a02d02b3d9384b1da55bd091f0f89c808b626 (patch) | |
| tree | 4fd66b70ce7eb660dcb98c38a7f5309ac43195e8 /src/param.cpp | |
| parent | 12558c358150bfed99874b791932bbe06a107263 (diff) | |
| download | pangemma-b42a02d02b3d9384b1da55bd091f0f89c808b626.tar.gz | |
Travis-ci:
- Disabled gcc-6 since we develop with later tools anyway
- Turned the release test into a simple integration test
- Adding MacOSX on Travis-ci
Tests: Adding tests for Plink w. LOCO
Safety: Introduce strtok_safe to get rid of segfaults
Diffstat (limited to 'src/param.cpp')
| -rw-r--r-- | src/param.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/param.cpp b/src/param.cpp index 8aa7a64..1a27a53 100644 --- a/src/param.cpp +++ b/src/param.cpp @@ -16,12 +16,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#include <iostream> +#include <string> #include <algorithm> #include <cmath> #include <cstring> #include <fstream> -#include <iostream> -#include <string> #include <sys/stat.h> #include "gsl/gsl_blas.h" @@ -899,7 +899,7 @@ void PARAM::CheckParam(void) { if (!loco.empty()) { enforce_msg((a_mode >= 1 && a_mode <= 4) || 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_bfile.empty(), "LOCO does not work with PLink (yet)"); enforce_msg(file_gxe.empty(), "LOCO does not support GXE (yet)"); enforce_msg(!file_anno.empty(), "LOCO requires annotation file (-a switch)"); @@ -1317,7 +1317,7 @@ void PARAM::CalcKin(gsl_matrix *matrix_kin) { if (!file_bfile.empty()) { file_str = file_bfile + ".bed"; - enforce_msg(loco.empty(), "FIXME: LOCO nyi"); + // enforce_msg(loco.empty(), "FIXME: LOCO nyi"); if (PlinkKin(file_str, indicator_snp, a_mode - 20, d_pace, matrix_kin) == false) { error = true; |