From 8f3854a0b41389478e1108d70d3033b463060840 Mon Sep 17 00:00:00 2001
From: Peter Alexander <>
Date: Thu, 21 Oct 2021 15:05:48 +0100
Subject: [PATCH] Changes for tradeBarriers
---
data/tradeBarriers.csv | 400 ++++++++++----------
src/ac/ed/lurg/ModelConfig.java | 1 -
src/ac/ed/lurg/country/TradeManager.java | 8 +-
src/ac/ed/lurg/yield/YieldClusterPoint.java | 2 +-
4 files changed, 203 insertions(+), 208 deletions(-)
diff --git a/data/tradeBarriers.csv b/data/tradeBarriers.csv
index 9b809878..ed77c4cf 100644
--- a/data/tradeBarriers.csv
+++ b/data/tradeBarriers.csv
@@ -79,14 +79,14 @@ Azerbaijan,Pulses,0.147246575041111
Azerbaijan,Starchy Roots,0.147246575041111
Azerbaijan,MaizeMilletSorghum,0.147246575041111
Azerbaijan,Rice (Paddy Equivalent),0.147246575041111
-Bahamas,Ruminants,NA
-Bahamas,WheatBarleyOats,NA
-Bahamas,Monogastrics,NA
-Bahamas,Oilcrops,NA
-Bahamas,Pulses,NA
-Bahamas,Starchy Roots,NA
-Bahamas,MaizeMilletSorghum,NA
-Bahamas,Rice (Paddy Equivalent),NA
+Bahamas,Ruminants,0.155453768731092
+Bahamas,WheatBarleyOats,0.155453768731092
+Bahamas,Monogastrics,0.155453768731092
+Bahamas,Oilcrops,0.155453768731092
+Bahamas,Pulses,0.155453768731092
+Bahamas,Starchy Roots,0.155453768731092
+Bahamas,MaizeMilletSorghum,0.155453768731092
+Bahamas,Rice (Paddy Equivalent),0.155453768731092
Bangladesh,Ruminants,0.106585303378
Bangladesh,WheatBarleyOats,0.106585303378
Bangladesh,Monogastrics,0.106585303378
@@ -175,14 +175,14 @@ Brazil,Pulses,0.158867221672727
Brazil,Starchy Roots,0.158867221672727
Brazil,MaizeMilletSorghum,0.158867221672727
Brazil,Rice (Paddy Equivalent),0.158867221672727
-Brunei Darussalam,Ruminants,NA
-Brunei Darussalam,WheatBarleyOats,NA
-Brunei Darussalam,Monogastrics,NA
-Brunei Darussalam,Oilcrops,NA
-Brunei Darussalam,Pulses,NA
-Brunei Darussalam,Starchy Roots,NA
-Brunei Darussalam,MaizeMilletSorghum,NA
-Brunei Darussalam,Rice (Paddy Equivalent),NA
+Brunei Darussalam,Ruminants,0.155453768731092
+Brunei Darussalam,WheatBarleyOats,0.155453768731092
+Brunei Darussalam,Monogastrics,0.155453768731092
+Brunei Darussalam,Oilcrops,0.155453768731092
+Brunei Darussalam,Pulses,0.155453768731092
+Brunei Darussalam,Starchy Roots,0.155453768731092
+Brunei Darussalam,MaizeMilletSorghum,0.155453768731092
+Brunei Darussalam,Rice (Paddy Equivalent),0.155453768731092
Bulgaria,Ruminants,0.157907276381818
Bulgaria,WheatBarleyOats,0.157907276381818
Bulgaria,Monogastrics,0.157907276381818
@@ -239,14 +239,14 @@ Central African Republic,Pulses,0.2420780247
Central African Republic,Starchy Roots,0.2420780247
Central African Republic,MaizeMilletSorghum,0.2420780247
Central African Republic,Rice (Paddy Equivalent),0.2420780247
-Chad,Ruminants,NA
-Chad,WheatBarleyOats,NA
-Chad,Monogastrics,NA
-Chad,Oilcrops,NA
-Chad,Pulses,NA
-Chad,Starchy Roots,NA
-Chad,MaizeMilletSorghum,NA
-Chad,Rice (Paddy Equivalent),NA
+Chad,Ruminants,0.155453768731092
+Chad,WheatBarleyOats,0.155453768731092
+Chad,Monogastrics,0.155453768731092
+Chad,Oilcrops,0.155453768731092
+Chad,Pulses,0.155453768731092
+Chad,Starchy Roots,0.155453768731092
+Chad,MaizeMilletSorghum,0.155453768731092
+Chad,Rice (Paddy Equivalent),0.155453768731092
Chile,Ruminants,0.06
Chile,WheatBarleyOats,0.06
Chile,Monogastrics,0.06
@@ -319,30 +319,30 @@ Cyprus,Pulses,0.157907276381818
Cyprus,Starchy Roots,0.157907276381818
Cyprus,MaizeMilletSorghum,0.157907276381818
Cyprus,Rice (Paddy Equivalent),0.157907276381818
-Czech Republic,Ruminants,0.157907276381818
-Czech Republic,WheatBarleyOats,0.157907276381818
-Czech Republic,Monogastrics,0.157907276381818
-Czech Republic,Oilcrops,0.157907276381818
-Czech Republic,Pulses,0.157907276381818
-Czech Republic,Starchy Roots,0.157907276381818
-Czech Republic,MaizeMilletSorghum,0.157907276381818
-Czech Republic,Rice (Paddy Equivalent),0.157907276381818
-Democratic People's Republic of Korea,Ruminants,NA
-Democratic People's Republic of Korea,WheatBarleyOats,NA
-Democratic People's Republic of Korea,Monogastrics,NA
-Democratic People's Republic of Korea,Oilcrops,NA
-Democratic People's Republic of Korea,Pulses,NA
-Democratic People's Republic of Korea,Starchy Roots,NA
-Democratic People's Republic of Korea,MaizeMilletSorghum,NA
-Democratic People's Republic of Korea,Rice (Paddy Equivalent),NA
-Democratic Republic of the Congo,Ruminants,NA
-Democratic Republic of the Congo,WheatBarleyOats,NA
-Democratic Republic of the Congo,Monogastrics,NA
-Democratic Republic of the Congo,Oilcrops,NA
-Democratic Republic of the Congo,Pulses,NA
-Democratic Republic of the Congo,Starchy Roots,NA
-Democratic Republic of the Congo,MaizeMilletSorghum,NA
-Democratic Republic of the Congo,Rice (Paddy Equivalent),NA
+Czechia,Ruminants,0.157907276381818
+Czechia,WheatBarleyOats,0.157907276381818
+Czechia,Monogastrics,0.157907276381818
+Czechia,Oilcrops,0.157907276381818
+Czechia,Pulses,0.157907276381818
+Czechia,Starchy Roots,0.157907276381818
+Czechia,MaizeMilletSorghum,0.157907276381818
+Czechia,Rice (Paddy Equivalent),0.157907276381818
+Democratic People's Republic of Korea,Ruminants,0.155453768731092
+Democratic People's Republic of Korea,WheatBarleyOats,0.155453768731092
+Democratic People's Republic of Korea,Monogastrics,0.155453768731092
+Democratic People's Republic of Korea,Oilcrops,0.155453768731092
+Democratic People's Republic of Korea,Pulses,0.155453768731092
+Democratic People's Republic of Korea,Starchy Roots,0.155453768731092
+Democratic People's Republic of Korea,MaizeMilletSorghum,0.155453768731092
+Democratic People's Republic of Korea,Rice (Paddy Equivalent),0.155453768731092
+Democratic Republic of the Congo,Ruminants,0.155453768731092
+Democratic Republic of the Congo,WheatBarleyOats,0.155453768731092
+Democratic Republic of the Congo,Monogastrics,0.155453768731092
+Democratic Republic of the Congo,Oilcrops,0.155453768731092
+Democratic Republic of the Congo,Pulses,0.155453768731092
+Democratic Republic of the Congo,Starchy Roots,0.155453768731092
+Democratic Republic of the Congo,MaizeMilletSorghum,0.155453768731092
+Democratic Republic of the Congo,Rice (Paddy Equivalent),0.155453768731092
Denmark,Ruminants,0.157907276381818
Denmark,WheatBarleyOats,0.157907276381818
Denmark,Monogastrics,0.157907276381818
@@ -535,14 +535,14 @@ Guyana,Pulses,0.2998966663
Guyana,Starchy Roots,0.2998966663
Guyana,MaizeMilletSorghum,0.2998966663
Guyana,Rice (Paddy Equivalent),0.2998966663
-Haiti,Ruminants,NA
-Haiti,WheatBarleyOats,NA
-Haiti,Monogastrics,NA
-Haiti,Oilcrops,NA
-Haiti,Pulses,NA
-Haiti,Starchy Roots,NA
-Haiti,MaizeMilletSorghum,NA
-Haiti,Rice (Paddy Equivalent),NA
+Haiti,Ruminants,0.155453768731092
+Haiti,WheatBarleyOats,0.155453768731092
+Haiti,Monogastrics,0.155453768731092
+Haiti,Oilcrops,0.155453768731092
+Haiti,Pulses,0.155453768731092
+Haiti,Starchy Roots,0.155453768731092
+Haiti,MaizeMilletSorghum,0.155453768731092
+Haiti,Rice (Paddy Equivalent),0.155453768731092
Honduras,Ruminants,0.1179939271
Honduras,WheatBarleyOats,0.1179939271
Honduras,Monogastrics,0.1179939271
@@ -583,22 +583,22 @@ Indonesia,Pulses,0.08629484793
Indonesia,Starchy Roots,0.08629484793
Indonesia,MaizeMilletSorghum,0.08629484793
Indonesia,Rice (Paddy Equivalent),0.08629484793
-Iran (Islamic Republic of),Ruminants,NA
-Iran (Islamic Republic of),WheatBarleyOats,NA
-Iran (Islamic Republic of),Monogastrics,NA
-Iran (Islamic Republic of),Oilcrops,NA
-Iran (Islamic Republic of),Pulses,NA
-Iran (Islamic Republic of),Starchy Roots,NA
-Iran (Islamic Republic of),MaizeMilletSorghum,NA
-Iran (Islamic Republic of),Rice (Paddy Equivalent),NA
-Iraq,Ruminants,NA
-Iraq,WheatBarleyOats,NA
-Iraq,Monogastrics,NA
-Iraq,Oilcrops,NA
-Iraq,Pulses,NA
-Iraq,Starchy Roots,NA
-Iraq,MaizeMilletSorghum,NA
-Iraq,Rice (Paddy Equivalent),NA
+Iran (Islamic Republic of),Ruminants,0.155453768731092
+Iran (Islamic Republic of),WheatBarleyOats,0.155453768731092
+Iran (Islamic Republic of),Monogastrics,0.155453768731092
+Iran (Islamic Republic of),Oilcrops,0.155453768731092
+Iran (Islamic Republic of),Pulses,0.155453768731092
+Iran (Islamic Republic of),Starchy Roots,0.155453768731092
+Iran (Islamic Republic of),MaizeMilletSorghum,0.155453768731092
+Iran (Islamic Republic of),Rice (Paddy Equivalent),0.155453768731092
+Iraq,Ruminants,0.155453768731092
+Iraq,WheatBarleyOats,0.155453768731092
+Iraq,Monogastrics,0.155453768731092
+Iraq,Oilcrops,0.155453768731092
+Iraq,Pulses,0.155453768731092
+Iraq,Starchy Roots,0.155453768731092
+Iraq,MaizeMilletSorghum,0.155453768731092
+Iraq,Rice (Paddy Equivalent),0.155453768731092
Ireland,Ruminants,0.157907276381818
Ireland,WheatBarleyOats,0.157907276381818
Ireland,Monogastrics,0.157907276381818
@@ -663,14 +663,14 @@ Kenya,Pulses,0.44008540995
Kenya,Starchy Roots,0.44008540995
Kenya,MaizeMilletSorghum,0.44008540995
Kenya,Rice (Paddy Equivalent),0.44008540995
-Kiribati,Ruminants,NA
-Kiribati,WheatBarleyOats,NA
-Kiribati,Monogastrics,NA
-Kiribati,Oilcrops,NA
-Kiribati,Pulses,NA
-Kiribati,Starchy Roots,NA
-Kiribati,MaizeMilletSorghum,NA
-Kiribati,Rice (Paddy Equivalent),NA
+Kiribati,Ruminants,0.155453768731092
+Kiribati,WheatBarleyOats,0.155453768731092
+Kiribati,Monogastrics,0.155453768731092
+Kiribati,Oilcrops,0.155453768731092
+Kiribati,Pulses,0.155453768731092
+Kiribati,Starchy Roots,0.155453768731092
+Kiribati,MaizeMilletSorghum,0.155453768731092
+Kiribati,Rice (Paddy Equivalent),0.155453768731092
Kuwait,Ruminants,0.0444951949075
Kuwait,WheatBarleyOats,0.0444951949075
Kuwait,Monogastrics,0.0444951949075
@@ -687,14 +687,14 @@ Kyrgyzstan,Pulses,0.090676594343
Kyrgyzstan,Starchy Roots,0.090676594343
Kyrgyzstan,MaizeMilletSorghum,0.090676594343
Kyrgyzstan,Rice (Paddy Equivalent),0.090676594343
-Lao People's Democratic Republic,Ruminants,NA
-Lao People's Democratic Republic,WheatBarleyOats,NA
-Lao People's Democratic Republic,Monogastrics,NA
-Lao People's Democratic Republic,Oilcrops,NA
-Lao People's Democratic Republic,Pulses,NA
-Lao People's Democratic Republic,Starchy Roots,NA
-Lao People's Democratic Republic,MaizeMilletSorghum,NA
-Lao People's Democratic Republic,Rice (Paddy Equivalent),NA
+Lao People's Democratic Republic,Ruminants,0.155453768731092
+Lao People's Democratic Republic,WheatBarleyOats,0.155453768731092
+Lao People's Democratic Republic,Monogastrics,0.155453768731092
+Lao People's Democratic Republic,Oilcrops,0.155453768731092
+Lao People's Democratic Republic,Pulses,0.155453768731092
+Lao People's Democratic Republic,Starchy Roots,0.155453768731092
+Lao People's Democratic Republic,MaizeMilletSorghum,0.155453768731092
+Lao People's Democratic Republic,Rice (Paddy Equivalent),0.155453768731092
Latvia,Ruminants,0.157907276381818
Latvia,WheatBarleyOats,0.157907276381818
Latvia,Monogastrics,0.157907276381818
@@ -719,22 +719,22 @@ Lesotho,Pulses,0.137644768
Lesotho,Starchy Roots,0.137644768
Lesotho,MaizeMilletSorghum,0.137644768
Lesotho,Rice (Paddy Equivalent),0.137644768
-Liberia,Ruminants,NA
-Liberia,WheatBarleyOats,NA
-Liberia,Monogastrics,NA
-Liberia,Oilcrops,NA
-Liberia,Pulses,NA
-Liberia,Starchy Roots,NA
-Liberia,MaizeMilletSorghum,NA
-Liberia,Rice (Paddy Equivalent),NA
-Libya,Ruminants,NA
-Libya,WheatBarleyOats,NA
-Libya,Monogastrics,NA
-Libya,Oilcrops,NA
-Libya,Pulses,NA
-Libya,Starchy Roots,NA
-Libya,MaizeMilletSorghum,NA
-Libya,Rice (Paddy Equivalent),NA
+Liberia,Ruminants,0.155453768731092
+Liberia,WheatBarleyOats,0.155453768731092
+Liberia,Monogastrics,0.155453768731092
+Liberia,Oilcrops,0.155453768731092
+Liberia,Pulses,0.155453768731092
+Liberia,Starchy Roots,0.155453768731092
+Liberia,MaizeMilletSorghum,0.155453768731092
+Liberia,Rice (Paddy Equivalent),0.155453768731092
+Libya,Ruminants,0.155453768731092
+Libya,WheatBarleyOats,0.155453768731092
+Libya,Monogastrics,0.155453768731092
+Libya,Oilcrops,0.155453768731092
+Libya,Pulses,0.155453768731092
+Libya,Starchy Roots,0.155453768731092
+Libya,MaizeMilletSorghum,0.155453768731092
+Libya,Rice (Paddy Equivalent),0.155453768731092
Lithuania,Ruminants,0.157907276381818
Lithuania,WheatBarleyOats,0.157907276381818
Lithuania,Monogastrics,0.157907276381818
@@ -893,14 +893,14 @@ Netherlands,Pulses,0.157907276381818
Netherlands,Starchy Roots,0.157907276381818
Netherlands,MaizeMilletSorghum,0.157907276381818
Netherlands,Rice (Paddy Equivalent),0.157907276381818
-New Caledonia,Ruminants,NA
-New Caledonia,WheatBarleyOats,NA
-New Caledonia,Monogastrics,NA
-New Caledonia,Oilcrops,NA
-New Caledonia,Pulses,NA
-New Caledonia,Starchy Roots,NA
-New Caledonia,MaizeMilletSorghum,NA
-New Caledonia,Rice (Paddy Equivalent),NA
+New Caledonia,Ruminants,0.155453768731092
+New Caledonia,WheatBarleyOats,0.155453768731092
+New Caledonia,Monogastrics,0.155453768731092
+New Caledonia,Oilcrops,0.155453768731092
+New Caledonia,Pulses,0.155453768731092
+New Caledonia,Starchy Roots,0.155453768731092
+New Caledonia,MaizeMilletSorghum,0.155453768731092
+New Caledonia,Rice (Paddy Equivalent),0.155453768731092
New Zealand,Ruminants,0.13775332754
New Zealand,WheatBarleyOats,0.13775332754
New Zealand,Monogastrics,0.13775332754
@@ -1045,30 +1045,30 @@ Rwanda,Pulses,0.45228520949
Rwanda,Starchy Roots,0.45228520949
Rwanda,MaizeMilletSorghum,0.45228520949
Rwanda,Rice (Paddy Equivalent),0.45228520949
-Saint Kitts and Nevis,Ruminants,NA
-Saint Kitts and Nevis,WheatBarleyOats,NA
-Saint Kitts and Nevis,Monogastrics,NA
-Saint Kitts and Nevis,Oilcrops,NA
-Saint Kitts and Nevis,Pulses,NA
-Saint Kitts and Nevis,Starchy Roots,NA
-Saint Kitts and Nevis,MaizeMilletSorghum,NA
-Saint Kitts and Nevis,Rice (Paddy Equivalent),NA
-Saint Lucia,Ruminants,NA
-Saint Lucia,WheatBarleyOats,NA
-Saint Lucia,Monogastrics,NA
-Saint Lucia,Oilcrops,NA
-Saint Lucia,Pulses,NA
-Saint Lucia,Starchy Roots,NA
-Saint Lucia,MaizeMilletSorghum,NA
-Saint Lucia,Rice (Paddy Equivalent),NA
-Saint Vincent and the Grenadines,Ruminants,NA
-Saint Vincent and the Grenadines,WheatBarleyOats,NA
-Saint Vincent and the Grenadines,Monogastrics,NA
-Saint Vincent and the Grenadines,Oilcrops,NA
-Saint Vincent and the Grenadines,Pulses,NA
-Saint Vincent and the Grenadines,Starchy Roots,NA
-Saint Vincent and the Grenadines,MaizeMilletSorghum,NA
-Saint Vincent and the Grenadines,Rice (Paddy Equivalent),NA
+Saint Kitts and Nevis,Ruminants,0.155453768731092
+Saint Kitts and Nevis,WheatBarleyOats,0.155453768731092
+Saint Kitts and Nevis,Monogastrics,0.155453768731092
+Saint Kitts and Nevis,Oilcrops,0.155453768731092
+Saint Kitts and Nevis,Pulses,0.155453768731092
+Saint Kitts and Nevis,Starchy Roots,0.155453768731092
+Saint Kitts and Nevis,MaizeMilletSorghum,0.155453768731092
+Saint Kitts and Nevis,Rice (Paddy Equivalent),0.155453768731092
+Saint Lucia,Ruminants,0.155453768731092
+Saint Lucia,WheatBarleyOats,0.155453768731092
+Saint Lucia,Monogastrics,0.155453768731092
+Saint Lucia,Oilcrops,0.155453768731092
+Saint Lucia,Pulses,0.155453768731092
+Saint Lucia,Starchy Roots,0.155453768731092
+Saint Lucia,MaizeMilletSorghum,0.155453768731092
+Saint Lucia,Rice (Paddy Equivalent),0.155453768731092
+Saint Vincent and the Grenadines,Ruminants,0.155453768731092
+Saint Vincent and the Grenadines,WheatBarleyOats,0.155453768731092
+Saint Vincent and the Grenadines,Monogastrics,0.155453768731092
+Saint Vincent and the Grenadines,Oilcrops,0.155453768731092
+Saint Vincent and the Grenadines,Pulses,0.155453768731092
+Saint Vincent and the Grenadines,Starchy Roots,0.155453768731092
+Saint Vincent and the Grenadines,MaizeMilletSorghum,0.155453768731092
+Saint Vincent and the Grenadines,Rice (Paddy Equivalent),0.155453768731092
Samoa,Ruminants,0.13368857104
Samoa,WheatBarleyOats,0.13368857104
Samoa,Monogastrics,0.13368857104
@@ -1108,14 +1108,14 @@ Serbia,Pulses,0.194298260371429
Serbia,Starchy Roots,0.194298260371429
Serbia,MaizeMilletSorghum,0.194298260371429
Serbia,Rice (Paddy Equivalent),0.194298260371429
-Sierra Leone,Ruminants,NA
-Sierra Leone,WheatBarleyOats,NA
-Sierra Leone,Monogastrics,NA
-Sierra Leone,Oilcrops,NA
-Sierra Leone,Pulses,NA
-Sierra Leone,Starchy Roots,NA
-Sierra Leone,MaizeMilletSorghum,NA
-Sierra Leone,Rice (Paddy Equivalent),NA
+Sierra Leone,Ruminants,0.155453768731092
+Sierra Leone,WheatBarleyOats,0.155453768731092
+Sierra Leone,Monogastrics,0.155453768731092
+Sierra Leone,Oilcrops,0.155453768731092
+Sierra Leone,Pulses,0.155453768731092
+Sierra Leone,Starchy Roots,0.155453768731092
+Sierra Leone,MaizeMilletSorghum,0.155453768731092
+Sierra Leone,Rice (Paddy Equivalent),0.155453768731092
Slovakia,Ruminants,0.157907276381818
Slovakia,WheatBarleyOats,0.157907276381818
Slovakia,Monogastrics,0.157907276381818
@@ -1140,14 +1140,14 @@ Solomon Islands,Pulses,1.29292368995
Solomon Islands,Starchy Roots,1.29292368995
Solomon Islands,MaizeMilletSorghum,1.29292368995
Solomon Islands,Rice (Paddy Equivalent),1.29292368995
-Somalia,Ruminants,NA
-Somalia,WheatBarleyOats,NA
-Somalia,Monogastrics,NA
-Somalia,Oilcrops,NA
-Somalia,Pulses,NA
-Somalia,Starchy Roots,NA
-Somalia,MaizeMilletSorghum,NA
-Somalia,Rice (Paddy Equivalent),NA
+Somalia,Ruminants,0.155453768731092
+Somalia,WheatBarleyOats,0.155453768731092
+Somalia,Monogastrics,0.155453768731092
+Somalia,Oilcrops,0.155453768731092
+Somalia,Pulses,0.155453768731092
+Somalia,Starchy Roots,0.155453768731092
+Somalia,MaizeMilletSorghum,0.155453768731092
+Somalia,Rice (Paddy Equivalent),0.155453768731092
South Africa,Ruminants,0.0948316381636364
South Africa,WheatBarleyOats,0.0948316381636364
South Africa,Monogastrics,0.0948316381636364
@@ -1156,14 +1156,14 @@ South Africa,Pulses,0.0948316381636364
South Africa,Starchy Roots,0.0948316381636364
South Africa,MaizeMilletSorghum,0.0948316381636364
South Africa,Rice (Paddy Equivalent),0.0948316381636364
-South Sudan,Ruminants,NA
-South Sudan,WheatBarleyOats,NA
-South Sudan,Monogastrics,NA
-South Sudan,Oilcrops,NA
-South Sudan,Pulses,NA
-South Sudan,Starchy Roots,NA
-South Sudan,MaizeMilletSorghum,NA
-South Sudan,Rice (Paddy Equivalent),NA
+South Sudan,Ruminants,0.155453768731092
+South Sudan,WheatBarleyOats,0.155453768731092
+South Sudan,Monogastrics,0.155453768731092
+South Sudan,Oilcrops,0.155453768731092
+South Sudan,Pulses,0.155453768731092
+South Sudan,Starchy Roots,0.155453768731092
+South Sudan,MaizeMilletSorghum,0.155453768731092
+South Sudan,Rice (Paddy Equivalent),0.155453768731092
Spain,Ruminants,0.157907276381818
Spain,WheatBarleyOats,0.157907276381818
Spain,Monogastrics,0.157907276381818
@@ -1204,14 +1204,14 @@ Suriname,Pulses,0.250357289216667
Suriname,Starchy Roots,0.250357289216667
Suriname,MaizeMilletSorghum,0.250357289216667
Suriname,Rice (Paddy Equivalent),0.250357289216667
-Swaziland,Ruminants,NA
-Swaziland,WheatBarleyOats,NA
-Swaziland,Monogastrics,NA
-Swaziland,Oilcrops,NA
-Swaziland,Pulses,NA
-Swaziland,Starchy Roots,NA
-Swaziland,MaizeMilletSorghum,NA
-Swaziland,Rice (Paddy Equivalent),NA
+Swaziland,Ruminants,0.155453768731092
+Swaziland,WheatBarleyOats,0.155453768731092
+Swaziland,Monogastrics,0.155453768731092
+Swaziland,Oilcrops,0.155453768731092
+Swaziland,Pulses,0.155453768731092
+Swaziland,Starchy Roots,0.155453768731092
+Swaziland,MaizeMilletSorghum,0.155453768731092
+Swaziland,Rice (Paddy Equivalent),0.155453768731092
Sweden,Ruminants,0.157907276381818
Sweden,WheatBarleyOats,0.157907276381818
Sweden,Monogastrics,0.157907276381818
@@ -1228,14 +1228,14 @@ Switzerland,Pulses,0.236640530736364
Switzerland,Starchy Roots,0.236640530736364
Switzerland,MaizeMilletSorghum,0.236640530736364
Switzerland,Rice (Paddy Equivalent),0.236640530736364
-Tajikistan,Ruminants,NA
-Tajikistan,WheatBarleyOats,NA
-Tajikistan,Monogastrics,NA
-Tajikistan,Oilcrops,NA
-Tajikistan,Pulses,NA
-Tajikistan,Starchy Roots,NA
-Tajikistan,MaizeMilletSorghum,NA
-Tajikistan,Rice (Paddy Equivalent),NA
+Tajikistan,Ruminants,0.155453768731092
+Tajikistan,WheatBarleyOats,0.155453768731092
+Tajikistan,Monogastrics,0.155453768731092
+Tajikistan,Oilcrops,0.155453768731092
+Tajikistan,Pulses,0.155453768731092
+Tajikistan,Starchy Roots,0.155453768731092
+Tajikistan,MaizeMilletSorghum,0.155453768731092
+Tajikistan,Rice (Paddy Equivalent),0.155453768731092
Thailand,Ruminants,0.23832229185
Thailand,WheatBarleyOats,0.23832229185
Thailand,Monogastrics,0.23832229185
@@ -1244,14 +1244,14 @@ Thailand,Pulses,0.23832229185
Thailand,Starchy Roots,0.23832229185
Thailand,MaizeMilletSorghum,0.23832229185
Thailand,Rice (Paddy Equivalent),0.23832229185
-The former Yugoslav Republic of Macedonia,Ruminants,NA
-The former Yugoslav Republic of Macedonia,WheatBarleyOats,NA
-The former Yugoslav Republic of Macedonia,Monogastrics,NA
-The former Yugoslav Republic of Macedonia,Oilcrops,NA
-The former Yugoslav Republic of Macedonia,Pulses,NA
-The former Yugoslav Republic of Macedonia,Starchy Roots,NA
-The former Yugoslav Republic of Macedonia,MaizeMilletSorghum,NA
-The former Yugoslav Republic of Macedonia,Rice (Paddy Equivalent),NA
+The former Yugoslav Republic of Macedonia,Ruminants,0.155453768731092
+The former Yugoslav Republic of Macedonia,WheatBarleyOats,0.155453768731092
+The former Yugoslav Republic of Macedonia,Monogastrics,0.155453768731092
+The former Yugoslav Republic of Macedonia,Oilcrops,0.155453768731092
+The former Yugoslav Republic of Macedonia,Pulses,0.155453768731092
+The former Yugoslav Republic of Macedonia,Starchy Roots,0.155453768731092
+The former Yugoslav Republic of Macedonia,MaizeMilletSorghum,0.155453768731092
+The former Yugoslav Republic of Macedonia,Rice (Paddy Equivalent),0.155453768731092
Togo,Ruminants,0.18956996974
Togo,WheatBarleyOats,0.18956996974
Togo,Monogastrics,0.18956996974
@@ -1284,14 +1284,14 @@ Turkey,Pulses,0.168053984955556
Turkey,Starchy Roots,0.168053984955556
Turkey,MaizeMilletSorghum,0.168053984955556
Turkey,Rice (Paddy Equivalent),0.168053984955556
-Turkmenistan,Ruminants,NA
-Turkmenistan,WheatBarleyOats,NA
-Turkmenistan,Monogastrics,NA
-Turkmenistan,Oilcrops,NA
-Turkmenistan,Pulses,NA
-Turkmenistan,Starchy Roots,NA
-Turkmenistan,MaizeMilletSorghum,NA
-Turkmenistan,Rice (Paddy Equivalent),NA
+Turkmenistan,Ruminants,0.155453768731092
+Turkmenistan,WheatBarleyOats,0.155453768731092
+Turkmenistan,Monogastrics,0.155453768731092
+Turkmenistan,Oilcrops,0.155453768731092
+Turkmenistan,Pulses,0.155453768731092
+Turkmenistan,Starchy Roots,0.155453768731092
+Turkmenistan,MaizeMilletSorghum,0.155453768731092
+Turkmenistan,Rice (Paddy Equivalent),0.155453768731092
Uganda,Ruminants,0.520223978672727
Uganda,WheatBarleyOats,0.520223978672727
Uganda,Monogastrics,0.520223978672727
@@ -1348,14 +1348,14 @@ Uruguay,Pulses,0.148832692809091
Uruguay,Starchy Roots,0.148832692809091
Uruguay,MaizeMilletSorghum,0.148832692809091
Uruguay,Rice (Paddy Equivalent),0.148832692809091
-Uzbekistan,Ruminants,NA
-Uzbekistan,WheatBarleyOats,NA
-Uzbekistan,Monogastrics,NA
-Uzbekistan,Oilcrops,NA
-Uzbekistan,Pulses,NA
-Uzbekistan,Starchy Roots,NA
-Uzbekistan,MaizeMilletSorghum,NA
-Uzbekistan,Rice (Paddy Equivalent),NA
+Uzbekistan,Ruminants,0.155453768731092
+Uzbekistan,WheatBarleyOats,0.155453768731092
+Uzbekistan,Monogastrics,0.155453768731092
+Uzbekistan,Oilcrops,0.155453768731092
+Uzbekistan,Pulses,0.155453768731092
+Uzbekistan,Starchy Roots,0.155453768731092
+Uzbekistan,MaizeMilletSorghum,0.155453768731092
+Uzbekistan,Rice (Paddy Equivalent),0.155453768731092
Vanuatu,Ruminants,0.473323615866667
Vanuatu,WheatBarleyOats,0.473323615866667
Vanuatu,Monogastrics,0.473323615866667
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index d8e32ced..d6bb51ec 100755
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -361,7 +361,6 @@ public class ModelConfig {
public static final double TRADE_BARRIER_FACTOR_DEFAULT = getDoubleProperty("TRADE_BARRIER_FACTOR_DEFAULT", 0.2); // price factor in international trade, transport cost and real trade barriers
public static final double TRADE_BARRIER_MULTIPLIER = getDoubleProperty("TRADE_BARRIER_MULTIPLIER", 1.0);
public static final boolean ACTIVE_TRADE_BARRIERS = getBooleanProperty("ACTIVE_TRADE_BARRIERS", true); // if set to true read in barrier information from file, otherwise use default as above
- public static final boolean ACTIVE_TRADE_DISTORTIONS = getBooleanProperty("ACTIVE_TRADE_DISTORTIONS", false); // if set to true read in distortions information from file
public static final boolean SHOCKS_POSSIBLE = getBooleanProperty("SHOCKS_POSSIBLE", false);
public static final double YIELD_SHOCK_MAGNIFIER = getDoubleProperty("YIELD_SHOCK_MAGNIFIER", 1.0);
diff --git a/src/ac/ed/lurg/country/TradeManager.java b/src/ac/ed/lurg/country/TradeManager.java
index 23031014..55c6ac5d 100644
--- a/src/ac/ed/lurg/country/TradeManager.java
+++ b/src/ac/ed/lurg/country/TradeManager.java
@@ -18,7 +18,6 @@ public class TradeManager {
private static final int COUNTRY_COL = 0;
private static final int ITEM_COL = 1;
private static final int TRADE_BARRIER_COL = 2;
- private static final int TRADE_DISTORTION_COL = 3;
private CompositeCountryManager compositeCountryManager;
private Map<CompositeCountry, CropToDoubleMap> tradeMap = new HashMap<CompositeCountry, CropToDoubleMap>();
@@ -53,7 +52,7 @@ public class TradeManager {
try {
BufferedReader reader = new BufferedReader(new FileReader(filename));
String line, countryName, itemName;
- double barrierValue,distortionsValue;
+ double barrierValue;
reader.readLine(); // read header
while ((line=reader.readLine()) != null) {
@@ -67,8 +66,6 @@ public class TradeManager {
countryName = tokens[COUNTRY_COL];
itemName = tokens[ITEM_COL];
barrierValue = Double.parseDouble(tokens[TRADE_BARRIER_COL]);
- distortionsValue= Double.parseDouble(tokens[TRADE_DISTORTION_COL]);
-
SingleCountry country = CountryManager.getForName(countryName);
@@ -87,8 +84,7 @@ public class TradeManager {
}
- double tradeBarriersValue = (ModelConfig.ACTIVE_TRADE_DISTORTIONS) ? barrierValue+distortionsValue : barrierValue;
- countryData.incrementValue(crop, tradeBarriersValue);
+ countryData.incrementValue(crop, barrierValue);
}
} catch (Exception e) {
LogWriter.printlnError("Failed in processing trade barriers line " + line);
diff --git a/src/ac/ed/lurg/yield/YieldClusterPoint.java b/src/ac/ed/lurg/yield/YieldClusterPoint.java
index 75943f04..710e9ce7 100644
--- a/src/ac/ed/lurg/yield/YieldClusterPoint.java
+++ b/src/ac/ed/lurg/yield/YieldClusterPoint.java
@@ -40,7 +40,7 @@ public class YieldClusterPoint implements ClusteringPoint<String> {
this.pasture = yields.getYield(YieldType.NO_FERT_NO_IRRIG, CropType.PASTURE);
this.wheatMax = yields.getYield(YieldType.FERT_MAX_IRRIG_MAX, CropType.WHEAT);
this.maizeMax = yields.getYield(YieldType.FERT_MAX_IRRIG_MAX, CropType.MAIZE);
- this.irrigWaterAval = irrigItem.getIrrigConstraint();
+ this.irrigWaterAval = (irrigItem==null) ? 0.0 :irrigItem.getIrrigConstraint();
this.protectedArea = protectedArea;
}
--
GitLab