francois/HowBadIsMyBatch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
frankknoll
2022-02-16 22:19:17 +01:00
parent fcca425e6e
commit efc9b87349
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/HowBadIsMyBatch.ipynb
View File

@@ -28,10 +28,10 @@
" def __init__(self, dataDir):\n", " def __init__(self, dataDir):\n",
" self.dataDir = dataDir \n", " self.dataDir = dataDir \n",
"\n", "\n",
" def readVaersDescrs(self, years):\n", " def readVaersDescrsForYears(self, years):\n",
" return [self.readVaersDescr(year) for year in years]\n", " return [self.readVaersDescrForYear(year) for year in years]\n",
"\n", "\n",
" def readVaersDescr(self, year):\n", " def readVaersDescrForYear(self, year):\n",
" return {\n", " return {\n",
" 'VAERSDATA': self._readVAERSDATA(self.dataDir + \"/\" + year + \"VAERSDATA.csv\"),\n", " 'VAERSDATA': self._readVAERSDATA(self.dataDir + \"/\" + year + \"VAERSDATA.csv\"),\n",
" 'VAERSVAX': self._readVAERSVAX(self.dataDir + \"/\" + year + \"VAERSVAX.csv\")\n", " 'VAERSVAX': self._readVAERSVAX(self.dataDir + \"/\" + year + \"VAERSVAX.csv\")\n",
@@ -927,7 +927,7 @@
"\n", "\n",
" def test_createBatchCodeTableFromFiles(self):\n", " def test_createBatchCodeTableFromFiles(self):\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(\n",
" VaersDescrReader(dataDir = \"test/VAERS\").readVaersDescrs([\"2021\", \"2022\"]))\n", " VaersDescrReader(dataDir = \"test/VAERS\").readVaersDescrsForYears([\"2021\", \"2022\"]))\n",
" DataFrameNormalizer.normalize(dataFrame)\n", " DataFrameNormalizer.normalize(dataFrame)\n",
" self._test_createBatchCodeTable(dataFrame, '1')\n", " self._test_createBatchCodeTable(dataFrame, '1')\n",
"\n", "\n",
@@ -1129,27 +1129,27 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"def getVaers(vaersDescrsReaderFunc):\n", "def getAllVaers():\n",
" return _getVaers(lambda: _getVaersDescrReader().readVaersDescrsForYears([\"2021\", \"2022\"]))\n",
"\n",
"def getNonDomesticVaers():\n",
" return _getVaers(lambda: [_getVaersDescrReader().readNonDomesticVaersDescr()])\n",
"\n",
"def getInternationalVaers():\n",
" return pd.concat([getAllVaers(), getNonDomesticVaers()])\n",
"\n",
"def getVaersForYear(year):\n",
" return _getVaers(lambda: [_getVaersDescrReader().readVaersDescrForYear(year)])\n",
"\n",
"def _getVaers(vaersDescrsReaderFunc):\n",
" vaersDescrs = vaersDescrsReaderFunc()\n", " vaersDescrs = vaersDescrsReaderFunc()\n",
" dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n",
" DataFrameNormalizer.normalize(dataFrame)\n", " DataFrameNormalizer.normalize(dataFrame)\n",
" dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n",
" return dataFrame\n", " return dataFrame\n",
"\n", "\n",
"def getVaersDescrReader():\n", "def _getVaersDescrReader():\n",
" return VaersDescrReader(dataDir = \"VAERS\")\n", " return VaersDescrReader(dataDir = \"VAERS\")"
"\n",
"def getAllVaers():\n",
" return getVaers(lambda: getVaersDescrReader().readVaersDescrs([\"2021\", \"2022\"]))\n",
"\n",
"def getNonDomesticVaers():\n",
" return getVaers(lambda: [getVaersDescrReader().readNonDomesticVaersDescr()])\n",
"\n",
"def getInternationalVaers():\n",
" return pd.concat([getAllVaers(), getNonDomesticVaers()])\n",
"\n",
"def getVaersForYear(year):\n",
" return getVaers(lambda: [getVaersDescrReader().readVaersDescr(year)])"
] ]
}, },
{ {
@@ -1537,12 +1537,6 @@
"source": [ "source": [
"see https://www.bitchute.com/video/4HlIyBmOEJeY/ and https://www.bitchute.com/video/8wJYP2NpGwN2/" "see https://www.bitchute.com/video/4HlIyBmOEJeY/ and https://www.bitchute.com/video/8wJYP2NpGwN2/"
] ]
},
{
"cell_type": "markdown",
"id": "37ccbee6",
"metadata": {},
"source": []
} }
], ],
"metadata": { "metadata": {