diff --git a/DESCRIPTION b/DESCRIPTION index bee4363b..5d3a85e8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.2.0.9001 +Version: 1.2.0.9002 Date: 2020-06-03 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index 94b06cfa..048dc9b3 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.2.0.9001 +# AMR 1.2.0.9002 ## Last updated: 03-Jun-2020 ### Changed diff --git a/R/join_microorganisms.R b/R/join_microorganisms.R index f940ae56..afcb3823 100755 --- a/R/join_microorganisms.R +++ b/R/join_microorganisms.R @@ -57,7 +57,7 @@ inner_join_microorganisms <- function(x, by = NULL, suffix = c("2", ""), ...) { check_dataset_integrity() check_groups_before_join(x, "inner_join_microorganisms") checked <- joins_check_df(x, by) - x_class <- class(x) + x_class <- get_prejoined_class(x) x <- checked$x by <- checked$by join <- suppressWarnings( @@ -76,7 +76,7 @@ left_join_microorganisms <- function(x, by = NULL, suffix = c("2", ""), ...) { check_dataset_integrity() check_groups_before_join(x, "left_join_microorganisms") checked <- joins_check_df(x, by) - x_class <- class(x) + x_class <- get_prejoined_class(x) x <- checked$x by <- checked$by join <- suppressWarnings( @@ -95,7 +95,7 @@ right_join_microorganisms <- function(x, by = NULL, suffix = c("2", ""), ...) { check_dataset_integrity() check_groups_before_join(x, "right_join_microorganisms") checked <- joins_check_df(x, by) - x_class <- class(x) + x_class <- get_prejoined_class(x) x <- checked$x by <- checked$by join <- suppressWarnings( @@ -114,7 +114,7 @@ full_join_microorganisms <- function(x, by = NULL, suffix = c("2", ""), ...) { check_dataset_integrity() check_groups_before_join(x, "full_join_microorganisms") checked <- joins_check_df(x, by) - x_class <- class(x) + x_class <- get_prejoined_class(x) x <- checked$x by <- checked$by join <- suppressWarnings( @@ -132,7 +132,7 @@ full_join_microorganisms <- function(x, by = NULL, suffix = c("2", ""), ...) { semi_join_microorganisms <- function(x, by = NULL, ...) { check_dataset_integrity() check_groups_before_join(x, "semi_join_microorganisms") - x_class <- class(x) + x_class <- get_prejoined_class(x) checked <- joins_check_df(x, by) x <- checked$x by <- checked$by @@ -149,7 +149,7 @@ anti_join_microorganisms <- function(x, by = NULL, ...) { check_dataset_integrity() check_groups_before_join(x, "anti_join_microorganisms") checked <- joins_check_df(x, by) - x_class <- class(x) + x_class <- get_prejoined_class(x) x <- checked$x by <- checked$by join <- suppressWarnings( @@ -190,6 +190,14 @@ joins_check_df <- function(x, by) { by = joinby) } +get_prejoined_class <- function(x) { + if (is.data.frame(x)) { + class(x) + } else { + "data.frame" + } +} + check_groups_before_join <- function(x, fn) { if (is.data.frame(x) && !is.null(attributes(x)$groups)) { warning("Groups are dropped, since the ", fn, "() function relies on merge() from base R, not on join() from dplyr.", call. = FALSE) diff --git a/docs/404.html b/docs/404.html index 59e1de27..8e486d95 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9001 + 1.2.0.9002 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index c47d9102..032a9f3b 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9001 + 1.2.0.9002 diff --git a/docs/articles/index.html b/docs/articles/index.html index 874f954c..8118b224 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9001 + 1.2.0.9002 diff --git a/docs/authors.html b/docs/authors.html index 5e1062d3..5475d87f 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9001 + 1.2.0.9002 diff --git a/docs/index.html b/docs/index.html index e8eaa3e9..c58d3638 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ AMR (for R) - 1.2.0.9001 + 1.2.0.9002 diff --git a/docs/news/index.html b/docs/news/index.html index 3fc1b176..081ceac3 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9001 + 1.2.0.9002 @@ -229,9 +229,9 @@ Source: NEWS.md -
-

-AMR 1.2.0.9001 Unreleased +
+

+AMR 1.2.0.9002 Unreleased

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 180cf058..8849ba08 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-03T09:44Z +last_built: 2020-06-03T12:33Z 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 70319af4..c25e7a19 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9001 + 1.2.0.9002