late fixes

HopkinsIDD · Oct 16, 2023 · 1e5a988 · 1e5a988
1 parent f1023dd
commit 1e5a988
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/flepimop/gempyor_pkg/src/gempyor/simulate.py b/flepimop/gempyor_pkg/src/gempyor/simulate.py
@@ -304,7 +304,7 @@ def simulate(
         outcome_modifiers_scenarios = None
         if config["outcomes"].exists() and config["outcome_modifiers"].exists():
             if config["outcome_modifiers"]["scenarios"].exists():
-                outcome_modifiers_scenarios = config["outcomes"]["scenarios"].as_str_seq()
+                outcome_modifiers_scenarios = config["outcome_modifiers"]["scenarios"].as_str_seq()
 
     outcome_modifiers_scenarios = as_list(outcome_modifiers_scenarios)
     seir_modifiers_scenarios = as_list(seir_modifiers_scenarios)

diff --git a/flepimop/main_scripts/inference_slot.R b/flepimop/main_scripts/inference_slot.R
@@ -564,8 +564,10 @@ for(seir_modifiers_scenario in seir_modifiers_scenarios) {
             if (!is.null(config$seir_modifiers$modifiers)){
                 proposed_snpi <- inference::perturb_snpi(initial_snpi, config$seir_modifiers$modifiers)
             }
+            # TODO we need a hnpi for inference
+            proposed_hnpi <- inference::perturb_hnpi(initial_hnpi, config$outcome_modifiers$modifiers)
             if (!is.null(config$outcome_modifiers$modifiers)){
-                proposed_hnpi <- inference::perturb_hnpi(initial_hnpi, config$outcome_modifiers$modifiers)  # NOTE: no scenarios possible right now
+                  proposed_hnpi <- inference::perturb_hnpi(initial_hnpi, config$outcome_modifiers$modifiers)# NOTE: no scenarios possible right now
             } 
             proposed_spar <- initial_spar
             proposed_hpar <- inference::perturb_hpar(initial_hpar, config$outcomes$outcomes) # NOTE: no scenarios possible right now