Merge pull request #10 from mrc-ide/develop

fixed matching function

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: variantstring
 Type: Package
 Title: Functions for working with variant string format
-Version: 1.6.0
+Version: 1.7.0
 Authors@R: c(
     person("Bob", "Verity", email = "r.verity@imperial.ac.uk", role = c("aut", "cre"))
     )

R/main.R

@@ -924,17 +924,21 @@ compare_variant_string <- function(target_string, comparison_strings) {
     }, 1:nrow(df_target), SIMPLIFY = FALSE) |>
       dplyr::bind_rows()
 
-    # get if a match over all loci, and if match is ambiguous
+    # get if a match over all loci, if ambiguous, and the proportion
     ret$match[i] <- all(df_match$match == 1)
-    ret$ambiguous[i] <- (sum(df_match$het) > 1) & ret$match[i]
-
-    if (sum(df_match$het) == 0) {
-      ret$prop[i] <- ret$match[i]
-    } else if (sum(df_match$het) == 1) {
-      w <- which(df_match$het == 1)
-      ret$prop[i] <- df_match$read_num[w] / df_match$read_denom[w]
+    if (ret$match[i]) {
+      ret$ambiguous[i] <- (sum(df_match$het) > 1)
+      if (sum(df_match$het) == 0) {
+        ret$prop[i] <- 1
+      } else if (sum(df_match$het) == 1) {
+        w <- which(df_match$het == 1)
+        ret$prop[i] <- df_match$read_num[w] / df_match$read_denom[w]
+      } else {
+        ret$prop[i] <- NA
+      }
     } else {
-      ret$prop[i] <- NA
+      ret$ambiguous[i] <- FALSE
+      ret$prop[i] <- 0.0
     }
   }
 

README.md

@@ -21,4 +21,4 @@ There are also a few more utility functions not listed here - see the package he
 
 ## Release history
 
-The current version is 1.6.0, released 16 Jan 2025.
+The current version is 1.7.0, released 16 Jan 2025.