P281424/AMR
1
0
Fork 0
mirror of https://github.com/msberends/AMR.git synced 2024-12-26 20:06:11 +01:00
Code Releases Activity

fix for joins

Browse Source
This commit is contained in:
dr. M.S. (Matthijs) Berends 2018-09-03 10:04:49 +02:00
parent 75fe4d401f
commit e25dd0e282
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS.md
View File

@ -40,6 +40,7 @@
* Edited `ggplot_rsi` and `geom_rsi` so they can cope with `count_df`. The new `fun` parameter has value `portion_df` at default, but can be set to `count_df`. * Edited `ggplot_rsi` and `geom_rsi` so they can cope with `count_df`. The new `fun` parameter has value `portion_df` at default, but can be set to `count_df`.
* Fix for `ggplot_rsi` when the `ggplot2` package was not loaded * Fix for `ggplot_rsi` when the `ggplot2` package was not loaded
* Added possibility to set any parameter to `geom_rsi` (and `ggplot_rsi`) so you can set your own preferences * Added possibility to set any parameter to `geom_rsi` (and `ggplot_rsi`) so you can set your own preferences
* Fix for joins, where predefined suffices would not be honoured
* Support for types list and matrix for `freq` * Support for types list and matrix for `freq`
```r ```r
my_matrix = with(septic_patients, matrix(c(age, sex), ncol = 2)) my_matrix = with(septic_patients, matrix(c(age, sex), ncol = 2))

8
R/join_microorganisms.R
View File

@ -37,7 +37,7 @@ inner_join_microorganisms <- function(x, by = 'mo', suffix = c("2", ""), ...) {
joinby <- by joinby <- by
} }
join <- suppressWarnings( join <- suppressWarnings(
dplyr::inner_join(x = x, y = AMR::microorganisms, by = joinby, suffix = c("2", ""), ...) dplyr::inner_join(x = x, y = AMR::microorganisms, by = joinby, suffix = suffix, ...)
) )
if (nrow(join) > nrow(x)) { if (nrow(join) > nrow(x)) {
warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original') warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original')
@ -59,7 +59,7 @@ left_join_microorganisms <- function(x, by = 'mo', suffix = c("2", ""), ...) {
joinby <- by joinby <- by
} }
join <- suppressWarnings( join <- suppressWarnings(
dplyr::left_join(x = x, y = AMR::microorganisms, by = joinby, suffix = c("2", ""), ...) dplyr::left_join(x = x, y = AMR::microorganisms, by = joinby, suffix = suffix, ...)
) )
if (nrow(join) > nrow(x)) { if (nrow(join) > nrow(x)) {
warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original') warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original')
@ -81,7 +81,7 @@ right_join_microorganisms <- function(x, by = 'mo', suffix = c("2", ""), ...) {
joinby <- by joinby <- by
} }
join <- suppressWarnings( join <- suppressWarnings(
dplyr::right_join(x = x, y = AMR::microorganisms, by = joinby, suffix = c("2", ""), ...) dplyr::right_join(x = x, y = AMR::microorganisms, by = joinby, suffix = suffix, ...)
) )
if (nrow(join) > nrow(x)) { if (nrow(join) > nrow(x)) {
warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original') warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original')
@ -103,7 +103,7 @@ full_join_microorganisms <- function(x, by = 'mo', suffix = c("2", ""), ...) {
joinby <- by joinby <- by
} }
join <- suppressWarnings( join <- suppressWarnings(
dplyr::full_join(x = x, y = AMR::microorganisms, by = joinby, suffix = c("2", ""), ...) dplyr::full_join(x = x, y = AMR::microorganisms, by = joinby, suffix = suffix, ...)
) )
if (nrow(join) > nrow(x)) { if (nrow(join) > nrow(x)) {
warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original') warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original')