From 663a560c67681eeb5c1d9c3a57bf765a8d3b8caa Mon Sep 17 00:00:00 2001 From: frankknoll Date: Mon, 31 Jan 2022 20:29:37 +0100 Subject: [PATCH] refactoring --- HowBadIsMyBatch.ipynb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/HowBadIsMyBatch.ipynb b/HowBadIsMyBatch.ipynb index 31723058d59..3f351e53388 100644 --- a/HowBadIsMyBatch.ipynb +++ b/HowBadIsMyBatch.ipynb @@ -77,17 +77,14 @@ " dtype = {\"VAX_DOSE_SERIES\": \"string\"})\n", " }\n", "\n", - "def createAndFilterDataFrameFromFiles(dataDir, manufacturer, dose):\n", - " return createAndFilterDataFrameFromDescrs(\n", - " [readVaersDescr(dataDir, \"2021\"), readVaersDescr(dataDir, \"2022\")],\n", - " manufacturer,\n", - " dose)\n", + "def readVaersDescrs(dataDir, years):\n", + " return [readVaersDescr(dataDir, year) for year in years]\n", + "\n", + "def createAndFilterDataFrameFromFiles(dataDir, manufacturer, dose):\n", + " return createAndFilterDataFrameFromDescrs(readVaersDescrs(dataDir, [\"2021\", \"2022\"]), manufacturer, dose)\n", "\n", - "# FK-TODO: DRY with createAndFilterDataFrameFromFiles()\n", "def createDataFrameSevereEffectsFromFiles(dataDir, dose):\n", - " return createDataFrameSevereEffectsFromDescrs(\n", - " [readVaersDescr(dataDir, \"2021\"), readVaersDescr(dataDir, \"2022\")],\n", - " dose)" + " return createDataFrameSevereEffectsFromDescrs(readVaersDescrs(dataDir, [\"2021\", \"2022\"]), dose)" ] }, {