max/ourMELONS
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'fix-check' into develop

Browse source
This commit is contained in:
Waldir Leoncio 2023-02-01 13:47:23 +01:00
commit b5c70ac555
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
DESCRIPTION
View file

@ -1,6 +1,6 @@
Package: rBAPS Package: rBAPS
Title: Bayesian Analysis of Population Structure Title: Bayesian Analysis of Population Structure
Version: 0.0.0.9016 Version: 0.0.0.9017
Date: 2020-11-09 Date: 2020-11-09
Authors@R: Authors@R:
c( c(

4
R/getPopDistancesByKL.R
View file

@ -25,9 +25,9 @@ getPopDistancesByKL <- function(adjprior) {
for (pop2 in (pop1 + 1):npops) { for (pop2 in (pop1 + 1):npops) {
dist1 <- d[, , pop1] dist1 <- d[, , pop1]
dist2 <- d[, , pop2] dist2 <- d[, , pop2]
div12 <- sum(sum(dist1 * log2((dist1 + 10^-10) / (dist2 + 10^-10)))) / div12 <- sum(sum(dist1 * base::log2((dist1 + 10^-10) / (dist2 + 10^-10)))) /
nloci nloci
div21 <- sum(sum(dist2 * log2((dist2 + 10^-10) / (dist1 + 10^-10)))) / div21 <- sum(sum(dist2 * base::log2((dist2 + 10^-10) / (dist1 + 10^-10)))) /
nloci nloci
div <- (div12 + div21) / 2 div <- (div12 + div21) / 2
distances[pointer] <- div distances[pointer] <- div