From 99aebe4f66b76936ce27804930df6b6e1258320a Mon Sep 17 00:00:00 2001 From: frankknoll Date: Tue, 22 Nov 2022 13:29:01 +0100 Subject: [PATCH] refactoring --- src/AndroidEmulator.py | 30 ++++++++++ src/HowBadIsMyBatch.ipynb | 113 +------------------------------------- src/VaersReader.py | 29 ++++++++++ 3 files changed, 60 insertions(+), 112 deletions(-) create mode 100644 src/AndroidEmulator.py create mode 100644 src/VaersReader.py diff --git a/src/AndroidEmulator.py b/src/AndroidEmulator.py new file mode 100644 index 00000000000..364b445261e --- /dev/null +++ b/src/AndroidEmulator.py @@ -0,0 +1,30 @@ +import os +import time + +class AndroidEmulator: + + @staticmethod + def run(runnable): + AndroidEmulator._start() + result = runnable() + AndroidEmulator._stop() + return result + + @staticmethod + def _start(): + os.system("/home/frankknoll/Android/Sdk/emulator/emulator -avd Pixel_2_API_30 -no-window &") + AndroidEmulator._waitUntilStarted() + + @staticmethod + def _waitUntilStarted(): + while not AndroidEmulator._isStarted(): + time.sleep(1) + + @staticmethod + def _isStarted(): + boot_completed = ! adb shell getprop sys.boot_completed + return boot_completed[0] == '1' + + @staticmethod + def _stop(): + ! adb emu kill \ No newline at end of file diff --git a/src/HowBadIsMyBatch.ipynb b/src/HowBadIsMyBatch.ipynb index 6c39eada496..bbd7a87090a 100644 --- a/src/HowBadIsMyBatch.ipynb +++ b/src/HowBadIsMyBatch.ipynb @@ -81,45 +81,6 @@ "## Download VAERS-Data" ] }, - { - "cell_type": "code", - "execution_count": null, - "id": "8f0bfb9c", - "metadata": {}, - "outputs": [], - "source": [ - "import os\n", - "import time\n", - "\n", - "class AndroidEmulator:\n", - " \n", - " @staticmethod\n", - " def run(runnable):\n", - " AndroidEmulator._start()\n", - " result = runnable()\n", - " AndroidEmulator._stop()\n", - " return result\n", - " \n", - " @staticmethod\n", - " def _start():\n", - " os.system(\"/home/frankknoll/Android/Sdk/emulator/emulator -avd Pixel_2_API_30 -no-window &\")\n", - " AndroidEmulator._waitUntilStarted()\n", - " \n", - " @staticmethod\n", - " def _waitUntilStarted():\n", - " while not AndroidEmulator._isStarted():\n", - " time.sleep(1)\n", - "\n", - " @staticmethod\n", - " def _isStarted():\n", - " boot_completed = ! adb shell getprop sys.boot_completed\n", - " return boot_completed[0] == '1'\n", - "\n", - " @staticmethod\n", - " def _stop():\n", - " ! adb emu kill" - ] - }, { "cell_type": "code", "execution_count": null, @@ -149,36 +110,6 @@ " downloadVAERSFileAndUnzip('NonDomesticVAERSData.zip')" ] }, - { - "cell_type": "code", - "execution_count": null, - "id": "a271254b", - "metadata": {}, - "outputs": [], - "source": [ - "from VaersDescrReader import VaersDescrReader\n" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "7b5d6df0", - "metadata": {}, - "outputs": [], - "source": [ - "from VaersDescr2DataFrameConverter import VaersDescr2DataFrameConverter" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "6b639196", - "metadata": {}, - "outputs": [], - "source": [ - "from DataFrameNormalizer import DataFrameNormalizer" - ] - }, { "cell_type": "code", "execution_count": null, @@ -189,26 +120,6 @@ "from DataFrameFilter import DataFrameFilter" ] }, - { - "cell_type": "code", - "execution_count": null, - "id": "c40bd0f0", - "metadata": {}, - "outputs": [], - "source": [ - "from CountryColumnAdder import CountryColumnAdder" - ] - }, - { - "cell_type": "code", - "execution_count": null, - "id": "3abe3384", - "metadata": {}, - "outputs": [], - "source": [ - "from SevereColumnAdder import SevereColumnAdder" - ] - }, { "cell_type": "code", "execution_count": null, @@ -293,29 +204,7 @@ "metadata": {}, "outputs": [], "source": [ - "def getVaersForYears(years):\n", - " def addCountryColumn(dataFrame):\n", - " dataFrame['COUNTRY'] = 'United States'\n", - " return dataFrame\n", - "\n", - " return _getVaers(\n", - " _getVaersDescrReader().readVaersDescrsForYears(years),\n", - " addCountryColumn)\n", - "\n", - "def getNonDomesticVaers():\n", - " return _getVaers(\n", - " [_getVaersDescrReader().readNonDomesticVaersDescr()],\n", - " CountryColumnAdder.addCountryColumn)\n", - "\n", - "def _getVaersDescrReader():\n", - " return VaersDescrReader(dataDir = \"VAERS\")\n", - "\n", - "def _getVaers(vaersDescrs, addCountryColumn):\n", - " dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs)\n", - " dataFrame = addCountryColumn(dataFrame)\n", - " DataFrameNormalizer.normalize(dataFrame)\n", - " dataFrame = SevereColumnAdder.addSevereColumn(dataFrame)\n", - " return dataFrame" + "from VaersReader import getVaersForYears, getNonDomesticVaers" ] }, { diff --git a/src/VaersReader.py b/src/VaersReader.py new file mode 100644 index 00000000000..8db1d380c75 --- /dev/null +++ b/src/VaersReader.py @@ -0,0 +1,29 @@ +from CountryColumnAdder import CountryColumnAdder +from VaersDescrReader import VaersDescrReader +from VaersDescr2DataFrameConverter import VaersDescr2DataFrameConverter +from DataFrameNormalizer import DataFrameNormalizer +from SevereColumnAdder import SevereColumnAdder + +def getVaersForYears(years): + def addCountryColumn(dataFrame): + dataFrame['COUNTRY'] = 'United States' + return dataFrame + + return _getVaers( + _getVaersDescrReader().readVaersDescrsForYears(years), + addCountryColumn) + +def getNonDomesticVaers(): + return _getVaers( + [_getVaersDescrReader().readNonDomesticVaersDescr()], + CountryColumnAdder.addCountryColumn) + +def _getVaersDescrReader(): + return VaersDescrReader(dataDir = "VAERS") + +def _getVaers(vaersDescrs, addCountryColumn): + dataFrame = VaersDescr2DataFrameConverter.createDataFrameFromDescrs(vaersDescrs) + dataFrame = addCountryColumn(dataFrame) + DataFrameNormalizer.normalize(dataFrame) + dataFrame = SevereColumnAdder.addSevereColumn(dataFrame) + return dataFrame \ No newline at end of file