diff --git a/DESCRIPTION b/DESCRIPTION
index 26b69940..e80cb630 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,5 +1,5 @@
Package: AMR
-Version: 1.4.0.9005
+Version: 1.4.0.9006
Date: 2020-10-21
Title: Antimicrobial Resistance Analysis
Authors@R: c(
diff --git a/NEWS.md b/NEWS.md
index 5892ef2a..656c7fd2 100755
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,4 +1,4 @@
-# AMR 1.4.0.9005
+# AMR 1.4.0.9006
## Last updated: 21 October 2020
### New
diff --git a/R/ggplot_rsi.R b/R/ggplot_rsi.R
index 69240779..cbcf7fe9 100755
--- a/R/ggplot_rsi.R
+++ b/R/ggplot_rsi.R
@@ -371,7 +371,7 @@ scale_rsi_colours <- function(colours = c(S = "#61a8ff",
IR = "#ff6961",
R = "#ff6961")) {
stop_ifnot_installed("ggplot2")
- meet_criteria(colours, allow_class = "character")
+ meet_criteria(colours, allow_class = c("character", "logical"))
# previous colour: palette = "RdYlGn"
# previous colours: values = c("#b22222", "#ae9c20", "#7cfc00")
diff --git a/R/like.R b/R/like.R
index 177e67be..0c981158 100755
--- a/R/like.R
+++ b/R/like.R
@@ -69,7 +69,7 @@
#' }
like <- function(x, pattern, ignore.case = TRUE) {
meet_criteria(x, allow_NA = TRUE)
- meet_criteria(pattern, allow_class = "character")
+ meet_criteria(pattern, allow_NA = FALSE)
meet_criteria(ignore.case, allow_class = "logical", has_length = 1)
# set to fixed if no regex found
@@ -154,15 +154,15 @@ like <- function(x, pattern, ignore.case = TRUE) {
#' @export
"%like_case%" <- function(x, pattern) {
meet_criteria(x, allow_NA = TRUE)
- meet_criteria(pattern, allow_class = "character")
+ meet_criteria(pattern, allow_NA = FALSE)
like(x, pattern, ignore.case = FALSE)
}
# don't export his one, it's just for convenience in eucast_rules()
# match all Klebsiella and Raoultella, but not K. aerogenes: fullname %like_perl% "^(Klebsiella(?! aerogenes)|Raoultella)"
"%like_perl%" <- function(x, pattern) {
- meet_criteria(x)
- meet_criteria(pattern, allow_class = "character")
+ meet_criteria(x, allow_NA = TRUE)
+ meet_criteria(pattern, allow_NA = FALSE)
grepl(x = tolower(x),
pattern = tolower(pattern),
perl = TRUE,
diff --git a/docs/404.html b/docs/404.html
index 57b6a614..9eceb7f8 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -81,7 +81,7 @@
NEWS.md
-