diff --git a/DESCRIPTION b/DESCRIPTION index 44dda0e8..743ec28a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.7.1.9031 +Version: 1.7.1.9032 Date: 2021-08-30 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index c158c07b..61be7e96 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# `AMR` 1.7.1.9031 +# `AMR` 1.7.1.9032 ## Last updated: 30 August 2021 ### Breaking changes diff --git a/R/aa_helper_functions.R b/R/aa_helper_functions.R index 6d7088fa..d5b47017 100755 --- a/R/aa_helper_functions.R +++ b/R/aa_helper_functions.R @@ -736,7 +736,7 @@ get_current_data <- function(arg_name, call) { if (!is.null(cur_data_all)) { out <- tryCatch(cur_data_all(), error = function(e) NULL) if (is.data.frame(out)) { - messsage("==> RETURNING cur_data_all()") + message("==> RETURNING cur_data_all()") return(structure(out, type = "dplyr_cur_data_all")) } } @@ -749,17 +749,17 @@ get_current_data <- function(arg_name, call) { if (!is.null(env$`.data`) && is.data.frame(env$`.data`)) { # an element `.data` will be in the environment when using `dplyr::select()` # (but not when using `dplyr::filter()`, `dplyr::mutate()` or `dplyr::summarise()`) - messsage("==> RETURNING dplyr_selector") + message("==> RETURNING dplyr_selector") return(structure(env$`.data`, type = "dplyr_selector")) } else if (!is.null(env$xx) && is.data.frame(env$xx)) { # an element `xx` will be in the environment for rows + cols, e.g. `example_isolates[c(1:3), carbapenems()]` - messsage("==> RETURNING base_R 1") + message("==> RETURNING base_R 1") return(structure(env$xx, type = "base_R")) } else if (!is.null(env$x) && is.data.frame(env$x)) { # an element `x` will be in the environment for only cols, e.g. `example_isolates[, carbapenems()]` - messsage("==> RETURNING base_R 2") + message("==> RETURNING base_R 2") return(structure(env$x, type = "base_R")) } } diff --git a/data-raw/AMR_latest.tar.gz b/data-raw/AMR_latest.tar.gz index 2d8e5588..f734ce90 100644 Binary files a/data-raw/AMR_latest.tar.gz and b/data-raw/AMR_latest.tar.gz differ diff --git a/docs/articles/datasets.html b/docs/articles/datasets.html index d738f865..69ddc1fa 100644 --- a/docs/articles/datasets.html +++ b/docs/articles/datasets.html @@ -44,7 +44,7 @@ AMR (for R) - 1.7.1.9031 + 1.7.1.9032 diff --git a/docs/news/index.html b/docs/news/index.html index c6b747e3..d58b78b1 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -92,7 +92,7 @@ AMR (for R) - 1.7.1.9031 + 1.7.1.9032 @@ -240,9 +240,9 @@ Source: NEWS.md -
-

- Unreleased AMR 1.7.1.9031

+
+

+ Unreleased AMR 1.7.1.9032

Last updated: 30 August 2021