Skip to content

Commit

Permalink
silence join warnings (#529)
Browse files Browse the repository at this point in the history
  • Loading branch information
simonpcouch committed Aug 10, 2022
1 parent 79b866c commit 5b4ba2c
Showing 1 changed file with 20 additions and 4 deletions.
24 changes: 20 additions & 4 deletions R/min_grid.R
Expand Up @@ -150,13 +150,29 @@ submod_and_others <- function(grid, fixed_args) {
dplyr::summarize(max_val = max(..val, na.rm = TRUE)) %>%
dplyr::ungroup()

min_grid_df <-
dplyr::full_join(fit_only, grid, by = fixed_args) %>%
if (utils::packageVersion("dplyr") >= "1.0.99.9000") {
min_grid_df <-
dplyr::full_join(fit_only, grid, by = fixed_args, multiple = "all")
} else {
min_grid_df <-
dplyr::full_join(fit_only, grid, by = fixed_args)
}

min_grid_df <- min_grid_df %>%
dplyr::filter(..val != max_val) %>%
dplyr::group_by(!!!rlang::syms(fixed_args)) %>%
dplyr::summarize(.submodels = list(tibble::lst(!!subm_nm := ..val))) %>%
dplyr::ungroup() %>%
dplyr::full_join(fit_only, by = fixed_args) %>%
dplyr::ungroup()

if (utils::packageVersion("dplyr") >= "1.0.99.9000") {
min_grid_df <- min_grid_df %>%
dplyr::full_join(fit_only, by = fixed_args, multiple = "all")
} else {
min_grid_df <- min_grid_df %>%
dplyr::full_join(fit_only, by = fixed_args)
}

min_grid_df <- min_grid_df %>%
dplyr::rename(!!subm_nm := max_val)

min_grid_df$.submodels <-
Expand Down

0 comments on commit 5b4ba2c

Please sign in to comment.