refactoring

This commit is contained in:
frankknoll
2022-01-31 21:56:13 +01:00
parent f344032365
commit 74583a0fb4

View File

@@ -89,18 +89,6 @@
" return filterDataFrame(df, dose = dose)\n"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "5d2d2f93",
"metadata": {},
"outputs": [],
"source": [
"# FK-TODO: inline method\n",
"def createAndFilterDataFrameFromFiles(dataDir, manufacturer, dose):\n",
" return filterDataFrame(createDataFrameFromDescrs(readAllVaersDescrs(dataDir)), manufacturer = manufacturer, dose = dose)\n"
]
},
{
"cell_type": "code",
"execution_count": null,
@@ -390,7 +378,12 @@
" self._test_createBatchCodeTable(dataFrame);\n",
"\n",
" def test_createBatchCodeTable(self):\n",
" self._test_createBatchCodeTable(createAndFilterDataFrameFromFiles(\"test/VAERS\", \"MODERNA\", '1'));\n",
" self._test_createBatchCodeTable(\n",
" filterDataFrame(\n",
" createDataFrameFromDescrs(\n",
" readAllVaersDescrs(\"test/VAERS\")),\n",
" manufacturer = \"MODERNA\",\n",
" dose = '1'))\n",
"\n",
" def _test_createBatchCodeTable(self, dataFrame):\n",
" # When\n",
@@ -486,7 +479,12 @@
"outputs": [],
"source": [
"def saveBatchCodeTable(manufacturer, excelFile):\n",
" batchCodeTable = createBatchCodeTable(createAndFilterDataFrameFromFiles(\"VAERS\", manufacturer, '1'))\n",
" batchCodeTable = createBatchCodeTable(\n",
" filterDataFrame(\n",
" createDataFrameFromDescrs(\n",
" readAllVaersDescrs(\"VAERS\")),\n",
" manufacturer = manufacturer,\n",
" dose = '1'))\n",
" display(manufacturer, batchCodeTable)\n",
" batchCodeTable.to_excel(excelFile)"
]