add additional catch for geodists/user input

nickbrazeau · Nov 27, 2024 · 7a4849f · 7a4849f
1 parent cdef084
commit 7a4849f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/R/main_pso.R b/R/main_pso.R
@@ -119,7 +119,7 @@ deme_inbreeding_spcoef_pso <- function(discdat,
   #......................
   goodegg::assert_eq(
     x = choose(length(unique(c(discdat$deme1, discdat$deme2))), 2), # max number of between distances
-    y = unique(paste0(discdat$deme1, discdat$deme2, discdat$geodist)), # count of unique between distances
+    y = length(unique(paste0(discdat$deme1, discdat$deme2, discdat$geodist))), # count of unique between distances
     message = "You have pairwise demes with differing geodistances measurements in your data input. Geodistances must be the same between demes (pairwise geodistances should be the same)."
   )
 

diff --git a/R/main_vanilla.R b/R/main_vanilla.R
@@ -105,7 +105,7 @@ deme_inbreeding_spcoef_vanilla <- function(discdat,
   #......................
   goodegg::assert_eq(
     x = choose(length(unique(c(discdat$deme1, discdat$deme2))), 2), # max number of between distances
-    y = unique(paste0(discdat$deme1, discdat$deme2, discdat$geodist)), # count of unique between distances
+    y = length(unique(paste0(discdat$deme1, discdat$deme2, discdat$geodist))), # count of unique between distances
     message = "You have pairwise demes with differing geodistances measurements in your data input. Geodistances must be the same between demes (pairwise geodistances should be the same)."
   )