From 5ee95607887f3de0fe2255e484dba9e3092d9c2e Mon Sep 17 00:00:00 2001
From: Romain Ragonnet <romain.ragonnet@monash.edu>
Date: Wed, 26 Jul 2023 11:10:45 +1000
Subject: [PATCH] New list of countries after fixing GIDAIS issue

---
 .../common_school/included_countries.yml      | 27 +++++++++++++++++++
 .../school-closure/serodata_national.csv      |  4 +--
 .../School_Closure/country_inclusion.ipynb    | 11 ++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/autumn/projects/sm_covid2/common_school/included_countries.yml b/autumn/projects/sm_covid2/common_school/included_countries.yml
index f066b6082..ee81fc583 100644
--- a/autumn/projects/sm_covid2/common_school/included_countries.yml
+++ b/autumn/projects/sm_covid2/common_school/included_countries.yml
@@ -18,17 +18,22 @@ all:
   CHL: Chile
   CHN: China
   CMR: Cameroon
+  COD: Congo, The Democratic Republic of the
   COL: Colombia
   CRI: Costa Rica
   CZE: Czechia
+  DEU: Germany
   DNK: Denmark
   DOM: Dominican Republic
+  DZA: Algeria
   ECU: Ecuador
+  EGY: Egypt
   ESP: Spain
   EST: Estonia
   ETH: Ethiopia
   FIN: Finland
   FRA: France
+  GBR: United Kingdom
   GEO: Georgia
   GHA: Ghana
   GRC: Greece
@@ -37,6 +42,8 @@ all:
   HND: Honduras
   HRV: Croatia
   HUN: Hungary
+  IDN: Indonesia
+  IND: India
   IRL: Ireland
   IRN: Iran, Islamic Republic of
   IRQ: Iraq
@@ -57,6 +64,7 @@ all:
   LVA: Latvia
   MAR: Morocco
   MDA: Moldova, Republic of
+  MEX: Mexico
   MKD: North Macedonia
   MMR: Myanmar
   MNE: Montenegro
@@ -81,7 +89,9 @@ all:
   PRY: Paraguay
   ROU: Romania
   RUS: Russian Federation
+  RWA: Rwanda
   SAU: Saudi Arabia
+  SEN: Senegal
   SGP: Singapore
   SLV: El Salvador
   SRB: Serbia
@@ -93,10 +103,12 @@ all:
   SYR: Syrian Arab Republic
   THA: Thailand
   TTO: Trinidad and Tobago
+  TUN: Tunisia
   TUR: Turkey
   UGA: Uganda
   UKR: Ukraine
   URY: Uruguay
+  USA: United States
   VEN: Venezuela, Bolivarian Republic of
   VNM: Viet Nam
   ZAF: South Africa
@@ -121,13 +133,16 @@ google_mobility:
   COL: Colombia
   CRI: Costa Rica
   CZE: Czechia
+  DEU: Germany
   DNK: Denmark
   DOM: Dominican Republic
   ECU: Ecuador
+  EGY: Egypt
   ESP: Spain
   EST: Estonia
   FIN: Finland
   FRA: France
+  GBR: United Kingdom
   GEO: Georgia
   GHA: Ghana
   GRC: Greece
@@ -135,6 +150,8 @@ google_mobility:
   HND: Honduras
   HRV: Croatia
   HUN: Hungary
+  IDN: Indonesia
+  IND: India
   IRL: Ireland
   IRQ: Iraq
   ISR: Israel
@@ -154,6 +171,7 @@ google_mobility:
   LVA: Latvia
   MAR: Morocco
   MDA: Moldova, Republic of
+  MEX: Mexico
   MKD: North Macedonia
   MMR: Myanmar
   MNG: Mongolia
@@ -175,7 +193,9 @@ google_mobility:
   PRY: Paraguay
   ROU: Romania
   RUS: Russian Federation
+  RWA: Rwanda
   SAU: Saudi Arabia
+  SEN: Senegal
   SGP: Singapore
   SLV: El Salvador
   SRB: Serbia
@@ -188,6 +208,7 @@ google_mobility:
   UGA: Uganda
   UKR: Ukraine
   URY: Uruguay
+  USA: United States
   VEN: Venezuela, Bolivarian Republic of
   VNM: Viet Nam
   ZAF: South Africa
@@ -202,15 +223,18 @@ national_sero:
   CHL: Chile
   COL: Colombia
   CZE: Czechia
+  DEU: Germany
   DNK: Denmark
   ECU: Ecuador
   ESP: Spain
   EST: Estonia
   ETH: Ethiopia
   FRA: France
+  GBR: United Kingdom
   HND: Honduras
   HRV: Croatia
   HUN: Hungary
+  IND: India
   IRN: Iran, Islamic Republic of
   ISR: Israel
   ITA: Italy
@@ -220,6 +244,7 @@ national_sero:
   KOR: Korea, Republic of
   LBN: Lebanon
   LTU: Lithuania
+  MEX: Mexico
   MNG: Mongolia
   MWI: Malawi
   NOR: Norway
@@ -227,8 +252,10 @@ national_sero:
   OMN: Oman
   PAK: Pakistan
   PRT: Portugal
+  SEN: Senegal
   SGP: Singapore
   SVN: Slovenia
   SWE: Sweden
+  USA: United States
   ZAF: South Africa
   ZMB: Zambia
diff --git a/data/inputs/school-closure/serodata_national.csv b/data/inputs/school-closure/serodata_national.csv
index 6c26b2ba6..781ae8655 100644
--- a/data/inputs/school-closure/serodata_national.csv
+++ b/data/inputs/school-closure/serodata_national.csv
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22c0133e75c2844096275d75802462a1c646422a7be502d63570892ec3a0346e
-size 46203
+oid sha256:a1112666022f6d5bde7a5bf3527121c4997ce6f44234041e3b303408a7889fb7
+size 52909
diff --git a/notebooks/user/rragonnet/project_specific/School_Closure/country_inclusion.ipynb b/notebooks/user/rragonnet/project_specific/School_Closure/country_inclusion.ipynb
index 76c503162..0691895b4 100644
--- a/notebooks/user/rragonnet/project_specific/School_Closure/country_inclusion.ipynb
+++ b/notebooks/user/rragonnet/project_specific/School_Closure/country_inclusion.ipynb
@@ -95,6 +95,17 @@
     "print(len(pop_iso3s))"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "_list = pop_iso3s\n",
+    "print(\"GBR\" in _list)\n",
+    "print(\"USA\" in _list)"
+   ]
+  },
   {
    "attachments": {},
    "cell_type": "markdown",