catch deme/dist dups better

nickbrazeau · nickbrazeau · commit b317ab24bb2c · 2025-03-19T15:54:55.000-04:00
diff --git a/R/main_vanilla.R b/R/main_vanilla.R
@@ -104,7 +104,7 @@ disc <- function(discdat,
   #......................
   assert_eq(
     x = choose(length(unique(c(discdat$deme1, discdat$deme2))), 2), # max number of between distances
-    y = length(unique(paste0(discdat$deme1, discdat$deme2, discdat$geodist))), # count of unique between distances
+    y = length(unique(paste0(discdat$deme1, discdat$deme2, discdat$geodist, sep = "-"))), # 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)."
   )
 

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ disc <- function(discdat,`
`104`	`104`	`#......................`
`105`	`105`	`assert_eq(`
`106`	`106`	`x = choose(length(unique(c(discdat$deme1, discdat$deme2))), 2), # max number of between distances`
`107`		`- y = length(unique(paste0(discdat$deme1, discdat$deme2, discdat$geodist))), # count of unique between distances`
	`107`	`+ y = length(unique(paste0(discdat$deme1, discdat$deme2, discdat$geodist, sep = "-"))), # count of unique between distances`
`108`	`108`	`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)."`
`109`	`109`	`)`
`110`	`110`