From 5888d57592f9a4d88bad75038813e20e43781ecc Mon Sep 17 00:00:00 2001 From: Joseph Lemaitre Date: Tue, 16 Apr 2024 16:11:01 +0200 Subject: [PATCH] manually undo commit --- flepimop/R_packages/inference/R/inference_slot_runner_funcs.R | 4 ++-- flepimop/main_scripts/inference_slot.R | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flepimop/R_packages/inference/R/inference_slot_runner_funcs.R b/flepimop/R_packages/inference/R/inference_slot_runner_funcs.R index 9d01bf483..a8d7ddece 100644 --- a/flepimop/R_packages/inference/R/inference_slot_runner_funcs.R +++ b/flepimop/R_packages/inference/R/inference_slot_runner_funcs.R @@ -52,11 +52,11 @@ aggregate_and_calc_loc_likelihoods <- function( dplyr::filter( modeled_outcome, !!rlang::sym(obs_subpop) == location, - date %in% unique(obs$date[obs$subpop == location]) + time %in% unique(obs$date[obs$subpop == location]) ) %>% ## Reformat into form the algorithm is looking for inference::getStats( - "date", + "time", "sim_var", stat_list = targets_config, start_date = start_date, diff --git a/flepimop/main_scripts/inference_slot.R b/flepimop/main_scripts/inference_slot.R index 5554052ee..b164489b8 100644 --- a/flepimop/main_scripts/inference_slot.R +++ b/flepimop/main_scripts/inference_slot.R @@ -588,7 +588,7 @@ for(seir_modifiers_scenario in seir_modifiers_scenarios) { # run if (config$inference$do_inference){ sim_hosp <- flepicommon::read_file_of_type(gsub(".*[.]","",this_global_files[['hosp_filename']]))(this_global_files[['hosp_filename']]) %>% - dplyr::filter(date >= min(obs$date),date <= max(obs$date)) + dplyr::filter(time >= min(obs$date),time <= max(obs$date)) lhs <- unique(sim_hosp[[obs_subpop]]) rhs <- unique(names(data_stats)) all_locations <- rhs[rhs %in% lhs]