refactoring

This commit is contained in:
frankknoll
2022-01-31 20:29:37 +01:00
parent 7dedd93e80
commit 663a560c67

View File

@@ -77,17 +77,14 @@
" dtype = {\"VAX_DOSE_SERIES\": \"string\"})\n", " dtype = {\"VAX_DOSE_SERIES\": \"string\"})\n",
" }\n", " }\n",
"\n", "\n",
"def createAndFilterDataFrameFromFiles(dataDir, manufacturer, dose):\n", "def readVaersDescrs(dataDir, years):\n",
" return createAndFilterDataFrameFromDescrs(\n", " return [readVaersDescr(dataDir, year) for year in years]\n",
" [readVaersDescr(dataDir, \"2021\"), readVaersDescr(dataDir, \"2022\")],\n", "\n",
" manufacturer,\n", "def createAndFilterDataFrameFromFiles(dataDir, manufacturer, dose):\n",
" dose)\n", " return createAndFilterDataFrameFromDescrs(readVaersDescrs(dataDir, [\"2021\", \"2022\"]), manufacturer, dose)\n",
"\n", "\n",
"# FK-TODO: DRY with createAndFilterDataFrameFromFiles()\n",
"def createDataFrameSevereEffectsFromFiles(dataDir, dose):\n", "def createDataFrameSevereEffectsFromFiles(dataDir, dose):\n",
" return createDataFrameSevereEffectsFromDescrs(\n", " return createDataFrameSevereEffectsFromDescrs(readVaersDescrs(dataDir, [\"2021\", \"2022\"]), dose)"
" [readVaersDescr(dataDir, \"2021\"), readVaersDescr(dataDir, \"2022\")],\n",
" dose)"
] ]
}, },
{ {