aboutsummaryrefslogtreecommitdiff
path: root/src/mvlmm.cpp
diff options
context:
space:
mode:
authorPjotr Prins2017-08-22 07:56:07 +0000
committerPjotr Prins2017-08-22 08:01:50 +0000
commit99527865c00b74a3a48daa2e1e5eb7c71bd861b5 (patch)
tree313f36729cc5f0e860d4c73f26ddbee5cff0bf4f /src/mvlmm.cpp
parentc7cbd8b2d5a06b7b86733719315f9da1638cb32e (diff)
downloadpangemma-99527865c00b74a3a48daa2e1e5eb7c71bd861b5.tar.gz
Fixes matrix checks - looking saner now
- Matrix checks as described in https://github.com/genetics-statistics/GEMMA/issues/72 - introduces -strict switch which will exit on certain conditions - zero small eigenvalues in EigenDecomp_Zeroed which also checks for negative values - commented out float versions of functions in lapack.cpp (pre-removal) - reverted on disabled regression tests (GEMMA shows its previous behaviour now)
Diffstat (limited to 'src/mvlmm.cpp')
-rw-r--r--src/mvlmm.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/mvlmm.cpp b/src/mvlmm.cpp
index 358038f..be9fd78 100644
--- a/src/mvlmm.cpp
+++ b/src/mvlmm.cpp
@@ -257,14 +257,7 @@ double EigenProc(const gsl_matrix *V_g, const gsl_matrix *V_e, gsl_vector *D_l,
gsl_blas_dgemm(CblasNoTrans, CblasNoTrans, 1.0, V_e_hi, VgVehi, 0.0, Lambda);
// Eigen decomposition of Lambda.
- EigenDecomp(Lambda, U_l, D_l, 0);
-
- for (size_t i = 0; i < d_size; i++) {
- d = gsl_vector_get(D_l, i);
- if (d < 0) {
- gsl_vector_set(D_l, i, 0);
- }
- }
+ EigenDecomp_Zeroed(Lambda, U_l, D_l, 0);
// Calculate UltVeh and UltVehi.
gsl_blas_dgemm(CblasTrans, CblasNoTrans, 1.0, U_l, V_e_h, 0.0, UltVeh);