Skip to content

Commit b1ae1f2

Browse files
ofranconofrancon
authored
Merge pull request #197 from leaf-ai/usvir
Manage United States Virgin Islands
2 parents 460a6d4 + 3da052c commit b1ae1f2

File tree

5 files changed

+378
-8
lines changed

5 files changed

+378
-8
lines changed

‎countries_regions.csv‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ United States,Tennessee
220220
United States,Texas
221221
United States,Utah
222222
United States,Vermont
223-
United States,Virgin Islands
224223
United States,Virginia
225224
United States,Washington
226225
United States,Washington DC

‎countries_regions_phase1_fix.csv‎

Lines changed: 237 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,237 @@
1+
CountryName,RegionName
2+
Afghanistan,
3+
Albania,
4+
Algeria,
5+
Andorra,
6+
Angola,
7+
Argentina,
8+
Aruba,
9+
Australia,
10+
Austria,
11+
Azerbaijan,
12+
Bahamas,
13+
Bahrain,
14+
Bangladesh,
15+
Barbados,
16+
Belarus,
17+
Belgium,
18+
Belize,
19+
Benin,
20+
Bermuda,
21+
Bhutan,
22+
Bolivia,
23+
Bosnia and Herzegovina,
24+
Botswana,
25+
Brazil,
26+
Brunei,
27+
Bulgaria,
28+
Burkina Faso,
29+
Burundi,
30+
Cambodia,
31+
Cameroon,
32+
Canada,
33+
Cape Verde,
34+
Central African Republic,
35+
Chad,
36+
Chile,
37+
China,
38+
Colombia,
39+
Comoros,
40+
Congo,
41+
Costa Rica,
42+
Cote d'Ivoire,
43+
Croatia,
44+
Cuba,
45+
Cyprus,
46+
Czech Republic,
47+
Democratic Republic of Congo,
48+
Denmark,
49+
Djibouti,
50+
Dominica,
51+
Dominican Republic,
52+
Ecuador,
53+
Egypt,
54+
El Salvador,
55+
Eritrea,
56+
Estonia,
57+
Eswatini,
58+
Ethiopia,
59+
Faeroe Islands,
60+
Fiji,
61+
Finland,
62+
France,
63+
Gabon,
64+
Gambia,
65+
Georgia,
66+
Germany,
67+
Ghana,
68+
Greece,
69+
Greenland,
70+
Guam,
71+
Guatemala,
72+
Guinea,
73+
Guyana,
74+
Haiti,
75+
Honduras,
76+
Hong Kong,
77+
Hungary,
78+
Iceland,
79+
India,
80+
Indonesia,
81+
Iran,
82+
Iraq,
83+
Ireland,
84+
Israel,
85+
Italy,
86+
Jamaica,
87+
Japan,
88+
Jordan,
89+
Kazakhstan,
90+
Kenya,
91+
Kosovo,
92+
Kuwait,
93+
Kyrgyz Republic,
94+
Laos,
95+
Latvia,
96+
Lebanon,
97+
Lesotho,
98+
Liberia,
99+
Libya,
100+
Lithuania,
101+
Luxembourg,
102+
Macao,
103+
Madagascar,
104+
Malawi,
105+
Malaysia,
106+
Mali,
107+
Mauritania,
108+
Mauritius,
109+
Mexico,
110+
Moldova,
111+
Monaco,
112+
Mongolia,
113+
Morocco,
114+
Mozambique,
115+
Myanmar,
116+
Namibia,
117+
Nepal,
118+
Netherlands,
119+
New Zealand,
120+
Nicaragua,
121+
Niger,
122+
Nigeria,
123+
Norway,
124+
Oman,
125+
Pakistan,
126+
Palestine,
127+
Panama,
128+
Papua New Guinea,
129+
Paraguay,
130+
Peru,
131+
Philippines,
132+
Poland,
133+
Portugal,
134+
Puerto Rico,
135+
Qatar,
136+
Romania,
137+
Russia,
138+
Rwanda,
139+
San Marino,
140+
Saudi Arabia,
141+
Senegal,
142+
Serbia,
143+
Seychelles,
144+
Sierra Leone,
145+
Singapore,
146+
Slovak Republic,
147+
Slovenia,
148+
Solomon Islands,
149+
Somalia,
150+
South Africa,
151+
South Korea,
152+
South Sudan,
153+
Spain,
154+
Sri Lanka,
155+
Sudan,
156+
Suriname,
157+
Sweden,
158+
Switzerland,
159+
Syria,
160+
Taiwan,
161+
Tajikistan,
162+
Tanzania,
163+
Thailand,
164+
Timor-Leste,
165+
Togo,
166+
Trinidad and Tobago,
167+
Tunisia,
168+
Turkey,
169+
Uganda,
170+
Ukraine,
171+
United Arab Emirates,
172+
United Kingdom,
173+
United Kingdom,England
174+
United Kingdom,Northern Ireland
175+
United Kingdom,Scotland
176+
United Kingdom,Wales
177+
United States,
178+
United States,Alabama
179+
United States,Alaska
180+
United States,Arizona
181+
United States,Arkansas
182+
United States,California
183+
United States,Colorado
184+
United States,Connecticut
185+
United States,Delaware
186+
United States,Florida
187+
United States,Georgia
188+
United States,Hawaii
189+
United States,Idaho
190+
United States,Illinois
191+
United States,Indiana
192+
United States,Iowa
193+
United States,Kansas
194+
United States,Kentucky
195+
United States,Louisiana
196+
United States,Maine
197+
United States,Maryland
198+
United States,Massachusetts
199+
United States,Michigan
200+
United States,Minnesota
201+
United States,Mississippi
202+
United States,Missouri
203+
United States,Montana
204+
United States,Nebraska
205+
United States,Nevada
206+
United States,New Hampshire
207+
United States,New Jersey
208+
United States,New Mexico
209+
United States,New York
210+
United States,North Carolina
211+
United States,North Dakota
212+
United States,Ohio
213+
United States,Oklahoma
214+
United States,Oregon
215+
United States,Pennsylvania
216+
United States,Rhode Island
217+
United States,South Carolina
218+
United States,South Dakota
219+
United States,Tennessee
220+
United States,Texas
221+
United States,Utah
222+
United States,Vermont
223+
United States,Virginia
224+
United States,Washington
225+
United States,Washington DC
226+
United States,West Virginia
227+
United States,Wisconsin
228+
United States,Wyoming
229+
United States Virgin Islands,
230+
Uruguay,
231+
Uzbekistan,
232+
Vanuatu,
233+
Venezuela,
234+
Vietnam,
235+
Yemen,
236+
Zambia,
237+
Zimbabwe,

‎covid_xprize/validation/scenario_generator.ipynb‎

Lines changed: 108 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"import pandas as pd\n",
1818
"\n",
1919
"from covid_xprize.scoring.predictor_scoring import load_dataset\n",
20-
"from covid_xprize.validation.scenario_generator import generate_scenario"
20+
"from covid_xprize.validation.scenario_generator import generate_scenario\n",
21+
"from covid_xprize.validation.scenario_generator import phase1_update"
2122
]
2223
},
2324
{
@@ -287,6 +288,19 @@
287288
"## Generate"
288289
]
289290
},
291+
{
292+
"cell_type": "code",
293+
"execution_count": null,
294+
"metadata": {},
295+
"outputs": [],
296+
"source": [
297+
"# Handle US Virgin Islands\n",
298+
"LATEST_DATA_URL = 'https://raw.githubusercontent.com/OxCGRT/covid-policy-tracker/master/data/OxCGRT_latest.csv'\n",
299+
"PHASE1_FILE = \"../../countries_regions_phase1_fix.csv\"\n",
300+
"latest_df = load_dataset(LATEST_DATA_URL, PHASE1_FILE)\n",
301+
"latest_df = phase1_update(latest_df)"
302+
]
303+
},
290304
{
291305
"cell_type": "code",
292306
"execution_count": null,
@@ -296,7 +310,6 @@
296310
"today = datetime.utcnow().strftime('%Y%m%d_%H%M%S')\n",
297311
"start_date_str = \"2020-12-22\"\n",
298312
"end_date_str = \"2021-06-19\"\n",
299-
"latest_df = load_dataset(LATEST_DATA_URL, GEO_FILE)\n",
300313
"countries = None\n",
301314
"scenario_df = generate_scenario(start_date_str, end_date_str, latest_df, countries, scenario=\"Freeze\")"
302315
]
@@ -346,13 +359,105 @@
346359
"outputs": [],
347360
"source": [
348361
"from datetime import datetime\n",
349-
"sd = 20200101 # IP file always contains data since inception\n",
362+
"sd = start_date_str.replace('-', \"\")\n",
350363
"ed = end_date_str.replace('-', \"\")\n",
351364
"december_file_name = f\"../../../covid-xprize-robotasks/ips/live/{today}_{sd}_{ed}_ips.csv\"\n",
352365
"scenario_df.to_csv(december_file_name, index=False)\n",
353366
"print(f\"Saved to {december_file_name}\")"
354367
]
355368
},
369+
{
370+
"cell_type": "markdown",
371+
"metadata": {},
372+
"source": [
373+
"# Prescriptions"
374+
]
375+
},
376+
{
377+
"cell_type": "markdown",
378+
"metadata": {},
379+
"source": [
380+
"## UK future test"
381+
]
382+
},
383+
{
384+
"cell_type": "code",
385+
"execution_count": null,
386+
"metadata": {},
387+
"outputs": [],
388+
"source": [
389+
"start_date_str = None\n",
390+
"end_date_str = \"2021-02-14\"\n",
391+
"latest_df = load_dataset(LATEST_DATA_URL, GEO_FILE)\n",
392+
"countries = [\"United Kingdom\"]\n",
393+
"scenario_df = generate_scenario(start_date_str, end_date_str, latest_df, countries, scenario=\"Freeze\")"
394+
]
395+
},
396+
{
397+
"cell_type": "code",
398+
"execution_count": null,
399+
"metadata": {},
400+
"outputs": [],
401+
"source": [
402+
"scenario_df.to_csv(\"/Users/m_754337/workspace/covid-xprize-robotasks/ips/prescriptions/uk_future_test_ips.csv\", index=False)"
403+
]
404+
},
405+
{
406+
"cell_type": "markdown",
407+
"metadata": {},
408+
"source": [
409+
"## All, past and future, test"
410+
]
411+
},
412+
{
413+
"cell_type": "code",
414+
"execution_count": null,
415+
"metadata": {},
416+
"outputs": [],
417+
"source": [
418+
"start_date_str = None\n",
419+
"end_date_str = \"2020-12-31\"\n",
420+
"latest_df = load_dataset(LATEST_DATA_URL, GEO_FILE)\n",
421+
"countries = None\n",
422+
"scenario_df = generate_scenario(start_date_str, end_date_str, latest_df, countries, scenario=\"Historical\")"
423+
]
424+
},
425+
{
426+
"cell_type": "code",
427+
"execution_count": null,
428+
"metadata": {},
429+
"outputs": [],
430+
"source": [
431+
"end_date = pd.to_datetime(end_date_str, format='%Y-%m-%d')"
432+
]
433+
},
434+
{
435+
"cell_type": "code",
436+
"execution_count": null,
437+
"metadata": {},
438+
"outputs": [],
439+
"source": [
440+
"scenario_df = scenario_df[scenario_df.Date <= end_date]"
441+
]
442+
},
443+
{
444+
"cell_type": "code",
445+
"execution_count": null,
446+
"metadata": {},
447+
"outputs": [],
448+
"source": [
449+
"scenario_df.Date.max()"
450+
]
451+
},
452+
{
453+
"cell_type": "code",
454+
"execution_count": null,
455+
"metadata": {},
456+
"outputs": [],
457+
"source": [
458+
"scenario_df.to_csv(\"/Users/m_754337/workspace/covid-xprize-robotasks/ips/prescriptions/all_2020_ips.csv\", index=False)"
459+
]
460+
},
356461
{
357462
"cell_type": "code",
358463
"execution_count": null,

0 commit comments

Comments
 (0)