update

DEploid-dev · Dec 22, 2024 · 4e5bd04 · 4e5bd04
1 parent 979fa3a
commit 4e5bd04
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 22 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -16,7 +16,7 @@ TESTS = unit_tests io_unit_tests
 check_PROGRAMS = unit_tests dEploid_dbg io_unit_tests current_unit_tests # dEploid_prof
 PROG = DEPLOID
 
-common_flags = -std=c++17 -Isrc/ -Isrc/vcf/src/ -DDEPLOIDVERSION=\"${DEPLOIDVERSION}\" -DLASSOVERSION=\"${LASSOVERSION}\" -DCOMPILEDATE=\"${COMPILEDATE}\" -Wall  -Wextra
+common_flags = -std=c++17 -Isrc/ -Isrc/codeCogs/ -Isrc/vcf/src/ -DDEPLOIDVERSION=\"${DEPLOIDVERSION}\" -DLASSOVERSION=\"${LASSOVERSION}\" -DCOMPILEDATE=\"${COMPILEDATE}\" -Wall  -Wextra
 
 common_LDADD = -lz
 

diff --git a/src/codeCogs/asympt_expn.h b/src/codeCogs/asympt_expn.h
@@ -18,9 +18,9 @@
 #include <assert.h>
 
 #include <math.h>
-#include "src/codeCogs/xsub_ln_add1.h"
-#include "src/codeCogs/errorfnc.h"
-#include "src/codeCogs/errorfnc_exp.h"
+#include "xsub_ln_add1.h"
+#include "errorfnc.h"
+#include "errorfnc_exp.h"
 
 namespace Maths
 {

diff --git a/src/codeCogs/errorfn.h b/src/codeCogs/errorfn.h
@@ -14,7 +14,7 @@
 #define MATHS_SPECIAL_ERRORFN_H
 
 #include <assert.h>
-#include "src/codeCogs/poly_eval.h"
+#include "poly_eval.h"
 
 namespace Maths
 {

diff --git a/src/codeCogs/errorfnc.h b/src/codeCogs/errorfnc.h
@@ -24,9 +24,9 @@
 #endif
 #endif
 
-#include "src/codeCogs/expx2.h"
-#include "src/codeCogs/errorfnc_exp.h"
-#include "src/codeCogs/errorfn.h"
+#include "expx2.h"
+#include "errorfnc_exp.h"
+#include "errorfn.h"
 
 #define MINLOG -7.08396418532264106224E2
 

diff --git a/src/codeCogs/errorfnc_exp.h b/src/codeCogs/errorfnc_exp.h
@@ -24,7 +24,7 @@
 #endif
 #endif
 
-#include "src/codeCogs/poly_eval.h"
+#include "poly_eval.h"
 
 namespace Maths
 {

diff --git a/src/codeCogs/gamma.h b/src/codeCogs/gamma.h
@@ -26,8 +26,8 @@
 
 #include <math.h>
 #include <float.h>
-#include "src/codeCogs/poly_eval.h"
-#include "src/codeCogs/stirling.h"
+#include "poly_eval.h"
+#include "stirling.h"
 
 #define MAXNUM 1.79769313486231570815E308
 #define PI 3.141592653589793238

diff --git a/src/codeCogs/log_gamma.h b/src/codeCogs/log_gamma.h
@@ -15,7 +15,7 @@
 #define MATHS_SPECIAl_GAMMA_LOG_GAMMA_H
 
 #include <cmath>
-#include "src/codeCogs/machine_epsilon.h"
+#include "machine_epsilon.h"
 
 #define D1      -0.5772156649015328605195174
 #define D2      0.4227843350984671393993777

diff --git a/src/codeCogs/logbeta.h b/src/codeCogs/logbeta.h
@@ -15,11 +15,11 @@
 #define MATHS_SPECIAL_GAMMA_LOGBETA_H
 
 #include <math.h>
-#include "src/codeCogs/ln_add1.h"
-#include "src/codeCogs/log_gamma.h"
-#include "src/codeCogs/loggammasum.h"
-#include "src/codeCogs/loggammafrac.h"
-#include "src/codeCogs/asympt_expn.h"
+#include "ln_add1.h"
+#include "log_gamma.h"
+#include "loggammasum.h"
+#include "loggammafrac.h"
+#include "asympt_expn.h"
 
 namespace Maths
 {

diff --git a/src/codeCogs/loggammasum.h b/src/codeCogs/loggammasum.h
@@ -16,7 +16,7 @@
 
 #include <assert.h>
 #include <math.h>
-#include "src/codeCogs/log_gamma.h"
+#include "log_gamma.h"
 
 namespace Maths
 {

diff --git a/src/codeCogs/stirling.h b/src/codeCogs/stirling.h
@@ -16,7 +16,7 @@
 
 #include <math.h>
 #include <float.h>
-#include "src/codeCogs/poly_eval.h"
+#include "poly_eval.h"
 
 namespace Maths
 {

diff --git a/tests/test-coverage-coverall.sh b/tests/test-coverage-coverall.sh
@@ -4,8 +4,8 @@
 make -mj
 
 # Generate html report
-lcov --base-directory . --directory . --zerocounters -q
+lcov --ignore-errors empty --base-directory . --directory . --zerocounters -q
 make check -mj
-lcov --base-directory . --directory . -c -o coverage/lcov.info
+lcov --ignore-errors empty --base-directory . --directory . -c -o coverage/lcov.info
 # --rc lcov_branch_coverage=1 option will turn on branch check
-lcov --remove coverage/lcov.info "/usr*" "src/codeCogs/*" "src/random/*" "src/export/*" "src/gzstream/*" "tests/unittest/*" -o coverage/lcov.info # remove output for external libraries
+lcov --ignore-errors empty --remove coverage/lcov.info "/usr*" "src/codeCogs/*" "src/vcf/*" "src/lasso/*" "src/export/*" "src/gzstream/*" "tests/unittest/*" -o coverage/lcov.info # remove output for external libraries
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ @@
     #endif
     #endif
-    #include "src/codeCogs/poly_eval.h"
+    #include "poly_eval.h"
     namespace Maths
     {
@@ Expand Down @@