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-11-22 20:59:52 +01:00
parent 54a9ca52de
commit 22c41e64a7
2 changed files with 11 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/HowBadIsMyBatch.ipynb
View File

@@ -12,6 +12,7 @@
"pd.set_option('display.max_rows', 100)\n", "pd.set_option('display.max_rows', 100)\n",
"pd.set_option('display.max_columns', None)\n", "pd.set_option('display.max_columns', None)\n",
"\n", "\n",
"import os\n",
"from VAERSFileDownloader import updateVAERSFiles\n", "from VAERSFileDownloader import updateVAERSFiles\n",
"from datetime import datetime\n", "from datetime import datetime\n",
"from DateProvider import DateProvider\n", "from DateProvider import DateProvider\n",
@@ -26,7 +27,7 @@
"metadata": {}, "metadata": {},
"outputs": [], "outputs": [],
"source": [ "source": [
"print(datetime.now().strftime(\"%d.%m.%Y, %H:%M:%S Uhr\"))\n" "print(datetime.now().strftime(\"%d.%m.%Y, %H:%M:%S Uhr\"))"
] ]
}, },
{ {
@@ -43,36 +44,6 @@
"print('needsUpdate:', needsUpdate)" "print('needsUpdate:', needsUpdate)"
] ]
}, },
{
"cell_type": "code",
"execution_count": null,
"id": "e673b947",
"metadata": {},
"outputs": [],
"source": [
"def getWorkingDirectory():\n",
" pwd = ! \"pwd\"\n",
" return pwd[0]"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "e313a06c",
"metadata": {},
"outputs": [],
"source": [
"getWorkingDirectory()"
]
},
{
"cell_type": "markdown",
"id": "9514f5be",
"metadata": {},
"source": [
"## Download VAERS-Data"
]
},
{ {
"cell_type": "code", "cell_type": "code",
"execution_count": null, "execution_count": null,
@@ -83,7 +54,7 @@
"updateVAERSFiles(\n", "updateVAERSFiles(\n",
" needsUpdate = needsUpdate,\n", " needsUpdate = needsUpdate,\n",
" years = [2022],\n", " years = [2022],\n",
" workingDirectory = getWorkingDirectory())" " workingDirectory = os.getcwd())"
] ]
}, },
{ {

9
src/InternationalVaersCovid19Provider.py
View File

@@ -1,8 +1,13 @@
from DataFrameFilter import DataFrameFilter from DataFrameFilter import DataFrameFilter
from VaersReader import getVaersForYears, getNonDomesticVaers import VaersReader
import pandas as pd import pandas as pd
def getInternationalVaersCovid19(years): def getInternationalVaersCovid19(years):
internationalVaers = pd.concat([getVaersForYears(years), getNonDomesticVaers()]) internationalVaers = pd.concat(
[
VaersReader.getVaersForYears(years),
VaersReader.getNonDomesticVaers()
])
internationalVaersCovid19 = DataFrameFilter().filterByCovid19(internationalVaers) internationalVaersCovid19 = DataFrameFilter().filterByCovid19(internationalVaers)
return internationalVaersCovid19 return internationalVaersCovid19