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-07 11:47:09 +01:00
parent 84ac866c3f
commit 1501797249
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
HowBadIsMyBatch.ipynb
View File

@@ -333,22 +333,31 @@
" @staticmethod\n", " @staticmethod\n",
" def getInternationalLotTable(dataFrame):\n", " def getInternationalLotTable(dataFrame):\n",
" dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n", " dataFrame = DataFrameFilter().filterByCovid19(dataFrame)\n",
" dataFrame['Country'] = dataFrame.apply(InternationalLotAnalysis._fun2, axis = 'columns')\n", " internationalLotTable = InternationalLotAnalysis._getInternationalLotTable(dataFrame)\n",
" result = DoseAnalysis._getDoseTable(dataFrame.groupby(dataFrame['Country']))\n", " return internationalLotTable.sort_values(by = 'Severe reports (%)', ascending = False)\n",
" return result.sort_values(by = 'Severe reports (%)', ascending = False)\n",
"\n", "\n",
" # FK-TODO: refactor\n",
" @staticmethod\n", " @staticmethod\n",
" def _fun2(row):\n", " def _getInternationalLotTable(dataFrame):\n",
" unknown = 'Unknown Country'\n", " countryColumnName = 'Country'\n",
" if isinstance(row['SPLTTYPE'], str):\n", " InternationalLotAnalysis._addCountryColumn(dataFrame, countryColumnName = countryColumnName)\n",
" country = pycountry.countries.get(alpha_2 = row['SPLTTYPE'][:2])\n", " return DoseAnalysis._getDoseTable(dataFrame.groupby(dataFrame[countryColumnName]))\n",
" if country is None:\n", "\n",
" return unknown\n", " @staticmethod\n",
" else:\n", " def _addCountryColumn(dataFrame, countryColumnName):\n",
" return country.name\n", " dataFrame[countryColumnName] = dataFrame.apply(\n",
" else:\n", " lambda row:\n",
" return unknown\n" " InternationalLotAnalysis._getCountryNameOfSplttypeOrDefault(\n",
" splttype = row['SPLTTYPE'],\n",
" default = 'Unknown Country'),\n",
" axis = 'columns')\n",
"\n",
" @staticmethod\n",
" def _getCountryNameOfSplttypeOrDefault(splttype, default):\n",
" if not isinstance(splttype, str):\n",
" return default\n",
" \n",
" country = pycountry.countries.get(alpha_2 = splttype[:2])\n",
" return country.name if country is not None else default\n"
] ]
}, },
{ {