francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
frankknoll
2022-01-31 21:48:10 +01:00
parent b812b6fc0b
commit f344032365
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
HowBadIsMyBatch.ipynb
View File

@@ -85,10 +85,6 @@
" isDose = df[\"VAX_DOSE_SERIES\"].str.contains(dose) if dose is not None else True\n", " isDose = df[\"VAX_DOSE_SERIES\"].str.contains(dose) if dose is not None else True\n",
" return df[isCovid19 & isManufacturer & isDose]\n", " return df[isCovid19 & isManufacturer & isDose]\n",
"\n", "\n",
"# FK-TODO: inline method\n",
"def createAndFilterDataFrameFromDescrs(vaersDescrs, manufacturer, dose):\n",
" return filterDataFrame(createDataFrameFromDescrs(vaersDescrs), manufacturer = manufacturer, dose = dose)\n",
"\n",
"def filterDataFrameForSevereEffects(df, dose):\n", "def filterDataFrameForSevereEffects(df, dose):\n",
" return filterDataFrame(df, dose = dose)\n" " return filterDataFrame(df, dose = dose)\n"
] ]
@@ -102,7 +98,7 @@
"source": [ "source": [
"# FK-TODO: inline method\n", "# FK-TODO: inline method\n",
"def createAndFilterDataFrameFromFiles(dataDir, manufacturer, dose):\n", "def createAndFilterDataFrameFromFiles(dataDir, manufacturer, dose):\n",
" return createAndFilterDataFrameFromDescrs(readAllVaersDescrs(dataDir), manufacturer, dose)\n" " return filterDataFrame(createDataFrameFromDescrs(readAllVaersDescrs(dataDir)), manufacturer = manufacturer, dose = dose)\n"
] ]
}, },
{ {
@@ -216,9 +212,10 @@
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" }\n", " }\n",
" ]\n", " ]\n",
" dataFrame = createDataFrameFromDescrs(vaersDescrs)\n",
" \n", " \n",
" # When\n", " # When\n",
" dataFrame = createAndFilterDataFrameFromDescrs(vaersDescrs, \"MODERNA\", '1')\n", " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n",
" \n", " \n",
" # Then\n", " # Then\n",
" dataFrameExpected = self.createDataFrame(\n", " dataFrameExpected = self.createDataFrame(\n",
@@ -289,9 +286,10 @@
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" }\n", " }\n",
" ]\n", " ]\n",
" dataFrame = createDataFrameFromDescrs(vaersDescrs)\n",
" \n", " \n",
" # When\n", " # When\n",
" dataFrame = createAndFilterDataFrameFromDescrs(vaersDescrs, \"MODERNA\", '1')\n", " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n",
" \n", " \n",
" # Then\n", " # Then\n",
" dataFrameExpected = self.createDataFrame(\n", " dataFrameExpected = self.createDataFrame(\n",
@@ -321,9 +319,10 @@
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" }\n", " }\n",
" ]\n", " ]\n",
" dataFrame = createDataFrameFromDescrs(vaersDescrs)\n",
" \n", " \n",
" # When\n", " # When\n",
" dataFrame = createAndFilterDataFrameFromDescrs(vaersDescrs, \"MODERNA\", '2')\n", " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '2')\n",
" \n", " \n",
" # Then\n", " # Then\n",
" dataFrameExpected = self.createDataFrame(\n", " dataFrameExpected = self.createDataFrame(\n",
@@ -350,7 +349,7 @@
"class BatchCodeTableTest(unittest.TestCase):\n", "class BatchCodeTableTest(unittest.TestCase):\n",
"\n", "\n",
" def test_createBatchCodeTable2(self):\n", " def test_createBatchCodeTable2(self):\n",
" dataFrame = createAndFilterDataFrameFromDescrs(\n", " dataFrame = createDataFrameFromDescrs(\n",
" [\n", " [\n",
" {\n", " {\n",
" 'VAERSDATA': self.createDataFrame(\n", " 'VAERSDATA': self.createDataFrame(\n",
@@ -386,10 +385,8 @@
" \"1996874\"],\n", " \"1996874\"],\n",
" dtypes = {'VAX_DOSE_SERIES': \"string\"})\n", " dtypes = {'VAX_DOSE_SERIES': \"string\"})\n",
" }\n", " }\n",
" ],\n", " ])\n",
" \"MODERNA\",\n", " dataFrame = filterDataFrame(dataFrame, manufacturer = \"MODERNA\", dose = '1')\n",
" '1')\n",
"\n",
" self._test_createBatchCodeTable(dataFrame);\n", " self._test_createBatchCodeTable(dataFrame);\n",
"\n", "\n",
" def test_createBatchCodeTable(self):\n", " def test_createBatchCodeTable(self):\n",