refactoring

This commit is contained in:
frankknoll
2023-01-20 10:20:11 +01:00
parent b046f99d99
commit 5dbd3d310a

View File

@@ -15,12 +15,12 @@ def getInternationalVaersCovid19(years):
def get_international_VAERSVAX_VAERSSYMPTOMS_Covid19(years): def get_international_VAERSVAX_VAERSSYMPTOMS_Covid19(years):
international_VAERSVAX, international_VAERSSYMPTOMS = _get_international_VAERSVAX_VAERSSYMPTOMSs(years) international_VAERSVAX, international_VAERSSYMPTOMS = _get_international_VAERSVAX_VAERSSYMPTOMS(years)
international_VAERSVAX_Covid19 = DataFrameFilter().filterByCovid19(international_VAERSVAX) international_VAERSVAX_Covid19 = DataFrameFilter().filterByCovid19(international_VAERSVAX)
return international_VAERSVAX_Covid19, international_VAERSSYMPTOMS return international_VAERSVAX_Covid19, international_VAERSSYMPTOMS
def _get_international_VAERSVAX_VAERSSYMPTOMSs(years): def _get_international_VAERSVAX_VAERSSYMPTOMS(years):
vaersDescrReader = VaersDescrReader(dataDir = "VAERS") vaersDescrReader = VaersDescrReader(dataDir = "VAERS")
internationalVaersDescrs = vaersDescrReader.readVaersDescrsForYears(years) + [vaersDescrReader.readNonDomesticVaersDescr()] internationalVaersDescrs = vaersDescrReader.readVaersDescrsForYears(years) + [vaersDescrReader.readNonDomesticVaersDescr()]
return _getVaersDescrByName(internationalVaersDescrs, 'VAERSVAX'), _getVaersDescrByName(internationalVaersDescrs, 'VAERSSYMPTOMS') return _getVaersDescrByName(internationalVaersDescrs, 'VAERSVAX'), _getVaersDescrByName(internationalVaersDescrs, 'VAERSSYMPTOMS')