merge pr #144: set multiple join argument explicitly

tidymodels · Aug 10, 2022 · 227efb6 · 227efb6
2 parents 3df5034 + 0cf44ac
commit 227efb6
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 7 deletions.
diff --git a/R/add_candidates.R b/R/add_candidates.R
@@ -337,7 +337,7 @@ rm_duplicate_cols <- function(df) {
       "those from existing candidates and were removed from the data stack."
     )
 
-    df <- df %>% dplyr::select(-exclude)
+    df <- df %>% dplyr::select(-any_of(exclude))
   }
 
   df

diff --git a/R/fit_members.R b/R/fit_members.R
@@ -100,17 +100,38 @@ fit_members <- function(model_stack, ...) {
   if (model_stack[["mode"]] == "regression") {
     members_map <- 
       tibble::enframe(model_stack[["cols_map"]]) %>%
-      tidyr::unnest(cols = value) %>%
-      dplyr::full_join(metrics_dict, by = c("value" = ".config"))
+      tidyr::unnest(cols = value)
+    if (utils::packageVersion("dplyr") >= "1.0.99.9000") {
+      members_map <- members_map %>%
+        dplyr::full_join(metrics_dict, by = c("value" = ".config"), multiple = "all")
+    } else {
+      members_map <- members_map %>%
+        dplyr::full_join(metrics_dict, by = c("value" = ".config"))
+    }
   } else {
     members_map <- 
       tibble::enframe(model_stack[["cols_map"]]) %>%
-      tidyr::unnest(cols = value) %>%
-      dplyr::full_join(member_dict, by = c("value" = "old")) %>%
+      tidyr::unnest(cols = value)
+    if (utils::packageVersion("dplyr") >= "1.0.99.9000") {
+      members_map <- members_map %>%
+        dplyr::full_join(member_dict, by = c("value" = "old"), multiple = "all")
+    } else {
+      members_map <- members_map %>%
+        dplyr::full_join(member_dict, by = c("value" = "old"))
+    }
+
+    members_map <- members_map %>%
       dplyr::filter(!is.na(new)) %>%
       dplyr::select(name, value = new) %>%
-      dplyr::filter(!duplicated(.$value)) %>%
-      dplyr::full_join(metrics_dict, by = c("value" = ".config"))
+      dplyr::filter(!duplicated(.$value))
+
+    if (utils::packageVersion("dplyr") >= "1.0.99.9000") {
+      members_map <- members_map %>%
+        dplyr::full_join(metrics_dict, by = c("value" = ".config"), multiple = "all")
+    } else {
+      members_map <- members_map %>%
+        dplyr::full_join(metrics_dict, by = c("value" = ".config"))
+    }
   }
 
   if (foreach::getDoParWorkers() > 1) {