diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb index 18515fda151..0c5418b0b62 100644 --- a/src/HowBadIsMyBatch.ipynb +++ b/src/HowBadIsMyBatch.ipynb @@ -12,6 +12,7 @@ "pd.set_option('display.max_rows', 100)\n", "pd.set_option('display.max_columns', None)\n", "\n", + "import os\n", "from VAERSFileDownloader import updateVAERSFiles\n", "from datetime import datetime\n", "from DateProvider import DateProvider\n", @@ -26,7 +27,7 @@ "metadata": {}, "outputs": [], "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)" ] }, - { - "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", "execution_count": null, @@ -83,7 +54,7 @@ "updateVAERSFiles(\n", " needsUpdate = needsUpdate,\n", " years = [2022],\n", - " workingDirectory = getWorkingDirectory())" + " workingDirectory = os.getcwd())" ] }, { diff --git a/src/InternationalVaersCovid19Provider.py b/src/InternationalVaersCovid19Provider.py index 79e1897cbce..9d18ac0b5aa 100644 --- a/src/InternationalVaersCovid19Provider.py +++ b/src/InternationalVaersCovid19Provider.py @@ -1,8 +1,13 @@ from DataFrameFilter import DataFrameFilter -from VaersReader import getVaersForYears, getNonDomesticVaers +import VaersReader import pandas as pd + def getInternationalVaersCovid19(years): - internationalVaers = pd.concat([getVaersForYears(years), getNonDomesticVaers()]) + internationalVaers = pd.concat( + [ + VaersReader.getVaersForYears(years), + VaersReader.getNonDomesticVaers() + ]) internationalVaersCovid19 = DataFrameFilter().filterByCovid19(internationalVaers) - return internationalVaersCovid19 \ No newline at end of file + return internationalVaersCovid19