refining InternationalLotAnalysisTest
This commit is contained in:
@@ -273,7 +273,7 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"cell_type": "code",
|
"cell_type": "code",
|
||||||
"execution_count": 29,
|
"execution_count": null,
|
||||||
"id": "41d4fa30",
|
"id": "41d4fa30",
|
||||||
"metadata": {},
|
"metadata": {},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
@@ -340,15 +340,15 @@
|
|||||||
" # FK-TODO: refactor\n",
|
" # FK-TODO: refactor\n",
|
||||||
" @staticmethod\n",
|
" @staticmethod\n",
|
||||||
" def _fun2(row):\n",
|
" def _fun2(row):\n",
|
||||||
|
" unknown = 'Unknown Country'\n",
|
||||||
" if isinstance(row['SPLTTYPE'], str):\n",
|
" if isinstance(row['SPLTTYPE'], str):\n",
|
||||||
" country = pycountry.countries.get(alpha_2 = row['SPLTTYPE'][:2])\n",
|
" country = pycountry.countries.get(alpha_2 = row['SPLTTYPE'][:2])\n",
|
||||||
" if country is None:\n",
|
" if country is None:\n",
|
||||||
" return 'NO-COUNTRY: ' + row['SPLTTYPE'][:2]\n",
|
" return unknown\n",
|
||||||
" else:\n",
|
" else:\n",
|
||||||
" return country.name\n",
|
" return country.name\n",
|
||||||
" else:\n",
|
" else:\n",
|
||||||
" # FK-TODO: add missing InternationalLotAnalysisTests for this else branch\n",
|
" return unknown\n"
|
||||||
" return 'NO-COUNTRY: ' + str(row['SPLTTYPE'])\n"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -798,11 +798,15 @@
|
|||||||
" columns = ['DIED', 'L_THREAT', 'DISABLE', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT', 'VAX_DOSE_SERIES', 'SPLTTYPE'],\n",
|
" columns = ['DIED', 'L_THREAT', 'DISABLE', 'VAX_TYPE', 'VAX_MANU', 'VAX_LOT', 'VAX_DOSE_SERIES', 'SPLTTYPE'],\n",
|
||||||
" data = [ [1, 0, 0, 'COVID19', 'MODERNA', '016M20A', '2', 'GBPFIZER INC2020486806'],\n",
|
" data = [ [1, 0, 0, 'COVID19', 'MODERNA', '016M20A', '2', 'GBPFIZER INC2020486806'],\n",
|
||||||
" [1, 0, 0, 'COVID19', 'MODERNA', '030L20A', '1', 'FRMODERNATX, INC.MOD20224'],\n",
|
" [1, 0, 0, 'COVID19', 'MODERNA', '030L20A', '1', 'FRMODERNATX, INC.MOD20224'],\n",
|
||||||
" [1, 1, 1, 'COVID19', 'MODERNA', '030L20B', '1', 'FRMODERNATX, INC.MOD20224']],\n",
|
" [1, 1, 1, 'COVID19', 'MODERNA', '030L20B', '1', 'FRMODERNATX, INC.MOD20224'],\n",
|
||||||
|
" [0, 0, 0, 'COVID19', 'MODERNA', '030L20B', '1', 'dummy'],\n",
|
||||||
|
" [0, 0, 0, 'COVID19', 'MODERNA', '030L20B', '1', 123]],\n",
|
||||||
" index = [\n",
|
" index = [\n",
|
||||||
" \"1048786\",\n",
|
" \"1048786\",\n",
|
||||||
" \"1048786\",\n",
|
" \"1048786\",\n",
|
||||||
" \"4711\"])\n",
|
" \"4711\",\n",
|
||||||
|
" \"0815\",\n",
|
||||||
|
" \"0816\"])\n",
|
||||||
" \n",
|
" \n",
|
||||||
" # When\n",
|
" # When\n",
|
||||||
" internationalLotTable = InternationalLotAnalysis.getInternationalLotTable(dataFrame)\n",
|
" internationalLotTable = InternationalLotAnalysis.getInternationalLotTable(dataFrame)\n",
|
||||||
@@ -813,12 +817,13 @@
|
|||||||
" self.createDataFrame(\n",
|
" self.createDataFrame(\n",
|
||||||
" columns = ['Total reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Severe reports (%)'],\n",
|
" columns = ['Total reports', 'Deaths', 'Disabilities', 'Life Threatening Illnesses', 'Severe reports (%)'],\n",
|
||||||
" data = [ [2, 2, 1, 1, (2 + 1 + 1) / 2 * 100],\n",
|
" data = [ [2, 2, 1, 1, (2 + 1 + 1) / 2 * 100],\n",
|
||||||
" [1, 1, 0, 0, (1 + 0 + 0) / 1 * 100]],\n",
|
" [1, 1, 0, 0, (1 + 0 + 0) / 1 * 100],\n",
|
||||||
|
" [2, 0, 0, 0, (0 + 0 + 0) / 2 * 100]],\n",
|
||||||
" index = pd.Index(\n",
|
" index = pd.Index(\n",
|
||||||
" [\n",
|
" [\n",
|
||||||
" 'France',\n",
|
" 'France',\n",
|
||||||
" 'United Kingdom'\n",
|
" 'United Kingdom',\n",
|
||||||
" \n",
|
" 'Unknown Country'\n",
|
||||||
" ],\n",
|
" ],\n",
|
||||||
" name = 'Country')))\n",
|
" name = 'Country')))\n",
|
||||||
"\n",
|
"\n",
|
||||||
|
|||||||
Reference in New Issue
Block a user