Merge pull request #227 from spsanderson/development

Development
spsanderson · Jan 25, 2024 · 5371ced · 5371ced
2 parents 15834c6 + 23a0c34
commit 5371ced
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/R/internals-make-preds-wflw.R b/R/internals-make-preds-wflw.R
@@ -101,7 +101,6 @@ internal_make_wflw_predictions <- function(.model_tbl, .splits_obj){
         fitted_wflw = obj |> dplyr::pull(7) |> purrr::pluck(1)
 
         # Get rec_obj
-        # rec_obj <- workflows::extract_preprocessor(fitted_wflw)
 
         # Create a safe stats::predict
         safe_stats_predict <- purrr::safely(
@@ -133,9 +132,17 @@ internal_make_wflw_predictions <- function(.model_tbl, .splits_obj){
         # Get training predictions
         train_res <- fitted_wflw |>
           broom::augment(new_data = rsample::training(splits_obj$splits)) |>
-          dplyr::mutate(.data_type = "training") |>
-          dplyr::select(.data_type, !!pred_col_nm) |>
-          purrr::set_names(c(".data_type", ".value"))
+          dplyr::mutate(.data_type = "training")
+        train_res_nms <- names(train_res)
+        if (".pred_class" %in% train_res_nms){
+          train_res <- train_res |>
+            dplyr::select(.data_type, .pred_class) |>
+            purrr::set_names(c(".data_type", ".value"))
+        } else {
+          train_res <- train_res |>
+            dplyr::select(.data_type, !!pred_col_nm) |>
+            purrr::set_names(c(".data_type", ".value"))
+        }
 
         # Get actual outcome values
         pred_y <- names(fitted_wflw[["pre"]][["mold"]][["outcomes"]])

diff --git a/R/plot-regression-predictions.R b/R/plot-regression-predictions.R