diff --git a/DESCRIPTION b/DESCRIPTION index dfe1bfa0..8a3d1b00 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.3.0.9018 +Version: 1.3.0.9019 Date: 2020-09-14 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index 9f837633..072b9d3d 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.3.0.9018 +# AMR 1.3.0.9019 ## Last updated: 14 September 2020 Note: some changes in this version were suggested by anonymous reviewers from the journal we submitted our manuscipt to. We are those reviewers very grateful for going through our code so thoroughly! diff --git a/R/mo.R b/R/mo.R index 973d6420..085c4abd 100755 --- a/R/mo.R +++ b/R/mo.R @@ -314,7 +314,7 @@ exec_as.mo <- function(x, res_df <- haystack[which(eval(substitute(needle), envir = haystack, enclos = parent.frame())), , drop = FALSE] if (NROW(res_df) > 1) { # sort the findings on matching score - res_df <- res_df[order(mo_matching_score(x_backup[i], res_df[, "fullname", drop = TRUE]), decreasing = TRUE), , drop = FALSE] + res_df <- res_df[order(mo_matching_score(input, res_df[, "fullname", drop = TRUE]), decreasing = TRUE), , drop = FALSE] } res <- as.character(res_df[, column, drop = TRUE]) if (length(res) == 0) { diff --git a/man/figures/logo.svg b/data-raw/logo.svg similarity index 100% rename from man/figures/logo.svg rename to data-raw/logo.svg diff --git a/docs/404.html b/docs/404.html index 9859af5e..391dc047 100644 --- a/docs/404.html +++ b/docs/404.html @@ -49,7 +49,7 @@ - + @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9018 + 1.3.0.9019 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index f60a221a..f2039627 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -49,7 +49,7 @@ - + @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9018 + 1.3.0.9019 diff --git a/docs/articles/index.html b/docs/articles/index.html index 56b82aad..806c3561 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -49,7 +49,7 @@ - + @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9018 + 1.3.0.9019 diff --git a/docs/authors.html b/docs/authors.html index 72e7cc75..473eb5d0 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -49,7 +49,7 @@ - + @@ -81,7 +81,7 @@ AMR (for R) - 1.3.0.9018 + 1.3.0.9019 diff --git a/docs/index.html b/docs/index.html index c5dac937..55ffccdf 100644 --- a/docs/index.html +++ b/docs/index.html @@ -24,7 +24,7 @@ using evidence-based methods, like those defined by Leclercq et al. (2013) <doi:10.1111/j.1469-0691.2011.03703.x> and the Clinical and Laboratory Standards Institute (2014) <isbn: 1-56238-899-1>."> - +