Merge pull request #232 from spsanderson/development

Fixes #231
spsanderson · Feb 9, 2024 · c0fd37a · c0fd37a
2 parents 4d3fa9c + 53e962e
commit c0fd37a
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 21 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -57,4 +57,4 @@ Imports:
     broom,
     ggplot2,
     magrittr
-RoxygenNote: 7.3.0
+RoxygenNote: 7.3.1
diff --git a/R/plot-regression-predictions.R b/R/plot-regression-predictions.R
@@ -94,17 +94,24 @@ plot_regression_predictions <- function(.data, .output = "list"){
                    )
       )
   } else {
-    p <- .data |>
+
+    df <- .data |>
+      dplyr::group_by(.model_type, .data_category) |>
+      dplyr::mutate(x = dplyr::row_number()) |>
+      dplyr::ungroup()
+
+    act_data <- dplyr::filter(df, .data_type == "actual")
+    train_data <- dplyr::filter(df, .data_type == "training")
+    test_data <- dplyr::filter(df, .data_type == "testing")
+
+    p <- df |>
       dplyr::group_by(.model_type, .data_category) |>
       dplyr::mutate(x = dplyr::row_number()) |>
       dplyr::ungroup() |>
       ggplot2::ggplot(ggplot2::aes(x = x, y = .value)) +
-      ggplot2::geom_line(data = . %>% dplyr::filter(.data_type == "actual"),
-                         color = "black") +
-      ggplot2::geom_line(data = . %>% dplyr::filter(.data_type == "training"),
-                         linetype = "dashed", color = "red") +
-      ggplot2::geom_line(data = . %>% dplyr::filter(.data_type == "testing"),
-                         linetype = "dashed", color = "blue") +
+      ggplot2::geom_line(data = act_data, color = "black") +
+      ggplot2::geom_line(data = train_data, linetype = "dashed", color = "red") +
+      ggplot2::geom_line(data = test_data, linetype = "dashed", color = "blue") +
       ggplot2::facet_wrap(~ .model_type, ncol = 2, scales = "free") +
       ggplot2::labs(
         x = "",

diff --git a/man/extract_model_spec.Rd b/man/extract_model_spec.Rd
diff --git a/man/extract_regression_residuals.Rd b/man/extract_regression_residuals.Rd
diff --git a/man/extract_wflw_fit.Rd b/man/extract_wflw_fit.Rd
diff --git a/man/extract_wflw_pred.Rd b/man/extract_wflw_pred.Rd
diff --git a/man/get_model.Rd b/man/get_model.Rd
diff --git a/man/internal_make_fitted_wflw.Rd b/man/internal_make_fitted_wflw.Rd
diff --git a/man/internal_make_spec_tbl.Rd b/man/internal_make_spec_tbl.Rd
diff --git a/man/internal_make_wflw_gee_lin_reg.Rd b/man/internal_make_wflw_gee_lin_reg.Rd
diff --git a/man/internal_make_wflw_predictions.Rd b/man/internal_make_wflw_predictions.Rd
diff --git a/man/internal_set_args_to_tune.Rd b/man/internal_set_args_to_tune.Rd
diff --git a/man/make_classification_base_tbl.Rd b/man/make_classification_base_tbl.Rd
diff --git a/man/make_regression_base_tbl.Rd b/man/make_regression_base_tbl.Rd