From 682e21fd372a9d2208b8f08cfaf141a9deff993e Mon Sep 17 00:00:00 2001 From: frankknoll Date: Sun, 22 Jan 2023 22:43:56 +0100 Subject: [PATCH] refactoring --- src/SymptomsByBatchcodesTableFactory.py | 4 ++-- src/SymptomsByBatchcodesTableFactoryTest.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SymptomsByBatchcodesTableFactory.py b/src/SymptomsByBatchcodesTableFactory.py index 48f83abb655..6c15d6da294 100644 --- a/src/SymptomsByBatchcodesTableFactory.py +++ b/src/SymptomsByBatchcodesTableFactory.py @@ -27,11 +27,11 @@ class SymptomsByBatchcodesTableFactory: axis='columns').reset_index().drop_duplicates(subset = ['VAERS_ID'] + index_columns) @staticmethod - def _getVaxLotsTable(VAERSVAX, index_columns): + def _getVaxLotsTable(VAERSVAX, index_columns): VAX_LOT_LIST_Table = VAERSVAX.groupby("VAERS_ID").agg( VAX_LOT_LIST = pd.NamedAgg( column = 'VAX_LOT', - aggfunc = lambda x: sorted(list(x)))) + aggfunc = lambda VAX_LOT_series: list(VAX_LOT_series.sort_values()))) return pd.DataFrame( fillLsts( lsts = VAX_LOT_LIST_Table['VAX_LOT_LIST'].tolist(), diff --git a/src/SymptomsByBatchcodesTableFactoryTest.py b/src/SymptomsByBatchcodesTableFactoryTest.py index 99607258edf..860ce55cd8e 100644 --- a/src/SymptomsByBatchcodesTableFactoryTest.py +++ b/src/SymptomsByBatchcodesTableFactoryTest.py @@ -5,6 +5,7 @@ from SymptomsByBatchcodesTableFactory import SymptomsByBatchcodesTableFactory import pandas as pd import numpy as np +# FIXME: brauchen Normalisierung analog zu DataFrameNormalizer.removeUnknownBatchCodes(dataFrame) und DataFrameNormalizer.convertVAX_LOTColumnToUpperCase(dataFrame) class SymptomsByBatchcodesTableFactoryTest(unittest.TestCase): def test_createSymptomsByBatchcodesTable(self): @@ -167,5 +168,3 @@ class SymptomsByBatchcodesTableFactoryTest(unittest.TestCase): index = pd.MultiIndex.from_tuples( names = ['VAX_LOT1', 'VAX_LOT2'], tuples = [['1808982', 'EW0175']] * 13 + [['EW0167', 'EW0175']] * 10))) - -