Skip to content

Commit

Permalink
[feat,chore,refactor,test] Add amova ci and negative variance adjustm…
Browse files Browse the repository at this point in the history
…ent, v0.5

[feat]

add amova confidence interval using bootstrap percentile method, normal
approximation, bootstrap basic method (reverse percentile method). When block
bootstrapping is enabled, the results from all 3 of these methods will be
reported by default.

add missing data check dmat->has_drop for neighbor joining

add negative variance adjustment and alternative results via setting negative
variance components to 0 and recalculating the phi statistics.

[chore]

change dxy and amova result printing for double values from %f (float) to %.17g (double)

deprec mathUtils

add cross-platform __FUNCTION__ identifier

change the name of --drop-pairs to --allow-missing-pairs for clarity

[refactor]

improve block bootstrapping samples printing

rename nsites variables in em.cpp for clarity (does not affect the results)

[test]

add block bootstrapping test case test18

Update test results with including negative variance adjusted results
  • Loading branch information
isinaltinkaya committed Apr 25, 2024
1 parent 40051d5 commit d36fa70
Show file tree
Hide file tree
Showing 50 changed files with 5,899 additions and 1,042 deletions.
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -11,7 +11,7 @@ CXX ?= g++


# No-compile targets
NO_COMPILE = clean test help
NO_COMPILE = help clean test test-%


VAL_ADD_CRYPTOLIB = -lcrypto
Expand Down Expand Up @@ -203,7 +203,7 @@ DEP := $(OBJ:.o=.d)
FLAGS := $(CPPFLAGS) $(CXXFLAGS)


VERSION = v0.4
VERSION = v0.5

ifneq ($(wildcard .git),)
VERSION := $(VERSION)-$(shell git describe --always)
Expand All @@ -212,7 +212,7 @@ endif
VERSIONH = version.h

$(VERSIONH):
$(if $(wildcards version.h),$(if $(findstring "$(VERSION)",$(shell cat version.h)),,$(shell echo '#define ngsAMOVA_VERSION "$(VERSION)"' > version.h)), $(shell echo '#define ngsAMOVA_VERSION "$(VERSION)"' > version.h))
$(if $(wildcards version.h),$(if $(findstring "$(VERSION)",$(shell cat version.h)),,$(shell echo '#define NGSAMOVA_VERSION "$(VERSION)"' > version.h)), $(shell echo '#define NGSAMOVA_VERSION "$(VERSION)"' > version.h))


# Build info
Expand Down

0 comments on commit d36fa70

Please sign in to comment.