refactoring

This commit is contained in:
frankknoll
2022-01-29 02:47:01 +01:00
parent 5805a8b240
commit 05e70ffbc5

View File

@@ -45,7 +45,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"def createDataFrame(dataDir, manufacturer, dose):\n", "def createDataFrameFromFiles(dataDir, manufacturer, dose):\n",
" def readVaersDescr(year):\n", " def readVaersDescr(year):\n",
" def read_csv(file, usecols, dtype = {}):\n", " def read_csv(file, usecols, dtype = {}):\n",
" return pd.read_csv(\n", " return pd.read_csv(\n",
@@ -259,7 +259,7 @@
" self._test_createBatchCodeTable(dataFrame);\n", " self._test_createBatchCodeTable(dataFrame);\n",
"\n", "\n",
" def test_createBatchCodeTable(self):\n", " def test_createBatchCodeTable(self):\n",
" self._test_createBatchCodeTable(createDataFrame(\"test/VAERS\", \"MODERNA\", '1'));\n", " self._test_createBatchCodeTable(createDataFrameFromFiles(\"test/VAERS\", \"MODERNA\", '1'));\n",
"\n", "\n",
" def _test_createBatchCodeTable(self, dataFrame):\n", " def _test_createBatchCodeTable(self, dataFrame):\n",
" # When\n", " # When\n",
@@ -298,7 +298,7 @@
"outputs": [], "outputs": [],
"source": [ "source": [
"def saveBatchCodeTable(manufacturer, excelFile):\n", "def saveBatchCodeTable(manufacturer, excelFile):\n",
" batchCodeTable = createBatchCodeTable(createDataFrame(\"VAERS\", manufacturer, '1'))\n", " batchCodeTable = createBatchCodeTable(createDataFrameFromFiles(\"VAERS\", manufacturer, '1'))\n",
" display(manufacturer, batchCodeTable)\n", " display(manufacturer, batchCodeTable)\n",
" batchCodeTable.to_excel(excelFile)" " batchCodeTable.to_excel(excelFile)"
] ]
@@ -314,6 +314,14 @@
"saveBatchCodeTable(\"PFIZER\\BIONTECH\", \"results/pfizer.xlsx\")\n", "saveBatchCodeTable(\"PFIZER\\BIONTECH\", \"results/pfizer.xlsx\")\n",
"saveBatchCodeTable(\"JANSSEN\", \"results/janssen.xlsx\")" "saveBatchCodeTable(\"JANSSEN\", \"results/janssen.xlsx\")"
] ]
},
{
"cell_type": "code",
"execution_count": null,
"id": "d0f623c1",
"metadata": {},
"outputs": [],
"source": []
} }
], ],
"metadata": { "metadata": {