From 240d817b4ec3624c159a95c1ae40d8de488e0c94 Mon Sep 17 00:00:00 2001 From: "Matthijs S. Berends" Date: Fri, 26 Jun 2020 13:15:46 +0200 Subject: [PATCH] (v1.2.0.9018) ab_from_text() improvement --- DESCRIPTION | 2 +- NEWS.md | 2 +- R/ab.R | 4 ++-- docs/404.html | 2 +- docs/LICENSE-text.html | 2 +- docs/articles/index.html | 2 +- docs/authors.html | 2 +- docs/index.html | 2 +- docs/news/index.html | 8 ++++---- docs/pkgdown.yml | 2 +- docs/reference/index.html | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index f67ad6ce..4d55fbcf 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.2.0.9017 +Version: 1.2.0.9018 Date: 2020-06-26 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index ece152fd..3ae9670f 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.2.0.9017 +# AMR 1.2.0.9018 ## Last updated: 26-Jun-2020 ### New diff --git a/R/ab.R b/R/ab.R index e36c2a0e..80845712 100755 --- a/R/ab.R +++ b/R/ab.R @@ -146,7 +146,7 @@ as.ab <- function(x, flag_multiple_results = TRUE, ...) { } if (isTRUE(flag_multiple_results) & x[i] %like% "[ ]") { - from_text <- suppressWarnings(ab_from_text(x[i], initial_search = FALSE, translate_ab = FALSE)) + from_text <- suppressWarnings(ab_from_text(x[i], initial_search = FALSE, translate_ab = FALSE)[[1]]) } else { from_text <- character(0) } @@ -335,7 +335,7 @@ as.ab <- function(x, flag_multiple_results = TRUE, ...) { if (isTRUE(flag_multiple_results)) { found <- from_text[1L] } else { - found <- suppressWarnings(ab_from_text(x[i], initial_search = FALSE, translate_ab = FALSE)[1L]) + found <- suppressWarnings(ab_from_text(x[i], initial_search = FALSE, translate_ab = FALSE)[[1]][1L]) } if (!is.na(found)) { x_new[i] <- note_if_more_than_one_found(found, i, from_text) diff --git a/docs/404.html b/docs/404.html index ebc09655..8eff1c2f 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9017 + 1.2.0.9018 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index b8368c71..a2a886df 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9017 + 1.2.0.9018 diff --git a/docs/articles/index.html b/docs/articles/index.html index 053998cc..f587b19d 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9017 + 1.2.0.9018 diff --git a/docs/authors.html b/docs/authors.html index c3400891..c6b2e28d 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9017 + 1.2.0.9018 diff --git a/docs/index.html b/docs/index.html index bf82eace..6d3e5189 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ AMR (for R) - 1.2.0.9017 + 1.2.0.9018 diff --git a/docs/news/index.html b/docs/news/index.html index aea5f8ad..ffa40599 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9017 + 1.2.0.9018 @@ -229,9 +229,9 @@ Source: NEWS.md -
-

-AMR 1.2.0.9017 Unreleased +
+

+AMR 1.2.0.9018 Unreleased

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 8109437b..0f1dda56 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -10,7 +10,7 @@ articles: WHONET: WHONET.html benchmarks: benchmarks.html resistance_predict: resistance_predict.html -last_built: 2020-06-26T10:31Z +last_built: 2020-06-26T11:15Z urls: reference: https://msberends.gitlab.io/AMR/reference article: https://msberends.gitlab.io/AMR/articles diff --git a/docs/reference/index.html b/docs/reference/index.html index 6fed9854..fa91d077 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9017 + 1.2.0.9018