From ee717367c9d081f36d8968fa2222116f57598d45 Mon Sep 17 00:00:00 2001 From: frankknoll Date: Fri, 20 Jan 2023 01:18:05 +0100 Subject: [PATCH] refactoring --- src/SymptomsByBatchcodesTableFactory.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/SymptomsByBatchcodesTableFactory.py b/src/SymptomsByBatchcodesTableFactory.py index 9f6cd428301..9107caeaa8e 100644 --- a/src/SymptomsByBatchcodesTableFactory.py +++ b/src/SymptomsByBatchcodesTableFactory.py @@ -30,7 +30,10 @@ class SymptomsByBatchcodesTableFactory: def _getVaxLotsTable(VAERSVAX, index_columns): VAX_LOT_LIST_Table = VAERSVAX.groupby("VAERS_ID").agg(VAX_LOT_LIST = pd.NamedAgg(column = 'VAX_LOT', aggfunc = list)) return pd.DataFrame( - [fill(VAX_LOTS, len(index_columns), str(np.nan)) for VAX_LOTS in VAX_LOT_LIST_Table['VAX_LOT_LIST'].tolist()], + fillLsts( + lsts = VAX_LOT_LIST_Table['VAX_LOT_LIST'].tolist(), + desiredLen = len(index_columns), + fillValue = str(np.nan)), columns = index_columns, index = VAX_LOT_LIST_Table.index) @@ -45,5 +48,8 @@ class SymptomsByBatchcodesTableFactory: VAERSSYMPTOMS['SYMPTOM5'] ]).dropna().to_frame(name = symptomsColumn).reset_index() -def fill(lst, desiredLen, fillValue): +def fillLsts(lsts, desiredLen, fillValue): + return [fillLst(lst, desiredLen, fillValue) for lst in lsts] + +def fillLst(lst, desiredLen, fillValue): return lst + [fillValue] * (max(desiredLen - len(lst), 0)) \ No newline at end of file