Skip to content

Commit 63a06d8

Browse files
mnjowejoehcollins
andauthored
Convert excel files to csv files. Joe's modules (#1508)
* convert excel files to csv equivalent - Joe modules * use new method to read newly converted csv files * sort imports * used read_csv_files method * read csv files using the new read_csv_files method, disable pylint error, update doc string * edits * convert Excel to csv file(s), change from read_excel to read_csv_files for newly created csv file(s) * rename resource files. added underscores and removed some unwanted characters and duplicate extensions * updated modules to align with updates to read_csv_files method in master * remove disable pylint as we are now directly reading via pd.read_csv * remove unused import * delete unused csv files --------- Co-authored-by: joehcollins <[email protected]>
1 parent 3c407a4 commit 63a06d8

34 files changed

+84
-41
lines changed

resources/ResourceFile_AntenatalCare.xlsx

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:a5cf6bb4312c4e315d004ef769bac35560be3fe423fe648e9ea5549b5e3342d1
3+
size 1258

resources/ResourceFile_LabourSkilledBirthAttendance.xlsx

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:be621298177fff272051d8b519dd890f812c427603f24e70a66386e528157047
3+
size 11243

resources/ResourceFile_NewbornOutcomes.xlsx

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:f805646e16fe9912a68da5a10b901086e8a531f4802b04a7ec2b1216eedfac4e
3+
size 3737

resources/ResourceFile_PostnatalSupervisor.xlsx

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:8dac89c4cc638a6f65cc21effb521380e3d6ca06600af737244e41ef0f71b4a9
3+
size 3573

resources/ResourceFile_PregnancySupervisor.xlsx

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:702d26f19582a9fc603265da9f0b61f89fede8aa3582ab8cee551cf4109a49b1
3+
size 12966

resources/contraception/ResourceFile_Contraception.xlsx

Lines changed: 0 additions & 3 deletions
This file was deleted.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:f3b8d2085d10f1680cf7d521ba415777b194ef26a964c14bca473cbdd76c7982
3+
size 770
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:9ab5f87adb1c35d4ff2fa0e6226a32840ef4d3d4a8d130404cf74e9f2a13528a
3+
size 296
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:d54deeb3a78189d18f1e18e20132aa4e965d5e780ab6299e4ef5434627449dfe
3+
size 259
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:dec00bfe6c52595dbac43cc05bfa00771408dd3ceddc2a0c843ffe232453fd04
3+
size 270
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:bb59b96ca917f218d48b349790092ea04d612c3545669c219ae25a65930a38d1
3+
size 810
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:62709e4159aff94254a843ad726cfb0b5d655bce4c7d209cff03fed2adde3534
3+
size 268
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:66624dbc15b3f8299e218c97e1f9ebd2e79fc382e25b55f214cdfbe50cd85ee3
3+
size 150
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:66624dbc15b3f8299e218c97e1f9ebd2e79fc382e25b55f214cdfbe50cd85ee3
3+
size 150
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:1fafc2deddb6c9f1a341f0dc45097aaf0770cb09b49ec26ffa7133f35e748044
3+
size 5983
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:f6848831b52ab636cf78cd6c3ddc999ad01a46d9d5471987d0e406c479f75ef0
3+
size 263
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:57d060bdd1a4ad87630853291de818144eeb15c5d2a5ba54a4d2507b31f879ff
3+
size 509
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:b9340fdca9143fd824c0074986c0fc4c7620120517ecbf67bce75b32d4fa240d
3+
size 295
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:3784438c4ccc28e3886cc8244880364a3b73581598e2b73e515f2309fd14a281
3+
size 1219
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:71c1d00707d77dcba8ec87532a9ac3f122cb4bbb2c6cd473d57c0157259b16e3
3+
size 95

src/scripts/contraception/f_steril_use_2010vs2020.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
A helper script to see the numbers of women of reproductive age having female sterilisation per 5-years age categories +
33
total, and the number of all women in the population in 2010 and 2020, to help to calibrate the intervention multipliers
4-
(saved in ResourceFile_Contraception.xlsx in the sheets Interventions_Pop & Interventions_PPFP).
4+
(saved in ResourceFile_Contraception folder in the Interventions_Pop & Interventions_PPFP CSV files).
55
"""
66
from pathlib import Path
77

src/tlo/methods/care_of_women_during_pregnancy.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from tlo.methods.labour import LabourOnsetEvent
1313
from tlo.methods.malaria import HSI_MalariaIPTp
1414
from tlo.methods.tb import HSI_Tb_ScreeningAndRefer
15+
from tlo.util import read_csv_files
1516

1617
logger = logging.getLogger(__name__)
1718
logger.setLevel(logging.INFO)
@@ -176,8 +177,8 @@ def __init__(self, name=None, resourcefilepath=None):
176177
}
177178

178179
def read_parameters(self, data_folder):
179-
parameter_dataframe = pd.read_excel(Path(self.resourcefilepath) / 'ResourceFile_AntenatalCare.xlsx',
180-
sheet_name='parameter_values')
180+
parameter_dataframe = read_csv_files(Path(self.resourcefilepath) / 'ResourceFile_AntenatalCare',
181+
files='parameter_values')
181182
self.load_parameters_from_dataframe(parameter_dataframe)
182183

183184
def initialise_population(self, population):

src/tlo/methods/contraception.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from tlo.analysis.utils import flatten_multi_index_series_into_dict_for_logging
99
from tlo.events import Event, IndividualScopeEventMixin, PopulationScopeEventMixin, RegularEvent
1010
from tlo.methods.hsi_event import HSI_Event
11-
from tlo.util import random_date, sample_outcome, transition_states
11+
from tlo.util import random_date, read_csv_files, sample_outcome, transition_states
1212

1313
logger = logging.getLogger(__name__)
1414
logger.setLevel(logging.INFO)
@@ -164,7 +164,8 @@ def read_parameters(self, data_folder):
164164
"""Import the relevant sheets from the ResourceFile (excel workbook) and declare values for other parameters
165165
(CSV ResourceFile).
166166
"""
167-
workbook = pd.read_excel(Path(self.resourcefilepath) / 'contraception' / 'ResourceFile_Contraception.xlsx', sheet_name=None)
167+
workbook = read_csv_files(Path(self.resourcefilepath) / 'contraception' / 'ResourceFile_Contraception',
168+
files=None)
168169

169170
# Import selected sheets from the workbook as the parameters
170171
sheet_names = [
@@ -1350,10 +1351,10 @@ def __init__(self, *args):
13501351
super().__init__(name='Labour')
13511352

13521353
def read_parameters(self, *args):
1353-
parameter_dataframe = pd.read_excel(self.sim.modules['Contraception'].resourcefilepath /
1354+
parameter_dataframe = read_csv_files(self.sim.modules['Contraception'].resourcefilepath /
13541355
'contraception' /
1355-
'ResourceFile_Contraception.xlsx',
1356-
sheet_name='simplified_labour_parameters')
1356+
'ResourceFile_Contraception',
1357+
files='simplified_labour_parameters')
13571358
self.load_parameters_from_dataframe(parameter_dataframe)
13581359

13591360
def initialise_population(self, population):

src/tlo/methods/labour.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from tlo.methods.hsi_event import HSI_Event
1818
from tlo.methods.hsi_generic_first_appts import GenericFirstAppointmentsMixin
1919
from tlo.methods.postnatal_supervisor import PostnatalWeekOneMaternalEvent
20-
from tlo.util import BitsetHandler
20+
from tlo.util import BitsetHandler, read_csv_files
2121

2222
if TYPE_CHECKING:
2323
from tlo.methods.hsi_generic_first_appts import HSIEventScheduler
@@ -620,9 +620,9 @@ def __init__(self, name=None, resourcefilepath=None):
620620
}
621621

622622
def read_parameters(self, data_folder):
623-
parameter_dataframe = pd.read_excel(Path(self.resourcefilepath) / 'ResourceFile_LabourSkilledBirth'
624-
'Attendance.xlsx',
625-
sheet_name='parameter_values')
623+
parameter_dataframe = read_csv_files(Path(self.resourcefilepath) / 'ResourceFile_LabourSkilledBirth'
624+
'Attendance',
625+
files='parameter_values')
626626
self.load_parameters_from_dataframe(parameter_dataframe)
627627

628628
def initialise_population(self, population):

src/tlo/methods/newborn_outcomes.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from tlo.methods.causes import Cause
1111
from tlo.methods.hsi_event import HSI_Event
1212
from tlo.methods.postnatal_supervisor import PostnatalWeekOneNeonatalEvent
13-
from tlo.util import BitsetHandler
13+
from tlo.util import BitsetHandler, read_csv_files
1414

1515
logger = logging.getLogger(__name__)
1616
logger.setLevel(logging.INFO)
@@ -311,8 +311,8 @@ def __init__(self, name=None, resourcefilepath=None):
311311

312312
def read_parameters(self, data_folder):
313313

314-
parameter_dataframe = pd.read_excel(Path(self.resourcefilepath) / 'ResourceFile_NewbornOutcomes.xlsx',
315-
sheet_name='parameter_values')
314+
parameter_dataframe = read_csv_files(Path(self.resourcefilepath) / 'ResourceFile_NewbornOutcomes',
315+
files='parameter_values')
316316
self.load_parameters_from_dataframe(parameter_dataframe)
317317

318318
# Here we map 'disability' parameters to associated DALY weights to be passed to the health burden module

src/tlo/methods/postnatal_supervisor.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from tlo.methods import Metadata, postnatal_supervisor_lm, pregnancy_helper_functions
1010
from tlo.methods.causes import Cause
1111
from tlo.methods.hsi_event import HSI_Event
12+
from tlo.util import read_csv_files
1213

1314
logger = logging.getLogger(__name__)
1415
logger.setLevel(logging.INFO)
@@ -230,8 +231,8 @@ def __init__(self, name=None, resourcefilepath=None):
230231
}
231232

232233
def read_parameters(self, data_folder):
233-
parameter_dataframe = pd.read_excel(Path(self.resourcefilepath) / 'ResourceFile_PostnatalSupervisor.xlsx',
234-
sheet_name='parameter_values')
234+
parameter_dataframe = read_csv_files(Path(self.resourcefilepath) / 'ResourceFile_PostnatalSupervisor',
235+
files='parameter_values')
235236
self.load_parameters_from_dataframe(parameter_dataframe)
236237

237238
def initialise_population(self, population):

src/tlo/methods/pregnancy_supervisor.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
)
2828
from tlo.methods.causes import Cause
2929
from tlo.methods.hsi_generic_first_appts import GenericFirstAppointmentsMixin
30-
from tlo.util import BitsetHandler
30+
from tlo.util import BitsetHandler, read_csv_files
3131

3232
if TYPE_CHECKING:
3333
from tlo.methods.hsi_generic_first_appts import HSIEventScheduler
@@ -434,8 +434,8 @@ def __init__(self, name=None, resourcefilepath=None):
434434

435435
def read_parameters(self, data_folder):
436436
# load parameters from the resource file
437-
parameter_dataframe = pd.read_excel(Path(self.resourcefilepath) / 'ResourceFile_PregnancySupervisor.xlsx',
438-
sheet_name='parameter_values')
437+
parameter_dataframe = read_csv_files(Path(self.resourcefilepath) / 'ResourceFile_PregnancySupervisor',
438+
files='parameter_values')
439439
self.load_parameters_from_dataframe(parameter_dataframe)
440440

441441
# Here we map 'disability' parameters to associated DALY weights to be passed to the health burden module.

src/tlo/methods/simplified_births.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def read_parameters(self, data_folder):
111111
self.parameters['months_between_pregnancy_and_delivery'] = 9
112112

113113
# Breastfeeding status for newborns (importing from the Newborn resourcefile)
114-
rf = pd.read_excel(Path(self.resourcefilepath) / 'ResourceFile_NewbornOutcomes.xlsx')
114+
rf = pd.read_csv(Path(self.resourcefilepath) / 'ResourceFile_NewbornOutcomes/parameter_values.csv')
115115
param_as_string = rf.loc[rf.parameter_name == 'prob_breastfeeding_type']['value'].iloc[0]
116116
parameter = json.loads(param_as_string)[0]
117117
self.parameters['prob_breastfeeding_type'] = parameter

tests/test_contraception.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from tlo.methods import contraception, demography, enhanced_lifestyle, healthsystem, symptommanager
1313
from tlo.methods.contraception import HSI_Contraception_FamilyPlanningAppt
1414
from tlo.methods.hiv import DummyHivModule
15+
from tlo.util import read_csv_files
1516

1617

1718
def run_sim(tmpdir,
@@ -918,8 +919,8 @@ def test_input_probs_sum():
918919

919920
# Import relevant sheets from the workbook
920921
resourcefilepath = Path(os.path.dirname(__file__)) / '../resources'
921-
workbook = pd.read_excel(Path(resourcefilepath) / 'contraception' / 'ResourceFile_Contraception.xlsx',
922-
sheet_name=None)
922+
workbook = read_csv_files(Path(resourcefilepath) / 'contraception' / 'ResourceFile_Contraception',
923+
files=None)
923924
sheet_names = [
924925
'Initiation_ByMethod',
925926
'Interventions_Pop',

0 commit comments

Comments
 (0)