bug!: generalise make_viz()

data subset columns now NOT explicitly named, only model outputs from `meta_analyse_datasets()` and `prepare_response_variables()` --- fixes for #130 broke `make_viz()`
egouldo · Aug 29, 2024 · 32dc3f4 · 32dc3f4
1 parent f145387
commit 32dc3f4
Showing 1 changed file with 13 additions and 35 deletions.
diff --git a/R/make_viz.R b/R/make_viz.R
@@ -38,57 +38,35 @@ make_viz <- function(data) {
   if (any(str_detect(unique(data$estimate_type), pattern = "Zr"))) {
     data_Zr <- data %>%
       filter(estimate_type == "Zr") %>%
-      group_by(exclusion_set, dataset, estimate_type, publishable_subset, expertise_subset, collinearity_subset, data) %>%
-      pivot_longer(
-        names_to = "model_name",
-        values_to = "model",
-        cols = c(
-          -exclusion_set,
-          -dataset,
-          -estimate_type,
-          -data,
-          -diversity_data,
-          -diversity_indices,
-          -effects_analysis,
-          -publishable_subset,
-          -expertise_subset,
-          -collinearity_subset
-        )
-      ) %>%
-      ungroup() %>%
       select(
         -data,
         -diversity_data,
         -diversity_indices,
         -effects_analysis
+      ) %>% 
+      pivot_longer(names_to = "model_name", values_to = "model",
+                   cols = c(starts_with("MA_mod"), 
+                            "sorensen_glm", 
+                            starts_with("box_cox_rating"), 
+                            "uni_mixed_effects")
       )
   }
 
   if (any(str_detect(unique(data$estimate_type), "y"))) {
     data_yi <- data %>%
       filter(estimate_type %in% c("yi", "y25", "y50", "y75")) %>%
-      group_by(exclusion_set, dataset, estimate_type, data) %>%
-      pivot_longer(
-        names_to = "model_name",
-        values_to = "model",
-        cols = c(
-          -exclusion_set,
-          -dataset,
-          -estimate_type,
-          -data,
-          -diversity_data,
-          -diversity_indices,
-          -effects_analysis
-        )
-      ) %>%
-      ungroup() %>%
       select(
         -data,
         -diversity_data,
         -diversity_indices,
         -effects_analysis
-      ) %>%
-      mutate(publishable_subset = NA)
+      ) %>% 
+      pivot_longer(names_to = "model_name", values_to = "model",
+                   cols = c(starts_with("MA_mod"), 
+                            "sorensen_glm", 
+                            starts_with("box_cox_rating"), 
+                            "uni_mixed_effects")
+      )
   }
 
   if (exists("data_Zr") & exists("data_yi")) {