refactoring

src/HowBadIsMyBatch.ipynb

@@ -439,8 +439,8 @@
    "outputs": [],
    "source": [
     "from SymptomsCausedByVaccines.HtmlUpdater import updateHtmlFile\n",
-    "from SymptomsCausedByVaccines.PrrByVaccineBySymptomFactory import PrrByVaccineBySymptomFactory\n",
-    "from SymptomsCausedByVaccines.PrrByVaccineBySymptomTransformer import PrrByVaccineBySymptomTransformer\n",
+    "from src.SymptomsCausedByVaccines.PrrSeriesFactory import PrrSeriesFactory\n",
+    "from src.SymptomsCausedByVaccines.PrrSeriesTransformer import PrrSeriesTransformer\n",
     "from SymptomsCausedByVaccines.ProportionalReportingRatiosPersister import saveProportionalReportingRatios\n",
     "import os\n",
     "import pandas as pd"
@@ -467,10 +467,21 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "prrByVaccineBySymptom = PrrByVaccineBySymptomFactory.getPrrByVaccineBySymptom(prrByVaccineAndSymptom)\n",
+    "prrByVaccineBySymptom = PrrSeriesFactory.getPrrByVaccineBySymptom(prrByVaccineAndSymptom)\n",
     "prrByVaccineBySymptom"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "0f247c64",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "prrBySymptomByVaccine = PrrSeriesFactory.getPrrBySymptomByVaccine(prrByVaccineAndSymptom)\n",
+    "prrBySymptomByVaccine"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -478,10 +489,21 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "prrByVaccineBySymptomWithoutZeroPrrs = PrrByVaccineBySymptomTransformer.removeNonZeroPrrs(prrByVaccineBySymptom)\n",
+    "prrByVaccineBySymptomWithoutZeroPrrs = PrrSeriesTransformer.filterByNonZeroPrrs(prrByVaccineBySymptom)\n",
     "prrByVaccineBySymptomWithoutZeroPrrs"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "f07203e4",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "prrBySymptomByVaccineWithHighPrrs = PrrSeriesTransformer.filterByHighPrrs(prrBySymptomByVaccine)\n",
+    "prrBySymptomByVaccineWithHighPrrs"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -491,7 +513,19 @@
    "source": [
     "saveProportionalReportingRatios(\n",
     "    prrByVaccineBySymptomWithoutZeroPrrs,\n",
-    "    directory = os.path.normpath(os.getcwd() + '/../docs/data/ProportionalReportingRatios/'))"
+    "    directory = os.path.normpath(os.getcwd() + '/../docs/data/ProportionalReportingRatios/symptoms'))"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "fac4b34f",
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "saveProportionalReportingRatios(\n",
+    "    prrBySymptomByVaccineWithHighPrrs,\n",
+    "    directory = os.path.normpath(os.getcwd() + '/../docs/data/ProportionalReportingRatios/vaccines'))"
    ]
   },
   {