@@ -155,9 +155,6 @@ def read_parameters(self, data_folder):
155
155
self .districts = self .sim .modules ['Demography' ].districts # <- all districts
156
156
157
157
# Load parameters
158
- # workbook = pd.read_excel(Path(self.resourcefilepath) / 'ResourceFile_Schisto.xlsx', sheet_name=None)
159
- # self.parameters = self._load_parameters_from_workbook(workbook)
160
-
161
158
workbook = read_csv_files (Path (self .resourcefilepath ) / 'ResourceFile_Schisto' , files = None )
162
159
self .parameters = self ._load_parameters_from_workbook (workbook )
163
160
@@ -167,7 +164,6 @@ def read_parameters(self, data_folder):
167
164
168
165
# Register symptoms
169
166
symptoms_df = workbook ['Symptoms' ]
170
- # self._register_symptoms(symptoms_df.set_index('Symptom')['HSB_mapped_symptom'].to_dict())
171
167
self ._register_symptoms (symptoms_df )
172
168
173
169
# create container for logging person-days infected
@@ -792,7 +788,6 @@ def load_parameters_from_workbook(self, workbook) -> dict:
792
788
'baseline_prevalence' ,
793
789
):
794
790
parameters [_param_name ] = float (param_list [f'{ _param_name } _{ self .name } ' ])
795
- # parameters[_param_name] = float(param_list[_param_name])
796
791
797
792
# Baseline reservoir size and other district-related params (R0, proportion susceptible)
798
793
schisto_initial_reservoir = workbook [f'LatestData_{ self .name } ' ].set_index ("District" )
@@ -1026,7 +1021,7 @@ def log_infection_status(self) -> None:
1026
1021
)
1027
1022
1028
1023
# Susceptibility
1029
- # todo reinstate if needed
1024
+ # reinstate if wanting to check susceptibility across districts
1030
1025
# Directly filter and group in one step to avoid intermediate DataFrames
1031
1026
# grouped_data = df[df.is_alive].groupby('district_of_residence')[prop('susceptibility')].agg(
1032
1027
# total_count='count',
@@ -1691,7 +1686,7 @@ def apply(self, population):
1691
1686
"""
1692
1687
for _spec in self .module .species .values ():
1693
1688
_spec .log_infection_status ()
1694
- # _spec.log_mean_worm_burden() # todo revert this if needed
1689
+ # _spec.log_mean_worm_burden() # revert this if needed
1695
1690
1696
1691
# PZQ treatment episodes
1697
1692
df = population .props
0 commit comments