Don't coerce closure

This commit is contained in:
2024-09-16 19:39:49 -04:00
parent 36b5a3aa4e
commit 15b6d3327c

View File

@@ -552,6 +552,7 @@ generate_scatter_plot <- function(plot, config) {
return(plot) return(plot)
} }
generate_box_plot <- function(plot, config) { generate_box_plot <- function(plot, config) {
plot <- plot + geom_boxplot() plot <- plot + geom_boxplot()
@@ -684,18 +685,18 @@ generate_rank_plot_configs <- function(df_filtered, is_lm = FALSE, adjust = FALS
configs <- list() configs <- list()
# SD-based plots for L and K # SD-based plots for L and K
for (var in c("L", "K")) { for (variable in c("L", "K")) {
for (sd_band in sd_bands) { for (sd_band in sd_bands) {
# Determine columns based on whether it's lm or not # Determine columns based on whether it's lm or not
if (is_lm) { if (is_lm) {
rank_var <- paste0(var, "_Rank_lm") rank_var <- paste0(variable, "_Rank_lm")
zscore_var <- paste0("Z_lm_", var) zscore_var <- paste0("Z_lm_", variable)
y_label <- paste("Int Z score", var) y_label <- paste("Int Z score", variable)
} else { } else {
rank_var <- paste0(var, "_Rank") rank_var <- paste0(variable, "_Rank")
zscore_var <- paste0("Avg_Zscore_", var) zscore_var <- paste0("Avg_Zscore_", variable)
y_label <- paste("Avg Z score", var) y_label <- paste("Avg Z score", variable)
} }
# Annotated Plot Configuration # Annotated Plot Configuration
@@ -704,7 +705,7 @@ generate_rank_plot_configs <- function(df_filtered, is_lm = FALSE, adjust = FALS
x_var = rank_var, x_var = rank_var,
y_var = zscore_var, y_var = zscore_var,
plot_type = "scatter", plot_type = "scatter",
title = paste(y_label, "vs. Rank for", var, "above", sd_band, "SD"), title = paste(y_label, "vs. Rank for", variable, "above", sd_band, "SD"),
sd_band = sd_band, sd_band = sd_band,
annotations = list( annotations = list(
list( list(
@@ -729,7 +730,7 @@ generate_rank_plot_configs <- function(df_filtered, is_lm = FALSE, adjust = FALS
x_var = rank_var, x_var = rank_var,
y_var = zscore_var, y_var = zscore_var,
plot_type = "scatter", plot_type = "scatter",
title = paste(y_label, "vs. Rank for", var, "above", sd_band, "SD No Annotations"), title = paste(y_label, "vs. Rank for", variable, "above", sd_band, "SD No Annotations"),
sd_band = sd_band, sd_band = sd_band,
annotations = NULL, annotations = NULL,
sd_band_values = sd_band, sd_band_values = sd_band,
@@ -739,26 +740,26 @@ generate_rank_plot_configs <- function(df_filtered, is_lm = FALSE, adjust = FALS
} }
} }
# Average ZScore and Rank Avg ZScore Plots for r, L, K, and AUC # Avg ZScore and Rank Avg ZScore Plots for r, L, K, and AUC
for (var in variables) { for (variable in variables) {
for (plot_type in c("Avg_Zscore_vs_lm", "Rank_Avg_Zscore_vs_lm")) { for (plot_type in c("Avg_Zscore_vs_lm", "Rank_Avg_Zscore_vs_lm")) {
# Define x and y variables based on plot type # Define x and y variables based on plot type
if (plot_type == "Avg_Zscore_vs_lm") { if (plot_type == "Avg_Zscore_vs_lm") {
x_var <- paste0("Avg_Zscore_", var) x_var <- paste0("Avg_Zscore_", variable)
y_var <- paste0("Z_lm_", var) y_var <- paste0("Z_lm_", variable)
title_suffix <- paste("Avg Zscore vs lm", var) title_suffix <- paste("Avg Zscore vs lm", variable)
} else if (plot_type == "Rank_Avg_Zscore_vs_lm") { } else if (plot_type == "Rank_Avg_Zscore_vs_lm") {
x_var <- paste0(var, "_Rank") x_var <- paste0(variable, "_Rank")
y_var <- paste0(var, "_Rank_lm") y_var <- paste0(variable, "_Rank_lm")
title_suffix <- paste("Rank Avg Zscore vs lm", var) title_suffix <- paste("Rank Avg Zscore vs lm", variable)
} }
# Determine y-axis label # Determine y-axis label
if (plot_type == "Avg_Zscore_vs_lm") { if (plot_type == "Avg_Zscore_vs_lm") {
y_label <- paste("Z lm", var) y_label <- paste("Z lm", variable)
} else { } else {
y_label <- paste("Rank lm", var) y_label <- paste("Rank lm", variable)
} }
# Determine correlation text (R-squared) # Determine correlation text (R-squared)