Return no match if log10LR is infinite

duke-malaria-collaboratory · Sep 8, 2023 · 89d4d28 · 89d4d28
1 parent 0ea1c4b
commit 89d4d28
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/R/match_static_thresh.R b/R/match_static_thresh.R
@@ -22,7 +22,8 @@ match_static_thresh <- function(log10_lrs, thresh) {
     dplyr::distinct()
 
   matches <- log10_lrs |>
-    dplyr::filter(log10_lr >= thresh) |>
+    dplyr::filter(log10_lr >= thresh &
+      !is.infinite(log10_lr)) |>
     dplyr::mutate(match = "yes") |>
     dplyr::select(
       bloodmeal_id,
@@ -35,7 +36,13 @@ match_static_thresh <- function(log10_lrs, thresh) {
 
   # add in bloodmeals that were dropped
   matches <- bm_info |>
-    dplyr::left_join(matches) |>
+    dplyr::left_join(matches,
+      by = dplyr::join_by(
+        bloodmeal_id,
+        locus_count,
+        est_noc
+      )
+    ) |>
     dplyr::mutate(match = ifelse(is.na(match), "no", match))
 
   return(matches)

diff --git a/tests/testthat/test-match_static_thresh.R b/tests/testthat/test-match_static_thresh.R
@@ -10,4 +10,9 @@ test_that("match_static_thresh works", {
   ) |>
     suppressMessages()
   expect_snapshot(match_static_thresh(bistro_output$lrs, 10))
+
+  expect_true(bistro_output$lrs |>
+    dplyr::mutate(log10_lr = Inf) |>
+    match_static_thresh(10) |>
+    dplyr::pull(match) == "no")
 })