diff --git a/data/country_groups.csv b/data/country_groups.csv
new file mode 100644
index 0000000000000000000000000000000000000000..09a1a752bbec5426314ce3c2d40041335662409a
--- /dev/null
+++ b/data/country_groups.csv
@@ -0,0 +1,194 @@
+Country,population,Region,IncomeGroup,PlumGroup
+New Zealand,4.3507,East Asia & Pacific,High income: OECD,Australia & NZ
+Australia,22.03175,East Asia & Pacific,High income: OECD,Australia & NZ
+New Caledonia,,East Asia & Pacific,,Australia & NZ
+China,1337.705,East Asia & Pacific,Upper middle income,China
+Tuvalu,0.009827,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Palau,0.02047,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Marshall Islands,0.052428,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Kiribati,0.102648,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Micronesia (Federated States of),0.103619,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Tonga,0.103947,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Samoa,0.186029,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Vanuatu,0.236299,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Brunei Darussalam,0.393302,East Asia & Pacific,High income: nonOECD,East Asia & Pacific_other
+Solomon Islands,0.526177,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Macau,0.534626,East Asia & Pacific,High income: nonOECD,East Asia & Pacific_other
+Fiji,0.859952,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Lao People's Democratic Republic,6.260544,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Papua New Guinea,6.847517,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+French Polynesia,,East Asia & Pacific,,East Asia & Pacific_other
+Democratic People's Republic of Korea,,East Asia & Pacific,,East Asia & Pacific_other
+Indonesia,241.613126,East Asia & Pacific,Lower middle income,Indonesia
+Japan,128.07,East Asia & Pacific,High income: OECD,Japan
+Mongolia,2.712657,East Asia & Pacific,Lower middle income,Mongolia
+Myanmar,51.733013,East Asia & Pacific,Low income,Myanmar
+Singapore,5.076732,East Asia & Pacific,High income: nonOECD,Philippines & Malaysia
+Malaysia,28.1195,East Asia & Pacific,Upper middle income,Philippines & Malaysia
+Philippines,93.038902,East Asia & Pacific,Lower middle income,Philippines & Malaysia
+Republic of Korea,49.410366,East Asia & Pacific,High income: OECD,Republic of Korea
+Thailand,66.692024,East Asia & Pacific,Upper middle income,Thailand
+Cambodia,14.363586,East Asia & Pacific,Low income,Viet Nam & Cambodia
+Viet Nam,86.9325,East Asia & Pacific,Lower middle income,Viet Nam & Cambodia
+Albania,2.913021,Europe & Central Asia,Upper middle income,Eastern Europe
+Armenia,2.963496,Europe & Central Asia,Lower middle income,Eastern Europe
+Slovakia,5.391428,Europe & Central Asia,High income: OECD,Eastern Europe
+Serbia,7.291436,Europe & Central Asia,Upper middle income,Eastern Europe
+Bulgaria,7.395599,Europe & Central Asia,Upper middle income,Eastern Europe
+Hungary,10.000023,Europe & Central Asia,Upper middle income,Eastern Europe
+Czech Republic,10.47441,Europe & Central Asia,High income: OECD,Eastern Europe
+Romania,20.246871,Europe & Central Asia,Upper middle income,Eastern Europe
+Montenegro,0.619428,Europe & Central Asia,Upper middle income,ex-Yugoslavia
+Kosovo,1.77568,Europe & Central Asia,Lower middle income,ex-Yugoslavia
+Slovenia,2.048583,Europe & Central Asia,High income: OECD,ex-Yugoslavia
+The former Yugoslav Republic of Macedonia,2.062443,Europe & Central Asia,Upper middle income,ex-Yugoslavia
+Republic of Moldova,3.562045,Europe & Central Asia,Lower middle income,ex-Yugoslavia
+Bosnia and Herzegovina,3.835258,Europe & Central Asia,Upper middle income,ex-Yugoslavia
+Croatia,4.417781,Europe & Central Asia,High income: nonOECD,ex-Yugoslavia
+Luxembourg,0.506953,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Ireland,4.560155,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Belgium,10.895586,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Netherlands,16.615394,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+France,65.027512,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Switzerland,7.824909,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
+Austria,8.363404,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
+Germany,81.77693,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
+Italy,59.277417,Europe & Central Asia,High income: OECD,Italy
+Estonia,1.331475,Europe & Central Asia,High income: OECD,Other former USSR
+Latvia,2.097555,Europe & Central Asia,High income: nonOECD,Other former USSR
+Lithuania,3.097282,Europe & Central Asia,High income: nonOECD,Other former USSR
+Georgia,3.926,Europe & Central Asia,Lower middle income,Other former USSR
+Turkmenistan,5.041995,Europe & Central Asia,Upper middle income,Other former USSR
+Kyrgyzstan,5.4479,Europe & Central Asia,Low income,Other former USSR
+Tajikistan,7.581696,Europe & Central Asia,Low income,Other former USSR
+Azerbaijan,9.054332,Europe & Central Asia,Upper middle income,Other former USSR
+Belarus,9.49,Europe & Central Asia,Upper middle income,Other former USSR
+Kazakhstan,16.321581,Europe & Central Asia,Upper middle income,Other former USSR
+Uzbekistan,28.5624,Europe & Central Asia,Lower middle income,Other former USSR
+Poland,38.042794,Europe & Central Asia,High income: OECD,Poland
+Russian Federation,142.849449,Europe & Central Asia,High income: nonOECD,Russian Federation
+Greenland,0.056905,Europe & Central Asia,High income: nonOECD,Scandinavia
+Iceland,0.318041,Europe & Central Asia,High income: OECD,Scandinavia
+Norway,4.889252,Europe & Central Asia,High income: OECD,Scandinavia
+Finland,5.363352,Europe & Central Asia,High income: OECD,Scandinavia
+Denmark,5.547683,Europe & Central Asia,High income: OECD,Scandinavia
+Sweden,9.378126,Europe & Central Asia,High income: OECD,Scandinavia
+Portugal,10.5731,Europe & Central Asia,High income: OECD,Spain & Portugal
+Spain,46.576897,Europe & Central Asia,High income: OECD,Spain & Portugal
+Cyprus,1.103685,Europe & Central Asia,High income: nonOECD,Turkey Cyprus & Greece
+Greece,11.121341,Europe & Central Asia,High income: OECD,Turkey Cyprus & Greece
+Turkey,72.310416,Europe & Central Asia,Upper middle income,Turkey Cyprus & Greece
+Ukraine,45.8707,Europe & Central Asia,Lower middle income,Ukraine
+United Kingdom,62.766365,Europe & Central Asia,High income: OECD,United Kingdom
+Argentina,41.222875,Latin America & Caribbean,Upper middle income,Argentina
+Bolivia (Plurinational State of),9.918245,Latin America & Caribbean,Lower middle income,Bolivia and Chile
+Chile,17.015048,Latin America & Caribbean,High income: OECD,Bolivia and Chile
+Brazil,198.614208,Latin America & Caribbean,Upper middle income,Brazil
+Saint Kitts and Nevis,0.052352,Latin America & Caribbean,High income: nonOECD,Caribbean
+Dominica,0.071167,Latin America & Caribbean,Upper middle income,Caribbean
+Antigua and Barbuda,0.087233,Latin America & Caribbean,High income: nonOECD,Caribbean
+Aruba,0.101597,Latin America & Caribbean,High income: nonOECD,Caribbean
+Grenada,0.104677,Latin America & Caribbean,Upper middle income,Caribbean
+Saint Vincent and the Grenadines,0.109316,Latin America & Caribbean,Upper middle income,Caribbean
+Saint Lucia,0.177397,Latin America & Caribbean,Upper middle income,Caribbean
+Barbados,0.279566,Latin America & Caribbean,High income: nonOECD,Caribbean
+Bahamas,0.36083,Latin America & Caribbean,High income: nonOECD,Caribbean
+Trinidad and Tobago,1.328095,Latin America & Caribbean,High income: nonOECD,Caribbean
+Jamaica,2.690824,Latin America & Caribbean,Upper middle income,Caribbean
+Puerto Rico,3.721526,Latin America & Caribbean,High income: nonOECD,Caribbean
+Dominican Republic,9.897983,Latin America & Caribbean,Upper middle income,Caribbean
+Haiti,9.999617,Latin America & Caribbean,Low income,Caribbean
+Cuba,11.308133,Latin America & Caribbean,Upper middle income,Caribbean
+Bermuda,,Latin America & Caribbean,,Caribbean
+Belize,0.321609,Latin America & Caribbean,Upper middle income,Central America
+Panama,3.620506,Latin America & Caribbean,Upper middle income,Central America
+Costa Rica,4.545273,Latin America & Caribbean,Upper middle income,Central America
+Nicaragua,5.737722,Latin America & Caribbean,Lower middle income,Central America
+El Salvador,6.038306,Latin America & Caribbean,Lower middle income,Central America
+Honduras,7.503875,Latin America & Caribbean,Lower middle income,Central America
+Guatemala,14.732261,Latin America & Caribbean,Lower middle income,Central America
+Colombia,45.918101,Latin America & Caribbean,Upper middle income,Colombia
+Mexico,118.617542,Latin America & Caribbean,Upper middle income,Mexico
+Uruguay,3.374414,Latin America & Caribbean,High income: nonOECD,Paraguay & Uruguay
+Paraguay,6.209877,Latin America & Caribbean,Lower middle income,Paraguay & Uruguay
+Ecuador,14.934692,Latin America & Caribbean,Upper middle income,Peru & Ecuador
+Peru,29.373644,Latin America & Caribbean,Upper middle income,Peru & Ecuador
+Suriname,0.518141,Latin America & Caribbean,Upper middle income,Venezuela Guyana & Suriname
+Guyana,0.753362,Latin America & Caribbean,Lower middle income,Venezuela Guyana & Suriname
+Venezuela (Bolivarian Republic of),28.995745,Latin America & Caribbean,Upper middle income,Venezuela Guyana & Suriname
+Algeria,36.036159,Middle East & North Africa,Upper middle income,Algeria
+Egypt,82.040994,Middle East & North Africa,Lower middle income,Egypt
+Iran (Islamic Republic of),74.253373,Middle East & North Africa,Upper middle income,Iran (Islamic Republic of)
+Iraq,30.868156,Middle East & North Africa,Upper middle income,Iraq
+Bahrain,1.261319,Middle East & North Africa,High income: nonOECD,Middle East other
+Qatar,1.765513,Middle East & North Africa,High income: nonOECD,Middle East other
+Oman,2.943747,Middle East & North Africa,High income: nonOECD,Middle East other
+Kuwait,3.059473,Middle East & North Africa,High income: nonOECD,Middle East other
+Lebanon,4.337156,Middle East & North Africa,Upper middle income,Middle East other
+Jordan,6.517912,Middle East & North Africa,Upper middle income,Middle East other
+Israel,7.6236,Middle East & North Africa,High income: OECD,Middle East other
+United Arab Emirates,8.329453,Middle East & North Africa,High income: nonOECD,Middle East other
+Yemen,23.591972,Middle East & North Africa,Lower middle income,Middle East other
+Saudi Arabia,28.090647,Middle East & North Africa,High income: nonOECD,Middle East other
+Morocco,32.107739,Middle East & North Africa,Lower middle income,Morocco
+Malta,0.414508,Middle East & North Africa,High income: nonOECD,North Africa other
+Djibouti,0.830802,Middle East & North Africa,Lower middle income,North Africa other
+Libya,6.265697,Middle East & North Africa,Upper middle income,North Africa other
+Tunisia,10.5471,Middle East & North Africa,Upper middle income,North Africa other
+Canada,34.005274,North America,High income: OECD,Canada
+United States of America,309.346863,North America,High income: OECD,United States of America
+Afghanistan,27.962207,South Asia,Low income,Afghanistan
+Bangladesh,151.616777,South Asia,Low income,Bangladesh
+Maldives,0.367,South Asia,Upper middle income,India & Sri Lanka
+Sri Lanka,20.118,South Asia,Lower middle income,India & Sri Lanka
+India,1230.984504,South Asia,Lower middle income,India & Sri Lanka
+Bhutan,0.720246,South Asia,Lower middle income,Nepal & Butan
+Nepal,26.87591,South Asia,Low income,Nepal & Butan
+Pakistan,170.043918,South Asia,Lower middle income,Pakistan
+Sao Tome and Principe,0.17088,Sub-Saharan Africa,Lower middle income,Central Africa
+Comoros,0.698695,Sub-Saharan Africa,Low income,Central Africa
+Equatorial Guinea,0.72871,Sub-Saharan Africa,High income: nonOECD,Central Africa
+Congo,4.066078,Sub-Saharan Africa,Lower middle income,Central Africa
+Central African Republic,4.444973,Sub-Saharan Africa,Low income,Central Africa
+Burundi,9.461117,Sub-Saharan Africa,Low income,Central Africa
+Rwanda,10.293669,Sub-Saharan Africa,Low income,Central Africa
+Chad,11.89638,Sub-Saharan Africa,Low income,Central Africa
+Cameroon,20.590666,Sub-Saharan Africa,Lower middle income,Central Africa
+Democratic Republic of the Congo,65.938712,Sub-Saharan Africa,Low income,Democratic Republic of the Congo
+Eritrea,4.689664,Sub-Saharan Africa,Low income,East Africa
+South Sudan,10.056475,Sub-Saharan Africa,Lower middle income,East Africa
+Ethiopia,87.561814,Sub-Saharan Africa,Low income,Ethiopia
+Kenya,40.328313,Sub-Saharan Africa,Low income,Kenya
+Nigeria,159.424742,Sub-Saharan Africa,Lower middle income,Nigeria
+South Africa,50.771826,Sub-Saharan Africa,Upper middle income,South Africa
+Swaziland,1.193148,Sub-Saharan Africa,Lower middle income,Southern Africa other
+Mauritius,1.2504,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Lesotho,2.010586,Sub-Saharan Africa,Lower middle income,Southern Africa other
+Botswana,2.047831,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Namibia,2.193643,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Zambia,13.917439,Sub-Saharan Africa,Lower middle income,Southern Africa other
+Zimbabwe,13.973897,Sub-Saharan Africa,Low income,Southern Africa other
+Malawi,14.769824,Sub-Saharan Africa,Low income,Southern Africa other
+Madagascar,21.079532,Sub-Saharan Africa,Low income,Southern Africa other
+Angola,21.219954,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Mozambique,24.321457,Sub-Saharan Africa,Low income,Southern Africa other
+Sudan,36.114885,Sub-Saharan Africa,Lower middle income,Sudan
+Uganda,33.149417,Sub-Saharan Africa,Low income,Uganda
+United Republic of Tanzania,45.648525,Sub-Saharan Africa,Low income,United Republic of Tanzania
+Cabo Verde,0.490379,Sub-Saharan Africa,Lower middle income,West Africa
+Gabon,1.541936,Sub-Saharan Africa,Upper middle income,West Africa
+Guinea-Bissau,1.634196,Sub-Saharan Africa,Low income,West Africa
+Gambia,1.693002,Sub-Saharan Africa,Low income,West Africa
+Mauritania,3.5914,Sub-Saharan Africa,Lower middle income,West Africa
+Liberia,3.95799,Sub-Saharan Africa,Low income,West Africa
+Sierra Leone,5.775902,Sub-Saharan Africa,Low income,West Africa
+Togo,6.390851,Sub-Saharan Africa,Low income,West Africa
+Benin,9.509798,Sub-Saharan Africa,Low income,West Africa
+Guinea,11.012406,Sub-Saharan Africa,Low income,West Africa
+Senegal,12.956791,Sub-Saharan Africa,Lower middle income,West Africa
+Mali,15.167286,Sub-Saharan Africa,Low income,West Africa
+Burkina Faso,15.632066,Sub-Saharan Africa,Low income,West Africa
+Niger,16.29199,Sub-Saharan Africa,Low income,West Africa
+Cote d'Ivoire,20.131707,Sub-Saharan Africa,Lower middle income,West Africa
+Ghana,24.317734,Sub-Saharan Africa,Lower middle income,West Africa
+Somalia,,Sub-Saharan Africa,,West Africa
\ No newline at end of file
diff --git a/hind1970/data/country_groups.csv b/hind1970/data/country_groups.csv
new file mode 100644
index 0000000000000000000000000000000000000000..09a1a752bbec5426314ce3c2d40041335662409a
--- /dev/null
+++ b/hind1970/data/country_groups.csv
@@ -0,0 +1,194 @@
+Country,population,Region,IncomeGroup,PlumGroup
+New Zealand,4.3507,East Asia & Pacific,High income: OECD,Australia & NZ
+Australia,22.03175,East Asia & Pacific,High income: OECD,Australia & NZ
+New Caledonia,,East Asia & Pacific,,Australia & NZ
+China,1337.705,East Asia & Pacific,Upper middle income,China
+Tuvalu,0.009827,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Palau,0.02047,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Marshall Islands,0.052428,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Kiribati,0.102648,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Micronesia (Federated States of),0.103619,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Tonga,0.103947,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Samoa,0.186029,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Vanuatu,0.236299,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Brunei Darussalam,0.393302,East Asia & Pacific,High income: nonOECD,East Asia & Pacific_other
+Solomon Islands,0.526177,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Macau,0.534626,East Asia & Pacific,High income: nonOECD,East Asia & Pacific_other
+Fiji,0.859952,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Lao People's Democratic Republic,6.260544,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Papua New Guinea,6.847517,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+French Polynesia,,East Asia & Pacific,,East Asia & Pacific_other
+Democratic People's Republic of Korea,,East Asia & Pacific,,East Asia & Pacific_other
+Indonesia,241.613126,East Asia & Pacific,Lower middle income,Indonesia
+Japan,128.07,East Asia & Pacific,High income: OECD,Japan
+Mongolia,2.712657,East Asia & Pacific,Lower middle income,Mongolia
+Myanmar,51.733013,East Asia & Pacific,Low income,Myanmar
+Singapore,5.076732,East Asia & Pacific,High income: nonOECD,Philippines & Malaysia
+Malaysia,28.1195,East Asia & Pacific,Upper middle income,Philippines & Malaysia
+Philippines,93.038902,East Asia & Pacific,Lower middle income,Philippines & Malaysia
+Republic of Korea,49.410366,East Asia & Pacific,High income: OECD,Republic of Korea
+Thailand,66.692024,East Asia & Pacific,Upper middle income,Thailand
+Cambodia,14.363586,East Asia & Pacific,Low income,Viet Nam & Cambodia
+Viet Nam,86.9325,East Asia & Pacific,Lower middle income,Viet Nam & Cambodia
+Albania,2.913021,Europe & Central Asia,Upper middle income,Eastern Europe
+Armenia,2.963496,Europe & Central Asia,Lower middle income,Eastern Europe
+Slovakia,5.391428,Europe & Central Asia,High income: OECD,Eastern Europe
+Serbia,7.291436,Europe & Central Asia,Upper middle income,Eastern Europe
+Bulgaria,7.395599,Europe & Central Asia,Upper middle income,Eastern Europe
+Hungary,10.000023,Europe & Central Asia,Upper middle income,Eastern Europe
+Czech Republic,10.47441,Europe & Central Asia,High income: OECD,Eastern Europe
+Romania,20.246871,Europe & Central Asia,Upper middle income,Eastern Europe
+Montenegro,0.619428,Europe & Central Asia,Upper middle income,ex-Yugoslavia
+Kosovo,1.77568,Europe & Central Asia,Lower middle income,ex-Yugoslavia
+Slovenia,2.048583,Europe & Central Asia,High income: OECD,ex-Yugoslavia
+The former Yugoslav Republic of Macedonia,2.062443,Europe & Central Asia,Upper middle income,ex-Yugoslavia
+Republic of Moldova,3.562045,Europe & Central Asia,Lower middle income,ex-Yugoslavia
+Bosnia and Herzegovina,3.835258,Europe & Central Asia,Upper middle income,ex-Yugoslavia
+Croatia,4.417781,Europe & Central Asia,High income: nonOECD,ex-Yugoslavia
+Luxembourg,0.506953,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Ireland,4.560155,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Belgium,10.895586,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Netherlands,16.615394,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+France,65.027512,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Switzerland,7.824909,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
+Austria,8.363404,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
+Germany,81.77693,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
+Italy,59.277417,Europe & Central Asia,High income: OECD,Italy
+Estonia,1.331475,Europe & Central Asia,High income: OECD,Other former USSR
+Latvia,2.097555,Europe & Central Asia,High income: nonOECD,Other former USSR
+Lithuania,3.097282,Europe & Central Asia,High income: nonOECD,Other former USSR
+Georgia,3.926,Europe & Central Asia,Lower middle income,Other former USSR
+Turkmenistan,5.041995,Europe & Central Asia,Upper middle income,Other former USSR
+Kyrgyzstan,5.4479,Europe & Central Asia,Low income,Other former USSR
+Tajikistan,7.581696,Europe & Central Asia,Low income,Other former USSR
+Azerbaijan,9.054332,Europe & Central Asia,Upper middle income,Other former USSR
+Belarus,9.49,Europe & Central Asia,Upper middle income,Other former USSR
+Kazakhstan,16.321581,Europe & Central Asia,Upper middle income,Other former USSR
+Uzbekistan,28.5624,Europe & Central Asia,Lower middle income,Other former USSR
+Poland,38.042794,Europe & Central Asia,High income: OECD,Poland
+Russian Federation,142.849449,Europe & Central Asia,High income: nonOECD,Russian Federation
+Greenland,0.056905,Europe & Central Asia,High income: nonOECD,Scandinavia
+Iceland,0.318041,Europe & Central Asia,High income: OECD,Scandinavia
+Norway,4.889252,Europe & Central Asia,High income: OECD,Scandinavia
+Finland,5.363352,Europe & Central Asia,High income: OECD,Scandinavia
+Denmark,5.547683,Europe & Central Asia,High income: OECD,Scandinavia
+Sweden,9.378126,Europe & Central Asia,High income: OECD,Scandinavia
+Portugal,10.5731,Europe & Central Asia,High income: OECD,Spain & Portugal
+Spain,46.576897,Europe & Central Asia,High income: OECD,Spain & Portugal
+Cyprus,1.103685,Europe & Central Asia,High income: nonOECD,Turkey Cyprus & Greece
+Greece,11.121341,Europe & Central Asia,High income: OECD,Turkey Cyprus & Greece
+Turkey,72.310416,Europe & Central Asia,Upper middle income,Turkey Cyprus & Greece
+Ukraine,45.8707,Europe & Central Asia,Lower middle income,Ukraine
+United Kingdom,62.766365,Europe & Central Asia,High income: OECD,United Kingdom
+Argentina,41.222875,Latin America & Caribbean,Upper middle income,Argentina
+Bolivia (Plurinational State of),9.918245,Latin America & Caribbean,Lower middle income,Bolivia and Chile
+Chile,17.015048,Latin America & Caribbean,High income: OECD,Bolivia and Chile
+Brazil,198.614208,Latin America & Caribbean,Upper middle income,Brazil
+Saint Kitts and Nevis,0.052352,Latin America & Caribbean,High income: nonOECD,Caribbean
+Dominica,0.071167,Latin America & Caribbean,Upper middle income,Caribbean
+Antigua and Barbuda,0.087233,Latin America & Caribbean,High income: nonOECD,Caribbean
+Aruba,0.101597,Latin America & Caribbean,High income: nonOECD,Caribbean
+Grenada,0.104677,Latin America & Caribbean,Upper middle income,Caribbean
+Saint Vincent and the Grenadines,0.109316,Latin America & Caribbean,Upper middle income,Caribbean
+Saint Lucia,0.177397,Latin America & Caribbean,Upper middle income,Caribbean
+Barbados,0.279566,Latin America & Caribbean,High income: nonOECD,Caribbean
+Bahamas,0.36083,Latin America & Caribbean,High income: nonOECD,Caribbean
+Trinidad and Tobago,1.328095,Latin America & Caribbean,High income: nonOECD,Caribbean
+Jamaica,2.690824,Latin America & Caribbean,Upper middle income,Caribbean
+Puerto Rico,3.721526,Latin America & Caribbean,High income: nonOECD,Caribbean
+Dominican Republic,9.897983,Latin America & Caribbean,Upper middle income,Caribbean
+Haiti,9.999617,Latin America & Caribbean,Low income,Caribbean
+Cuba,11.308133,Latin America & Caribbean,Upper middle income,Caribbean
+Bermuda,,Latin America & Caribbean,,Caribbean
+Belize,0.321609,Latin America & Caribbean,Upper middle income,Central America
+Panama,3.620506,Latin America & Caribbean,Upper middle income,Central America
+Costa Rica,4.545273,Latin America & Caribbean,Upper middle income,Central America
+Nicaragua,5.737722,Latin America & Caribbean,Lower middle income,Central America
+El Salvador,6.038306,Latin America & Caribbean,Lower middle income,Central America
+Honduras,7.503875,Latin America & Caribbean,Lower middle income,Central America
+Guatemala,14.732261,Latin America & Caribbean,Lower middle income,Central America
+Colombia,45.918101,Latin America & Caribbean,Upper middle income,Colombia
+Mexico,118.617542,Latin America & Caribbean,Upper middle income,Mexico
+Uruguay,3.374414,Latin America & Caribbean,High income: nonOECD,Paraguay & Uruguay
+Paraguay,6.209877,Latin America & Caribbean,Lower middle income,Paraguay & Uruguay
+Ecuador,14.934692,Latin America & Caribbean,Upper middle income,Peru & Ecuador
+Peru,29.373644,Latin America & Caribbean,Upper middle income,Peru & Ecuador
+Suriname,0.518141,Latin America & Caribbean,Upper middle income,Venezuela Guyana & Suriname
+Guyana,0.753362,Latin America & Caribbean,Lower middle income,Venezuela Guyana & Suriname
+Venezuela (Bolivarian Republic of),28.995745,Latin America & Caribbean,Upper middle income,Venezuela Guyana & Suriname
+Algeria,36.036159,Middle East & North Africa,Upper middle income,Algeria
+Egypt,82.040994,Middle East & North Africa,Lower middle income,Egypt
+Iran (Islamic Republic of),74.253373,Middle East & North Africa,Upper middle income,Iran (Islamic Republic of)
+Iraq,30.868156,Middle East & North Africa,Upper middle income,Iraq
+Bahrain,1.261319,Middle East & North Africa,High income: nonOECD,Middle East other
+Qatar,1.765513,Middle East & North Africa,High income: nonOECD,Middle East other
+Oman,2.943747,Middle East & North Africa,High income: nonOECD,Middle East other
+Kuwait,3.059473,Middle East & North Africa,High income: nonOECD,Middle East other
+Lebanon,4.337156,Middle East & North Africa,Upper middle income,Middle East other
+Jordan,6.517912,Middle East & North Africa,Upper middle income,Middle East other
+Israel,7.6236,Middle East & North Africa,High income: OECD,Middle East other
+United Arab Emirates,8.329453,Middle East & North Africa,High income: nonOECD,Middle East other
+Yemen,23.591972,Middle East & North Africa,Lower middle income,Middle East other
+Saudi Arabia,28.090647,Middle East & North Africa,High income: nonOECD,Middle East other
+Morocco,32.107739,Middle East & North Africa,Lower middle income,Morocco
+Malta,0.414508,Middle East & North Africa,High income: nonOECD,North Africa other
+Djibouti,0.830802,Middle East & North Africa,Lower middle income,North Africa other
+Libya,6.265697,Middle East & North Africa,Upper middle income,North Africa other
+Tunisia,10.5471,Middle East & North Africa,Upper middle income,North Africa other
+Canada,34.005274,North America,High income: OECD,Canada
+United States of America,309.346863,North America,High income: OECD,United States of America
+Afghanistan,27.962207,South Asia,Low income,Afghanistan
+Bangladesh,151.616777,South Asia,Low income,Bangladesh
+Maldives,0.367,South Asia,Upper middle income,India & Sri Lanka
+Sri Lanka,20.118,South Asia,Lower middle income,India & Sri Lanka
+India,1230.984504,South Asia,Lower middle income,India & Sri Lanka
+Bhutan,0.720246,South Asia,Lower middle income,Nepal & Butan
+Nepal,26.87591,South Asia,Low income,Nepal & Butan
+Pakistan,170.043918,South Asia,Lower middle income,Pakistan
+Sao Tome and Principe,0.17088,Sub-Saharan Africa,Lower middle income,Central Africa
+Comoros,0.698695,Sub-Saharan Africa,Low income,Central Africa
+Equatorial Guinea,0.72871,Sub-Saharan Africa,High income: nonOECD,Central Africa
+Congo,4.066078,Sub-Saharan Africa,Lower middle income,Central Africa
+Central African Republic,4.444973,Sub-Saharan Africa,Low income,Central Africa
+Burundi,9.461117,Sub-Saharan Africa,Low income,Central Africa
+Rwanda,10.293669,Sub-Saharan Africa,Low income,Central Africa
+Chad,11.89638,Sub-Saharan Africa,Low income,Central Africa
+Cameroon,20.590666,Sub-Saharan Africa,Lower middle income,Central Africa
+Democratic Republic of the Congo,65.938712,Sub-Saharan Africa,Low income,Democratic Republic of the Congo
+Eritrea,4.689664,Sub-Saharan Africa,Low income,East Africa
+South Sudan,10.056475,Sub-Saharan Africa,Lower middle income,East Africa
+Ethiopia,87.561814,Sub-Saharan Africa,Low income,Ethiopia
+Kenya,40.328313,Sub-Saharan Africa,Low income,Kenya
+Nigeria,159.424742,Sub-Saharan Africa,Lower middle income,Nigeria
+South Africa,50.771826,Sub-Saharan Africa,Upper middle income,South Africa
+Swaziland,1.193148,Sub-Saharan Africa,Lower middle income,Southern Africa other
+Mauritius,1.2504,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Lesotho,2.010586,Sub-Saharan Africa,Lower middle income,Southern Africa other
+Botswana,2.047831,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Namibia,2.193643,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Zambia,13.917439,Sub-Saharan Africa,Lower middle income,Southern Africa other
+Zimbabwe,13.973897,Sub-Saharan Africa,Low income,Southern Africa other
+Malawi,14.769824,Sub-Saharan Africa,Low income,Southern Africa other
+Madagascar,21.079532,Sub-Saharan Africa,Low income,Southern Africa other
+Angola,21.219954,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Mozambique,24.321457,Sub-Saharan Africa,Low income,Southern Africa other
+Sudan,36.114885,Sub-Saharan Africa,Lower middle income,Sudan
+Uganda,33.149417,Sub-Saharan Africa,Low income,Uganda
+United Republic of Tanzania,45.648525,Sub-Saharan Africa,Low income,United Republic of Tanzania
+Cabo Verde,0.490379,Sub-Saharan Africa,Lower middle income,West Africa
+Gabon,1.541936,Sub-Saharan Africa,Upper middle income,West Africa
+Guinea-Bissau,1.634196,Sub-Saharan Africa,Low income,West Africa
+Gambia,1.693002,Sub-Saharan Africa,Low income,West Africa
+Mauritania,3.5914,Sub-Saharan Africa,Lower middle income,West Africa
+Liberia,3.95799,Sub-Saharan Africa,Low income,West Africa
+Sierra Leone,5.775902,Sub-Saharan Africa,Low income,West Africa
+Togo,6.390851,Sub-Saharan Africa,Low income,West Africa
+Benin,9.509798,Sub-Saharan Africa,Low income,West Africa
+Guinea,11.012406,Sub-Saharan Africa,Low income,West Africa
+Senegal,12.956791,Sub-Saharan Africa,Lower middle income,West Africa
+Mali,15.167286,Sub-Saharan Africa,Low income,West Africa
+Burkina Faso,15.632066,Sub-Saharan Africa,Low income,West Africa
+Niger,16.29199,Sub-Saharan Africa,Low income,West Africa
+Cote d'Ivoire,20.131707,Sub-Saharan Africa,Lower middle income,West Africa
+Ghana,24.317734,Sub-Saharan Africa,Lower middle income,West Africa
+Somalia,,Sub-Saharan Africa,,West Africa
\ No newline at end of file
diff --git a/hindcast/data/country_groups.csv b/hindcast/data/country_groups.csv
new file mode 100644
index 0000000000000000000000000000000000000000..09a1a752bbec5426314ce3c2d40041335662409a
--- /dev/null
+++ b/hindcast/data/country_groups.csv
@@ -0,0 +1,194 @@
+Country,population,Region,IncomeGroup,PlumGroup
+New Zealand,4.3507,East Asia & Pacific,High income: OECD,Australia & NZ
+Australia,22.03175,East Asia & Pacific,High income: OECD,Australia & NZ
+New Caledonia,,East Asia & Pacific,,Australia & NZ
+China,1337.705,East Asia & Pacific,Upper middle income,China
+Tuvalu,0.009827,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Palau,0.02047,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Marshall Islands,0.052428,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Kiribati,0.102648,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Micronesia (Federated States of),0.103619,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Tonga,0.103947,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Samoa,0.186029,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Vanuatu,0.236299,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Brunei Darussalam,0.393302,East Asia & Pacific,High income: nonOECD,East Asia & Pacific_other
+Solomon Islands,0.526177,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Macau,0.534626,East Asia & Pacific,High income: nonOECD,East Asia & Pacific_other
+Fiji,0.859952,East Asia & Pacific,Upper middle income,East Asia & Pacific_other
+Lao People's Democratic Republic,6.260544,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+Papua New Guinea,6.847517,East Asia & Pacific,Lower middle income,East Asia & Pacific_other
+French Polynesia,,East Asia & Pacific,,East Asia & Pacific_other
+Democratic People's Republic of Korea,,East Asia & Pacific,,East Asia & Pacific_other
+Indonesia,241.613126,East Asia & Pacific,Lower middle income,Indonesia
+Japan,128.07,East Asia & Pacific,High income: OECD,Japan
+Mongolia,2.712657,East Asia & Pacific,Lower middle income,Mongolia
+Myanmar,51.733013,East Asia & Pacific,Low income,Myanmar
+Singapore,5.076732,East Asia & Pacific,High income: nonOECD,Philippines & Malaysia
+Malaysia,28.1195,East Asia & Pacific,Upper middle income,Philippines & Malaysia
+Philippines,93.038902,East Asia & Pacific,Lower middle income,Philippines & Malaysia
+Republic of Korea,49.410366,East Asia & Pacific,High income: OECD,Republic of Korea
+Thailand,66.692024,East Asia & Pacific,Upper middle income,Thailand
+Cambodia,14.363586,East Asia & Pacific,Low income,Viet Nam & Cambodia
+Viet Nam,86.9325,East Asia & Pacific,Lower middle income,Viet Nam & Cambodia
+Albania,2.913021,Europe & Central Asia,Upper middle income,Eastern Europe
+Armenia,2.963496,Europe & Central Asia,Lower middle income,Eastern Europe
+Slovakia,5.391428,Europe & Central Asia,High income: OECD,Eastern Europe
+Serbia,7.291436,Europe & Central Asia,Upper middle income,Eastern Europe
+Bulgaria,7.395599,Europe & Central Asia,Upper middle income,Eastern Europe
+Hungary,10.000023,Europe & Central Asia,Upper middle income,Eastern Europe
+Czech Republic,10.47441,Europe & Central Asia,High income: OECD,Eastern Europe
+Romania,20.246871,Europe & Central Asia,Upper middle income,Eastern Europe
+Montenegro,0.619428,Europe & Central Asia,Upper middle income,ex-Yugoslavia
+Kosovo,1.77568,Europe & Central Asia,Lower middle income,ex-Yugoslavia
+Slovenia,2.048583,Europe & Central Asia,High income: OECD,ex-Yugoslavia
+The former Yugoslav Republic of Macedonia,2.062443,Europe & Central Asia,Upper middle income,ex-Yugoslavia
+Republic of Moldova,3.562045,Europe & Central Asia,Lower middle income,ex-Yugoslavia
+Bosnia and Herzegovina,3.835258,Europe & Central Asia,Upper middle income,ex-Yugoslavia
+Croatia,4.417781,Europe & Central Asia,High income: nonOECD,ex-Yugoslavia
+Luxembourg,0.506953,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Ireland,4.560155,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Belgium,10.895586,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Netherlands,16.615394,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+France,65.027512,Europe & Central Asia,High income: OECD,France Netherlands & Benlex
+Switzerland,7.824909,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
+Austria,8.363404,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
+Germany,81.77693,Europe & Central Asia,High income: OECD,Germany Austria & Switzerland
+Italy,59.277417,Europe & Central Asia,High income: OECD,Italy
+Estonia,1.331475,Europe & Central Asia,High income: OECD,Other former USSR
+Latvia,2.097555,Europe & Central Asia,High income: nonOECD,Other former USSR
+Lithuania,3.097282,Europe & Central Asia,High income: nonOECD,Other former USSR
+Georgia,3.926,Europe & Central Asia,Lower middle income,Other former USSR
+Turkmenistan,5.041995,Europe & Central Asia,Upper middle income,Other former USSR
+Kyrgyzstan,5.4479,Europe & Central Asia,Low income,Other former USSR
+Tajikistan,7.581696,Europe & Central Asia,Low income,Other former USSR
+Azerbaijan,9.054332,Europe & Central Asia,Upper middle income,Other former USSR
+Belarus,9.49,Europe & Central Asia,Upper middle income,Other former USSR
+Kazakhstan,16.321581,Europe & Central Asia,Upper middle income,Other former USSR
+Uzbekistan,28.5624,Europe & Central Asia,Lower middle income,Other former USSR
+Poland,38.042794,Europe & Central Asia,High income: OECD,Poland
+Russian Federation,142.849449,Europe & Central Asia,High income: nonOECD,Russian Federation
+Greenland,0.056905,Europe & Central Asia,High income: nonOECD,Scandinavia
+Iceland,0.318041,Europe & Central Asia,High income: OECD,Scandinavia
+Norway,4.889252,Europe & Central Asia,High income: OECD,Scandinavia
+Finland,5.363352,Europe & Central Asia,High income: OECD,Scandinavia
+Denmark,5.547683,Europe & Central Asia,High income: OECD,Scandinavia
+Sweden,9.378126,Europe & Central Asia,High income: OECD,Scandinavia
+Portugal,10.5731,Europe & Central Asia,High income: OECD,Spain & Portugal
+Spain,46.576897,Europe & Central Asia,High income: OECD,Spain & Portugal
+Cyprus,1.103685,Europe & Central Asia,High income: nonOECD,Turkey Cyprus & Greece
+Greece,11.121341,Europe & Central Asia,High income: OECD,Turkey Cyprus & Greece
+Turkey,72.310416,Europe & Central Asia,Upper middle income,Turkey Cyprus & Greece
+Ukraine,45.8707,Europe & Central Asia,Lower middle income,Ukraine
+United Kingdom,62.766365,Europe & Central Asia,High income: OECD,United Kingdom
+Argentina,41.222875,Latin America & Caribbean,Upper middle income,Argentina
+Bolivia (Plurinational State of),9.918245,Latin America & Caribbean,Lower middle income,Bolivia and Chile
+Chile,17.015048,Latin America & Caribbean,High income: OECD,Bolivia and Chile
+Brazil,198.614208,Latin America & Caribbean,Upper middle income,Brazil
+Saint Kitts and Nevis,0.052352,Latin America & Caribbean,High income: nonOECD,Caribbean
+Dominica,0.071167,Latin America & Caribbean,Upper middle income,Caribbean
+Antigua and Barbuda,0.087233,Latin America & Caribbean,High income: nonOECD,Caribbean
+Aruba,0.101597,Latin America & Caribbean,High income: nonOECD,Caribbean
+Grenada,0.104677,Latin America & Caribbean,Upper middle income,Caribbean
+Saint Vincent and the Grenadines,0.109316,Latin America & Caribbean,Upper middle income,Caribbean
+Saint Lucia,0.177397,Latin America & Caribbean,Upper middle income,Caribbean
+Barbados,0.279566,Latin America & Caribbean,High income: nonOECD,Caribbean
+Bahamas,0.36083,Latin America & Caribbean,High income: nonOECD,Caribbean
+Trinidad and Tobago,1.328095,Latin America & Caribbean,High income: nonOECD,Caribbean
+Jamaica,2.690824,Latin America & Caribbean,Upper middle income,Caribbean
+Puerto Rico,3.721526,Latin America & Caribbean,High income: nonOECD,Caribbean
+Dominican Republic,9.897983,Latin America & Caribbean,Upper middle income,Caribbean
+Haiti,9.999617,Latin America & Caribbean,Low income,Caribbean
+Cuba,11.308133,Latin America & Caribbean,Upper middle income,Caribbean
+Bermuda,,Latin America & Caribbean,,Caribbean
+Belize,0.321609,Latin America & Caribbean,Upper middle income,Central America
+Panama,3.620506,Latin America & Caribbean,Upper middle income,Central America
+Costa Rica,4.545273,Latin America & Caribbean,Upper middle income,Central America
+Nicaragua,5.737722,Latin America & Caribbean,Lower middle income,Central America
+El Salvador,6.038306,Latin America & Caribbean,Lower middle income,Central America
+Honduras,7.503875,Latin America & Caribbean,Lower middle income,Central America
+Guatemala,14.732261,Latin America & Caribbean,Lower middle income,Central America
+Colombia,45.918101,Latin America & Caribbean,Upper middle income,Colombia
+Mexico,118.617542,Latin America & Caribbean,Upper middle income,Mexico
+Uruguay,3.374414,Latin America & Caribbean,High income: nonOECD,Paraguay & Uruguay
+Paraguay,6.209877,Latin America & Caribbean,Lower middle income,Paraguay & Uruguay
+Ecuador,14.934692,Latin America & Caribbean,Upper middle income,Peru & Ecuador
+Peru,29.373644,Latin America & Caribbean,Upper middle income,Peru & Ecuador
+Suriname,0.518141,Latin America & Caribbean,Upper middle income,Venezuela Guyana & Suriname
+Guyana,0.753362,Latin America & Caribbean,Lower middle income,Venezuela Guyana & Suriname
+Venezuela (Bolivarian Republic of),28.995745,Latin America & Caribbean,Upper middle income,Venezuela Guyana & Suriname
+Algeria,36.036159,Middle East & North Africa,Upper middle income,Algeria
+Egypt,82.040994,Middle East & North Africa,Lower middle income,Egypt
+Iran (Islamic Republic of),74.253373,Middle East & North Africa,Upper middle income,Iran (Islamic Republic of)
+Iraq,30.868156,Middle East & North Africa,Upper middle income,Iraq
+Bahrain,1.261319,Middle East & North Africa,High income: nonOECD,Middle East other
+Qatar,1.765513,Middle East & North Africa,High income: nonOECD,Middle East other
+Oman,2.943747,Middle East & North Africa,High income: nonOECD,Middle East other
+Kuwait,3.059473,Middle East & North Africa,High income: nonOECD,Middle East other
+Lebanon,4.337156,Middle East & North Africa,Upper middle income,Middle East other
+Jordan,6.517912,Middle East & North Africa,Upper middle income,Middle East other
+Israel,7.6236,Middle East & North Africa,High income: OECD,Middle East other
+United Arab Emirates,8.329453,Middle East & North Africa,High income: nonOECD,Middle East other
+Yemen,23.591972,Middle East & North Africa,Lower middle income,Middle East other
+Saudi Arabia,28.090647,Middle East & North Africa,High income: nonOECD,Middle East other
+Morocco,32.107739,Middle East & North Africa,Lower middle income,Morocco
+Malta,0.414508,Middle East & North Africa,High income: nonOECD,North Africa other
+Djibouti,0.830802,Middle East & North Africa,Lower middle income,North Africa other
+Libya,6.265697,Middle East & North Africa,Upper middle income,North Africa other
+Tunisia,10.5471,Middle East & North Africa,Upper middle income,North Africa other
+Canada,34.005274,North America,High income: OECD,Canada
+United States of America,309.346863,North America,High income: OECD,United States of America
+Afghanistan,27.962207,South Asia,Low income,Afghanistan
+Bangladesh,151.616777,South Asia,Low income,Bangladesh
+Maldives,0.367,South Asia,Upper middle income,India & Sri Lanka
+Sri Lanka,20.118,South Asia,Lower middle income,India & Sri Lanka
+India,1230.984504,South Asia,Lower middle income,India & Sri Lanka
+Bhutan,0.720246,South Asia,Lower middle income,Nepal & Butan
+Nepal,26.87591,South Asia,Low income,Nepal & Butan
+Pakistan,170.043918,South Asia,Lower middle income,Pakistan
+Sao Tome and Principe,0.17088,Sub-Saharan Africa,Lower middle income,Central Africa
+Comoros,0.698695,Sub-Saharan Africa,Low income,Central Africa
+Equatorial Guinea,0.72871,Sub-Saharan Africa,High income: nonOECD,Central Africa
+Congo,4.066078,Sub-Saharan Africa,Lower middle income,Central Africa
+Central African Republic,4.444973,Sub-Saharan Africa,Low income,Central Africa
+Burundi,9.461117,Sub-Saharan Africa,Low income,Central Africa
+Rwanda,10.293669,Sub-Saharan Africa,Low income,Central Africa
+Chad,11.89638,Sub-Saharan Africa,Low income,Central Africa
+Cameroon,20.590666,Sub-Saharan Africa,Lower middle income,Central Africa
+Democratic Republic of the Congo,65.938712,Sub-Saharan Africa,Low income,Democratic Republic of the Congo
+Eritrea,4.689664,Sub-Saharan Africa,Low income,East Africa
+South Sudan,10.056475,Sub-Saharan Africa,Lower middle income,East Africa
+Ethiopia,87.561814,Sub-Saharan Africa,Low income,Ethiopia
+Kenya,40.328313,Sub-Saharan Africa,Low income,Kenya
+Nigeria,159.424742,Sub-Saharan Africa,Lower middle income,Nigeria
+South Africa,50.771826,Sub-Saharan Africa,Upper middle income,South Africa
+Swaziland,1.193148,Sub-Saharan Africa,Lower middle income,Southern Africa other
+Mauritius,1.2504,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Lesotho,2.010586,Sub-Saharan Africa,Lower middle income,Southern Africa other
+Botswana,2.047831,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Namibia,2.193643,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Zambia,13.917439,Sub-Saharan Africa,Lower middle income,Southern Africa other
+Zimbabwe,13.973897,Sub-Saharan Africa,Low income,Southern Africa other
+Malawi,14.769824,Sub-Saharan Africa,Low income,Southern Africa other
+Madagascar,21.079532,Sub-Saharan Africa,Low income,Southern Africa other
+Angola,21.219954,Sub-Saharan Africa,Upper middle income,Southern Africa other
+Mozambique,24.321457,Sub-Saharan Africa,Low income,Southern Africa other
+Sudan,36.114885,Sub-Saharan Africa,Lower middle income,Sudan
+Uganda,33.149417,Sub-Saharan Africa,Low income,Uganda
+United Republic of Tanzania,45.648525,Sub-Saharan Africa,Low income,United Republic of Tanzania
+Cabo Verde,0.490379,Sub-Saharan Africa,Lower middle income,West Africa
+Gabon,1.541936,Sub-Saharan Africa,Upper middle income,West Africa
+Guinea-Bissau,1.634196,Sub-Saharan Africa,Low income,West Africa
+Gambia,1.693002,Sub-Saharan Africa,Low income,West Africa
+Mauritania,3.5914,Sub-Saharan Africa,Lower middle income,West Africa
+Liberia,3.95799,Sub-Saharan Africa,Low income,West Africa
+Sierra Leone,5.775902,Sub-Saharan Africa,Low income,West Africa
+Togo,6.390851,Sub-Saharan Africa,Low income,West Africa
+Benin,9.509798,Sub-Saharan Africa,Low income,West Africa
+Guinea,11.012406,Sub-Saharan Africa,Low income,West Africa
+Senegal,12.956791,Sub-Saharan Africa,Lower middle income,West Africa
+Mali,15.167286,Sub-Saharan Africa,Low income,West Africa
+Burkina Faso,15.632066,Sub-Saharan Africa,Low income,West Africa
+Niger,16.29199,Sub-Saharan Africa,Low income,West Africa
+Cote d'Ivoire,20.131707,Sub-Saharan Africa,Lower middle income,West Africa
+Ghana,24.317734,Sub-Saharan Africa,Lower middle income,West Africa
+Somalia,,Sub-Saharan Africa,,West Africa
\ No newline at end of file
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index 2fee042a90e6fa4ba2bca00fbf0a6746b4b8959d..f90b8fa906fed795c99969e4da7ce4dc1f2e8827 100644
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -115,7 +115,8 @@ public class ModelConfig {
public static final String TRADE_BARRIERS_FILE = DATA_DIR + File.separator + "tradeBarriers.csv";
public static final String STOCKS_FILE = DATA_DIR + File.separator + "global_stocks.csv";
public static final String FAO_CONSUMPTION_FILE = DATA_DIR + File.separator + "fao_consump.csv";
-
+ public static final String COUNTRY_GROUPING_FILE = DATA_DIR + File.separator + "country_groups.csv";
+
// yield data
public static final String YIELD_DIR_BASE = getProperty("YIELD_DIR_BASE");
public static final String YIELD_DIR_TOP = getProperty("YIELD_DIR_TOP");
@@ -222,7 +223,8 @@ public class ModelConfig {
public static final double MARKET_LAMBA = getDoubleProperty("MARKET_LAMBA", 0.4); // controls international market price adjustment rate
public static final double POPULATION_AGGREG_LIMIT = getDoubleProperty("POPULATION_AGGREG_LIMIT", 30.0); // in millions, smaller countries are aggregated on a regional basis
-
+ public static final boolean PREDEFINED_COUNTRY_GROUPING = getBooleanProperty("PREDEFINED_COUNTRY_GROUPING", true);
+
public static final double UNHANDLED_CROP_AREA = getDoubleProperty("UNHANDLED_CROP_AREA", 0.3); // includes fruit veg forage crops set aside and failed crop
public static final double OTHER_INTENSITY_COST = getDoubleProperty("OTHER_INTENSITY_COST", 0.4);
diff --git a/src/ac/ed/lurg/country/CompositeCountryManager.java b/src/ac/ed/lurg/country/CompositeCountryManager.java
index 182271951a7b15728cda48eeb02eec2f8438d069..b53d2f2fe34184c37a82b2ade8037cc5627c1e85 100644
--- a/src/ac/ed/lurg/country/CompositeCountryManager.java
+++ b/src/ac/ed/lurg/country/CompositeCountryManager.java
@@ -10,18 +10,31 @@ import java.util.Map;
import ac.ed.lurg.ModelConfig;
import ac.ed.lurg.demand.BaseConsumpManager;
import ac.ed.lurg.utils.CollectionHelper;
+import ac.ed.lurg.utils.StringTabularReader;
public class CompositeCountryManager {
private Map<String, CompositeCountry> mapFromName = new HashMap<String, CompositeCountry>();
private Map<SingleCountry, CompositeCountry> mapFromSingleCountry;
private Map<CompositeCountry, List<SingleCountry>> mapFromCompositeCountry;
-
+ private StringTabularReader countryGroups;
+
public CompositeCountryManager(BaseConsumpManager baseConsumpManager) {
super();
+ if (ModelConfig.PREDEFINED_COUNTRY_GROUPING) {
+ countryGroups = new StringTabularReader(",", new String[]{"Country", "PlumGroup"});
+ countryGroups.read(ModelConfig.COUNTRY_GROUPING_FILE);
+ }
populate(baseConsumpManager);
}
+ private String getCountryGroup(SingleCountry aCountry) {
+ Map<String, String> queryMap = new HashMap<String, String>();
+ queryMap.put("Country", aCountry.getCountryName());
+ Map<String, String> row = countryGroups.querySingle(queryMap);
+ return row.get("PlumGroup");
+ }
+
private void populate(BaseConsumpManager baseConsumpManager) {
mapFromSingleCountry = new HashMap<SingleCountry, CompositeCountry>();
@@ -30,7 +43,9 @@ public class CompositeCountryManager {
for (SingleCountry c : baseConsumpManager.getAllCountries()) {
CompositeCountry cc;
- if (baseConsumpManager.getPopForGrouping(c) < ModelConfig.POPULATION_AGGREG_LIMIT || countryExclusionList.contains(c.getCountryName()))
+ if (ModelConfig.PREDEFINED_COUNTRY_GROUPING)
+ cc = getForName(getCountryGroup(c));
+ else if (baseConsumpManager.getPopForGrouping(c) < ModelConfig.POPULATION_AGGREG_LIMIT || countryExclusionList.contains(c.getCountryName()))
cc = getForName(c.getRegion() + "_other");
else
cc = getForName(c.getCountryName());
diff --git a/src/ac/ed/lurg/utils/StringTabularReader.java b/src/ac/ed/lurg/utils/StringTabularReader.java
index 2654fef3bcc51498419249b808d221fc46f02e84..bac9ce77d3030b4c11760190e64a9dde82c78506 100644
--- a/src/ac/ed/lurg/utils/StringTabularReader.java
+++ b/src/ac/ed/lurg/utils/StringTabularReader.java
@@ -71,6 +71,15 @@ public class StringTabularReader {
return line.trim().split(delimiterRegex);
}
+ /** Queries table but expect single value to be found, throws a RuntimeException if not */
+ public Map<String, String> querySingle(Map<String, String> queryMap) {
+ List<Map<String, String>> rows = query(queryMap);
+ if (rows.size() != 1)
+ throw new RuntimeException("Single row not found for " + queryMap + ", " + rows.size());
+
+ return rows.get(0);
+ }
+
public List<Map<String, String>> query(Map<String, String> queryMap) {
List<Map<String, String>> matchingRows = new ArrayList<Map<String, String>>();