refactoring

This commit is contained in:
frankknoll
2022-02-10 01:16:24 +01:00
parent ee2c68bb50
commit 079ac6737a

View File

@@ -1165,6 +1165,20 @@
"#### Pfizer Batches" "#### Pfizer Batches"
] ]
}, },
{
"cell_type": "code",
"execution_count": null,
"id": "b769466d",
"metadata": {},
"outputs": [],
"source": [
"def createADRsByVAX_LOTTable(vaers, manufacturer):\n",
" dataFrame = DataFrameFilter().filterByCovid19(vaers)\n",
" dataFrame = DataFrameFilter().filterBy(dataFrame, manufacturer = manufacturer)\n",
" batchCodeTable = BatchCodeTableFactory._createSummationTableByVAX_LOT(dataFrame)[['ADRs']].reset_index()\n",
" return batchCodeTable\n"
]
},
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
@@ -1176,9 +1190,7 @@
"\n", "\n",
"import re\n", "import re\n",
"\n", "\n",
"dataFrame = DataFrameFilter().filterByCovid19(vaers)\n", "batchCodeTable = createADRsByVAX_LOTTable(vaers, \"PFIZER\\BIONTECH\")\n",
"dataFrame = DataFrameFilter().filterBy(dataFrame, manufacturer = \"PFIZER\\BIONTECH\")\n",
"batchCodeTable = BatchCodeTableFactory._createSummationTableByVAX_LOT(dataFrame)[['ADRs']].reset_index()\n",
"batchCodeTable['VAX_LOT_PREFIX'] = batchCodeTable['VAX_LOT'].str[:2]\n", "batchCodeTable['VAX_LOT_PREFIX'] = batchCodeTable['VAX_LOT'].str[:2]\n",
"batchCodeTable = batchCodeTable.sort_values(by = 'VAX_LOT_PREFIX', ascending = True)\n", "batchCodeTable = batchCodeTable.sort_values(by = 'VAX_LOT_PREFIX', ascending = True)\n",
"\n", "\n",
@@ -1244,9 +1256,7 @@
"source": [ "source": [
"import re\n", "import re\n",
"\n", "\n",
"dataFrame = DataFrameFilter().filterByCovid19(vaers)\n", "batchCodeTable = createADRsByVAX_LOTTable(vaers, \"MODERNA\")\n",
"dataFrame = DataFrameFilter().filterBy(dataFrame, manufacturer = \"MODERNA\")\n",
"batchCodeTable = BatchCodeTableFactory._createSummationTableByVAX_LOT(dataFrame)[['ADRs']].reset_index()\n",
"modernaBatchCodePrefix = re.compile(r'^[0-9]{3}[a-zA-Z]')\n", "modernaBatchCodePrefix = re.compile(r'^[0-9]{3}[a-zA-Z]')\n",
"batchCodeTable = batchCodeTable[batchCodeTable['VAX_LOT'].apply(lambda vax_lot: bool(modernaBatchCodePrefix.match(vax_lot)))]\n", "batchCodeTable = batchCodeTable[batchCodeTable['VAX_LOT'].apply(lambda vax_lot: bool(modernaBatchCodePrefix.match(vax_lot)))]\n",
"batchCodeTable['CONCENTRATION'] = batchCodeTable['VAX_LOT'].str[3]\n", "batchCodeTable['CONCENTRATION'] = batchCodeTable['VAX_LOT'].str[3]\n",