refactoring

This commit is contained in:
frankknoll
2023-03-30 08:22:53 +02:00
parent 755b164d56
commit 3653f52eaf

View File

@@ -19,9 +19,9 @@ class VaersDescrReader:
def readNonDomesticVaersDescr(self): def readNonDomesticVaersDescr(self):
return { return {
'VAERSDATA': self._readVAERSDATA(self.dataDir + "/NonDomesticVAERSDATA.csv"), 'VAERSDATA': self._readVAERSDATA(self.dataDir + '/NonDomesticVAERSDATA.csv'),
'VAERSVAX': self._readVAERSVAX(self.dataDir + "/NonDomesticVAERSVAX.csv"), 'VAERSVAX': self._readVAERSVAX(self.dataDir + '/NonDomesticVAERSVAX.csv'),
'VAERSSYMPTOMS': self._readVAERSSYMPTOMS(self.dataDir + "/NonDomesticVAERSSYMPTOMS.csv") 'VAERSSYMPTOMS': self._readVAERSSYMPTOMS(self.dataDir + '/NonDomesticVAERSSYMPTOMS.csv')
} }
def _readVAERSDATA(self, file): def _readVAERSDATA(self, file):
@@ -29,7 +29,7 @@ class VaersDescrReader:
file = file, file = file,
usecols = ['VAERS_ID', 'RECVDATE', 'DIED', 'L_THREAT', 'DISABLE', 'HOSPITAL', 'ER_VISIT', 'SPLTTYPE'], usecols = ['VAERS_ID', 'RECVDATE', 'DIED', 'L_THREAT', 'DISABLE', 'HOSPITAL', 'ER_VISIT', 'SPLTTYPE'],
parse_dates = ['RECVDATE'], parse_dates = ['RECVDATE'],
date_parser = lambda dateStr: pd.to_datetime(dateStr, format = "%m/%d/%Y")) date_parser = lambda dateStr: pd.to_datetime(dateStr, format = '%m/%d/%Y'))
DataFrameNormalizer._convertColumnsOfDataFrame_Y_to_1_else_0( DataFrameNormalizer._convertColumnsOfDataFrame_Y_to_1_else_0(
VAERSDATA, VAERSDATA,
['DIED', 'L_THREAT', 'DISABLE', 'HOSPITAL', 'ER_VISIT']) ['DIED', 'L_THREAT', 'DISABLE', 'HOSPITAL', 'ER_VISIT'])
@@ -41,8 +41,8 @@ class VaersDescrReader:
usecols = ['VAERS_ID', 'VAX_DOSE_SERIES', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT'], usecols = ['VAERS_ID', 'VAX_DOSE_SERIES', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT'],
dtype = dtype =
{ {
"VAX_DOSE_SERIES": "string", 'VAX_DOSE_SERIES': 'string',
"VAX_LOT": "string" 'VAX_LOT': 'string'
}) })
DataFrameNormalizer.removeUnknownBatchCodes(VAERSVAX) DataFrameNormalizer.removeUnknownBatchCodes(VAERSVAX)
DataFrameNormalizer.convertVAX_LOTColumnToUpperCase(VAERSVAX) DataFrameNormalizer.convertVAX_LOTColumnToUpperCase(VAERSVAX)