From 45a41a9faaca715d539000ae91ab9fe6d83f4669 Mon Sep 17 00:00:00 2001 From: Waldir Leoncio Date: Wed, 1 Feb 2023 13:46:58 +0100 Subject: [PATCH 1/2] Fixed log2() on getPopDistancesByKL() --- R/getPopDistancesByKL.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/getPopDistancesByKL.R b/R/getPopDistancesByKL.R index 2b7a55c..21aae37 100644 --- a/R/getPopDistancesByKL.R +++ b/R/getPopDistancesByKL.R @@ -25,9 +25,9 @@ getPopDistancesByKL <- function(adjprior) { for (pop2 in (pop1 + 1):npops) { dist1 <- d[, , pop1] 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 - div21 <- sum(sum(dist2 * log2((dist2 + 10^-10) / (dist1 + 10^-10)))) / + div21 <- sum(sum(dist2 * base::log2((dist2 + 10^-10) / (dist1 + 10^-10)))) / nloci div <- (div12 + div21) / 2 distances[pointer] <- div From 9ea62ffd1fcf89aca0ccce158f9170afac123556 Mon Sep 17 00:00:00 2001 From: Waldir Leoncio Date: Wed, 1 Feb 2023 13:47:12 +0100 Subject: [PATCH 2/2] Increment version number to 0.0.0.9017 --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2810550..27355b5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rBAPS Title: Bayesian Analysis of Population Structure -Version: 0.0.0.9016 +Version: 0.0.0.9017 Date: 2020-11-09 Authors@R: c(