address dev dplyr join warnings (#772)

simonpcouch · web-flow · commit f0810910d0b6 · 2022-08-09T14:08:11.000-04:00
diff --git a/R/linear_reg.R b/R/linear_reg.R
@@ -243,7 +243,11 @@ multi_predict._elnet <-
     pred <- as_tibble(pred)
     pred$.row <- 1:nrow(pred)
     pred <- gather(pred, group, .pred, -.row)
-    pred <- full_join(param_key, pred, by = "group")
+    if (utils::packageVersion("dplyr") >= "1.0.99.9000") {
+      pred <- full_join(param_key, pred, by = "group", multiple = "all")
+    } else {
+      pred <- full_join(param_key, pred, by = "group")
+    }
     pred$group <- NULL
     pred <- arrange(pred, .row, penalty)
     .row <- pred$.row
diff --git a/R/logistic_reg.R b/R/logistic_reg.R
@@ -296,7 +296,11 @@ multi_predict._lognet <-
         pred <- pred[, c(".row", "group", paste0(".pred_", object$lvl))]
       }
     }
-    pred <- full_join(param_key, pred, by = "group")
+    if (utils::packageVersion("dplyr") >= "1.0.99.9000") {
+      pred <- full_join(param_key, pred, by = "group", multiple = "all")
+    } else {
+      pred <- full_join(param_key, pred, by = "group")
+    }
     pred$group <- NULL
     pred <- arrange(pred, .row, penalty)
     .row <- pred$.row

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,11 @@ multi_predict._lognet <-`
`296`	`296`	`pred <- pred[, c(".row", "group", paste0(".pred_", object$lvl))]`
`297`	`297`	`}`
`298`	`298`	`}`
`299`		`- pred <- full_join(param_key, pred, by = "group")`
	`299`	`+ if (utils::packageVersion("dplyr") >= "1.0.99.9000") {`
	`300`	`+ pred <- full_join(param_key, pred, by = "group", multiple = "all")`
	`301`	`+ } else {`
	`302`	`+ pred <- full_join(param_key, pred, by = "group")`
	`303`	`+ }`
`300`	`304`	`pred$group <- NULL`
`301`	`305`	`pred <- arrange(pred, .row, penalty)`
`302`	`306`	`.row <- pred$.row`