run all non-gap strategies for more budget

src/scripts/healthsystem/impact_of_hcw_capabilities_expansion/prepare_minute_salary_and_extra_budget_frac_data.py

@@ -101,10 +101,10 @@
 # for "gap" allocation strategy
 # auxiliary.loc[:, 's_2'] = [0.4586, 0.0272, 0.3502, 0.1476, 0.0164]  # without historical scaling; "default" settings
 auxiliary.loc[:, 's_2'] = [0.4314, 0.0214, 0.3701, 0.1406, 0.0365]  # historical scaling + main settings
-# auxiliary.loc[:, 'default_cons s_2'] = [0.4252, 0.0261, 0.3752, 0.1362, 0.0373]  # historical scaling + default_cons
-# auxiliary.loc[:, 'more_budget s_2'] = [0.4314, 0.0214, 0.3701, 0.1406, 0.0365]  # historical scaling + more_budget
-# auxiliary.loc[:, 'less_budget s_2'] = [0.4314, 0.0214, 0.3701, 0.1406, 0.0365]  # historical scaling + less_budget
-# auxiliary.loc[:, 'max hs function s_2'] = [0.5133, 0.0085, 0.2501, 0.1551, 0.073]  # historical scaling + less_budget
+# auxiliary.loc[:, 's_2'] = [0.4314, 0.0214, 0.3701, 0.1406, 0.0365]  # historical scaling + more_budget; same as above
+# auxiliary.loc[:, 's_2'] = [0.4314, 0.0214, 0.3701, 0.1406, 0.0365]  # historical scaling + less_budget; same as above
+# auxiliary.loc[:, 's_2'] = [0.4252, 0.0261, 0.3752, 0.1362, 0.0373]  # historical scaling + default_cons
+# auxiliary.loc[:, 's_2'] = [0.5133, 0.0085, 0.2501, 0.1551, 0.073]  # historical scaling + max_hs_function
 
 # define extra budget fracs for each cadre
 extra_budget_fracs = pd.DataFrame(index=cadre_all, columns=combination_list)

src/scripts/healthsystem/impact_of_hcw_capabilities_expansion/scenario_of_expanding_current_hcw_by_officer_type_with_extra_budget.py

@@ -67,7 +67,7 @@ def _get_scenarios(self) -> Dict[str, Dict]:
         self.YEAR_OF_HRH_EXPANSION = 2025
         # The start year to expand HRH by cadre given the extra budget, which is after the historical HRH scaling
 
-        self.scenarios = extra_budget_fracs['s_2'].to_frame()
+        self.scenarios = extra_budget_fracs.drop(columns='s_0')
         # Run 'gap' scenario that's based on "historical scaling" + baseline of baseline settings
 
         # Baseline settings for change
@@ -76,10 +76,10 @@ def _get_scenarios(self) -> Dict[str, Dict]:
         self.hs_function = [[False, False], [False, True]]
 
         self.baselines = {
-            'baseline': self._baseline_of_baseline(),  # test historical scaling changes first
+            # 'baseline': self._baseline_of_baseline(),  # test historical scaling changes first
             # 'default_cons': self._baseline_default_cons(),
-            # 'more_budget': self._baseline_more_budget(),  # turn off when run baseline scenarios with no expansion
-            # 'less_budget': self._baseline_less_budget(),
+            'more_budget': self._baseline_more_budget(),  # turn off when run baseline scenarios with no expansion
+            # 'less_budget': self._baseline_less_budget(),  # turn off when run baseline scenarios with no expansion
             # 'max_hs_function': self._baseline_max_hs_function(),
         }