From 2f26401331a881b307238cdccb0015f3a7c58fa6 Mon Sep 17 00:00:00 2001 From: vagudets Date: Wed, 5 Feb 2025 17:13:46 +0100 Subject: [PATCH] Bugfix: Reverse order of append() arguments when transforming probs to list --- modules/Crossval/Crossval_Calibration.R | 19 +++++++++---------- modules/Crossval/Crossval_anomalies.R | 18 +++++++++--------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/modules/Crossval/Crossval_Calibration.R b/modules/Crossval/Crossval_Calibration.R index fe9d85f6..22530405 100644 --- a/modules/Crossval/Crossval_Calibration.R +++ b/modules/Crossval/Crossval_Calibration.R @@ -381,7 +381,6 @@ Crossval_Calibration <- function(recipe, data) { probs_obs <- list() all_names <- NULL - ## TODO: Add .drop_dims() here for (ps in 1:length(categories)) { for (perc in 1:(length(categories[[ps]]) + 1)) { if (perc == 1) { @@ -392,22 +391,22 @@ Crossval_Calibration <- function(recipe, data) { name_elem <- paste0("from_", categories[[ps]][perc-1]*100, "_to_", categories[[ps]][perc]*100) } - probs_hcst <- append(list(Subset(hcst_probs_ev[[ps]], + probs_hcst <- append(probs_hcst, + list(Subset(hcst_probs_ev[[ps]], along = 'bin', indices = perc, - drop = 'selected')), - probs_hcst) - probs_obs <- append(list(Subset(obs_probs_ev[[ps]], + drop = 'selected'))) + probs_obs <- append(probs_obs, + list(Subset(obs_probs_ev[[ps]], along = 'bin', indices = perc, - drop = 'selected')), - probs_obs) + drop = 'selected'))) if (!is.null(data$fcst)) { - probs_fcst <- append(list(Subset(fcst_probs[[ps]], + probs_fcst <- append(probs_fcst, + list(Subset(fcst_probs[[ps]], along = 'bin', indices = perc, - drop = 'selected')), - probs_fcst) + drop = 'selected'))) } all_names <- c(all_names, name_elem) } diff --git a/modules/Crossval/Crossval_anomalies.R b/modules/Crossval/Crossval_anomalies.R index a08efc31..43b8e6e1 100644 --- a/modules/Crossval/Crossval_anomalies.R +++ b/modules/Crossval/Crossval_anomalies.R @@ -256,22 +256,22 @@ Crossval_anomalies <- function(recipe, data) { name_elem <- paste0("from_", categories[[ps]][perc-1], "_to_", categories[[ps]][perc]) } - probs_hcst <- append(list(Subset(hcst_probs_ev[[ps]], + probs_hcst <- append(probs_hcst, + list(Subset(hcst_probs_ev[[ps]], along = 'bin', indices = perc, - drop = 'selected')), - probs_hcst) - probs_obs <- append(list(Subset(obs_probs_ev[[ps]], + drop = 'selected'))) + probs_obs <- append(probs_obs, + list(Subset(obs_probs_ev[[ps]], along = 'bin', indices = perc, - drop = 'selected')), - probs_obs) + drop = 'selected'))) if (!is.null(data$fcst)) { - probs_fcst <- append(list(Subset(fcst_probs[[ps]], + probs_fcst <- append(probs_fcst, + list(Subset(fcst_probs[[ps]], along = 'bin', indices = perc, - drop = 'selected')), - probs_fcst) + drop = 'selected'))) } all_names <- c(all_names, name_elem) } -- GitLab