diff --git a/DESCRIPTION b/DESCRIPTION index d456ba3e..00ce6243 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.5.0.9004 +Version: 1.5.0.9005 Date: 2021-01-17 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index 5425bf8e..9e1d702f 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.5.0.9004 +# AMR 1.5.0.9005 ## Last updated: 17 January 2021 ### New diff --git a/R/mdro.R b/R/mdro.R index dfca9d93..423dd273 100755 --- a/R/mdro.R +++ b/R/mdro.R @@ -155,6 +155,9 @@ mdro <- function(x, } meet_criteria(x, allow_class = "data.frame") meet_criteria(guideline, allow_class = c("list", "character"), allow_NULL = TRUE) + if (!is.list(guideline)) { + meet_criteria(guideline, allow_class = "character", has_length = 1, allow_NULL = TRUE) + } meet_criteria(col_mo, allow_class = "character", has_length = 1, is_in = colnames(x), allow_NULL = TRUE) meet_criteria(info, allow_class = "logical", has_length = 1) meet_criteria(pct_required_classes, allow_class = "numeric", has_length = 1) diff --git a/data-raw/AMR_1.5.0.9004.tar.gz b/data-raw/AMR_1.5.0.9005.tar.gz similarity index 77% rename from data-raw/AMR_1.5.0.9004.tar.gz rename to data-raw/AMR_1.5.0.9005.tar.gz index 51183693..7a426ee4 100644 Binary files a/data-raw/AMR_1.5.0.9004.tar.gz and b/data-raw/AMR_1.5.0.9005.tar.gz differ diff --git a/docs/404.html b/docs/404.html index c5deb831..2eacadc6 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ AMR (for R) - 1.5.0.9004 + 1.5.0.9005 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 66b90fd9..381cb7b5 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -81,7 +81,7 @@ AMR (for R) - 1.5.0.9004 + 1.5.0.9005 diff --git a/docs/articles/index.html b/docs/articles/index.html index 113becb2..92f45d54 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.5.0.9004 + 1.5.0.9005 diff --git a/docs/authors.html b/docs/authors.html index 29f2c543..fb66cc5a 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ AMR (for R) - 1.5.0.9004 + 1.5.0.9005 diff --git a/docs/index.html b/docs/index.html index 1498990d..9502b8ad 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ AMR (for R) - 1.5.0.9004 + 1.5.0.9005 diff --git a/docs/news/index.html b/docs/news/index.html index 5065a3bb..64bb3610 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.5.0.9004 + 1.5.0.9005 @@ -236,9 +236,9 @@ Source: NEWS.md -
-

-AMR 1.5.0.9004 Unreleased +
+

+AMR 1.5.0.9005 Unreleased

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index cd1bae0f..edfa672f 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -12,7 +12,7 @@ articles: datasets: datasets.html resistance_predict: resistance_predict.html welcome_to_AMR: welcome_to_AMR.html -last_built: 2021-01-16T23:26Z +last_built: 2021-01-17T09:35Z urls: reference: https://msberends.github.io/AMR//reference article: https://msberends.github.io/AMR//articles diff --git a/docs/reference/index.html b/docs/reference/index.html index 94f13e17..b38709b3 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.5.0.9004 + 1.5.0.9005

diff --git a/docs/survey.html b/docs/survey.html index 1c39a2ac..50de92e6 100644 --- a/docs/survey.html +++ b/docs/survey.html @@ -81,7 +81,7 @@ AMR (for R) - 1.5.0.9004 + 1.5.0.9005