From bdfd3c65621d5e13c4446f5b0db9684fc7a6424b Mon Sep 17 00:00:00 2001
From: Peter Alexander <peter@blackhillock.co.uk>
Date: Fri, 29 Mar 2019 18:49:42 +0000
Subject: [PATCH] Update to price file and bug fix (getGdp when should have
been getGdpPc)
---
data/consumerprices.csv | 140 +++++++++---------
.../ed/lurg/demand/ElasticDemandManager.java | 2 +-
2 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/data/consumerprices.csv b/data/consumerprices.csv
index 1e678890..5ee99cc0 100644
--- a/data/consumerprices.csv
+++ b/data/consumerprices.csv
@@ -9,7 +9,7 @@ cereals,Bangladesh,57.44643753
cereals,Belarus,79.37254981
cereals,Belgium,89.60145604
cereals,Benin,57.23949638
-cereals,Bolivia,88.19542403
+cereals,Bolivia (Plurinational State of),88.19542403
cereals,Bosnia and Herzegovina,66.07764316
cereals,Botswana,87.978832
cereals,Brazil,76.86212031
@@ -19,7 +19,7 @@ cereals,Cambodia,142.183393740106
cereals,Cameroon,142.183393740106
cereals,Canada,58.96490274
cereals,Chile,71.8228135
-cereals,China mainland,142.183393740106
+cereals,China,142.183393740106
cereals,Colombia,105.1776711
cereals,Costa Rica,124.7361464
cereals,Cote d'Ivoire,95.86913838
@@ -43,7 +43,7 @@ cereals,Honduras,85.45743913
cereals,Hungary,65.24211288
cereals,India,140.2908587
cereals,Indonesia,102.2681274
-cereals,Iran,93.4662057
+cereals,Iran (Islamic Republic of),93.4662057
cereals,Ireland,73.49546335
cereals,Israel,87.24472743
cereals,Italy,92.39489174
@@ -51,16 +51,16 @@ cereals,Jamaica,100.232425
cereals,Japan,142.183393740106
cereals,Jordan,87.8739542
cereals,Kazakhstan,55.61665767
-cereals,Laos,90.15108507
+cereals,Lao People's Democratic Republic,90.15108507
cereals,Latvia,64.49261477
cereals,Lebanon,75.23512148
cereals,Libya,126.7891998
cereals,Lithuania,60.13754357
-cereals,Macedonia,81.9077207
+cereals,The former Yugoslav Republic of Macedonia,81.9077207
cereals,Malaysia,124.471823
cereals,Mauritius,112.0463784
cereals,Mexico,61.98573728
-cereals,Moldova,55.18331126
+cereals,Republic of Moldova,55.18331126
cereals,Morocco,90.68941315
cereals,Namibia,117.4142724
cereals,Nepal,62.40567158
@@ -87,7 +87,7 @@ cereals,Sri Lanka,142.183393740106
cereals,Sweden,81.90087767
cereals,Switzerland,142.183393740106
cereals,Tajikistan,100.114447
-cereals,Tanzania,142.183393740106
+cereals,United Republic of Tanzania,142.183393740106
cereals,Thailand,112.4957682
cereals,Togo,79.9804073
cereals,Trinidad and Tobago,132.7981335
@@ -95,10 +95,10 @@ cereals,Tunisia,135.6437251
cereals,Turkey,124.0774798
cereals,Ukraine,51.08451345
cereals,United Kingdom,75.39661882
-cereals,United States,79.97711495
+cereals,United States of America,79.97711495
cereals,Uruguay,76.49946823
-cereals,Venezuela,90.4800469
-cereals,Vietnam,97.4612592
+cereals,Venezuela (Bolivarian Republic of),90.4800469
+cereals,Viet Nam,97.4612592
cereals,Yemen,80.02762914
cereals,Zambia,85.9706484
starchyRoots,Albania,622.9962558
@@ -111,7 +111,7 @@ starchyRoots,Bangladesh,136.5161832
starchyRoots,Belarus,325.7656344
starchyRoots,Belgium,197.0185213
starchyRoots,Benin,203.1122055
-starchyRoots,Bolivia,133.2559006
+starchyRoots,Bolivia (Plurinational State of),133.2559006
starchyRoots,Bosnia and Herzegovina,625.8903706
starchyRoots,Botswana,919.68106364012
starchyRoots,Brazil,350.9443858
@@ -121,7 +121,7 @@ starchyRoots,Cambodia,106.1909012
starchyRoots,Cameroon,249.2970788
starchyRoots,Canada,495.7045827
starchyRoots,Chile,919.68106364012
-starchyRoots,China mainland,388.2665783
+starchyRoots,China,388.2665783
starchyRoots,Colombia,919.68106364012
starchyRoots,Costa Rica,822.2068221
starchyRoots,Cote d'Ivoire,217.8099367
@@ -145,7 +145,7 @@ starchyRoots,Honduras,838.1913939
starchyRoots,Hungary,377.5415201
starchyRoots,India,323.2752148
starchyRoots,Indonesia,253.8105169
-starchyRoots,Iran,389.5170366
+starchyRoots,Iran (Islamic Republic of),389.5170366
starchyRoots,Ireland,664.7867577
starchyRoots,Israel,544.400913
starchyRoots,Italy,528.3055646
@@ -153,16 +153,16 @@ starchyRoots,Jamaica,919.68106364012
starchyRoots,Japan,748.7709181
starchyRoots,Jordan,500.136201
starchyRoots,Kazakhstan,217.1865539
-starchyRoots,Laos,244.6692567
+starchyRoots,Lao People's Democratic Republic,244.6692567
starchyRoots,Latvia,390.3187509
starchyRoots,Lebanon,414.1337364
starchyRoots,Libya,739.8821445
starchyRoots,Lithuania,524.4879805
-starchyRoots,Macedonia,523.0153499
+starchyRoots,The former Yugoslav Republic of Macedonia,523.0153499
starchyRoots,Malaysia,409.3995811
starchyRoots,Mauritius,466.7338251
starchyRoots,Mexico,520.2257729
-starchyRoots,Moldova,194.3873448
+starchyRoots,Republic of Moldova,194.3873448
starchyRoots,Morocco,690.7035896
starchyRoots,Namibia,919.68106364012
starchyRoots,Nepal,179.5248421
@@ -189,7 +189,7 @@ starchyRoots,Sri Lanka,319.1937544
starchyRoots,Sweden,454.1228027
starchyRoots,Switzerland,919.68106364012
starchyRoots,Tajikistan,454.6921669
-starchyRoots,Tanzania,313.9428676
+starchyRoots,United Republic of Tanzania,313.9428676
starchyRoots,Thailand,401.1825951
starchyRoots,Togo,255.069219
starchyRoots,Trinidad and Tobago,400.299443
@@ -197,10 +197,10 @@ starchyRoots,Tunisia,905.0758923
starchyRoots,Turkey,529.2720359
starchyRoots,Ukraine,597.5390536
starchyRoots,United Kingdom,607.2211771
-starchyRoots,United States,537.1597878
+starchyRoots,United States of America,537.1597878
starchyRoots,Uruguay,638.3695014
-starchyRoots,Venezuela,889.1777957
-starchyRoots,Vietnam,177.9572154
+starchyRoots,Venezuela (Bolivarian Republic of),889.1777957
+starchyRoots,Viet Nam,177.9572154
starchyRoots,Yemen,566.8015755
starchyRoots,Zambia,147.8989971
oilcropspulses,Albania,221.11562397506
@@ -213,7 +213,7 @@ oilcropspulses,Bangladesh,101.5271305
oilcropspulses,Belarus,94.14274185
oilcropspulses,Belgium,140.332698
oilcropspulses,Benin,117.6262068
-oilcropspulses,Bolivia,108.4379793
+oilcropspulses,Bolivia (Plurinational State of),108.4379793
oilcropspulses,Bosnia and Herzegovina,140.5182958
oilcropspulses,Botswana,153.4150045
oilcropspulses,Brazil,181.1258838
@@ -223,7 +223,7 @@ oilcropspulses,Cambodia,95.92683321
oilcropspulses,Cameroon,161.5329208
oilcropspulses,Canada,115.8679587
oilcropspulses,Chile,190.863536
-oilcropspulses,China mainland,116.8049131
+oilcropspulses,China,116.8049131
oilcropspulses,Colombia,103.386879
oilcropspulses,Costa Rica,128.2583717
oilcropspulses,Cote d'Ivoire,122.67404
@@ -247,7 +247,7 @@ oilcropspulses,Honduras,146.2751856
oilcropspulses,Hungary,121.9977354
oilcropspulses,India,131.6808514
oilcropspulses,Indonesia,111.8359023
-oilcropspulses,Iran,126.729151
+oilcropspulses,Iran (Islamic Republic of),126.729151
oilcropspulses,Ireland,172.1020695
oilcropspulses,Israel,159.0836661
oilcropspulses,Italy,177.6525637
@@ -255,16 +255,16 @@ oilcropspulses,Jamaica,221.11562397506
oilcropspulses,Japan,135.4152914
oilcropspulses,Jordan,207.4869201
oilcropspulses,Kazakhstan,84.9754705
-oilcropspulses,Laos,140.999568
+oilcropspulses,Lao People's Democratic Republic,140.999568
oilcropspulses,Latvia,138.426695
oilcropspulses,Lebanon,164.9569679
oilcropspulses,Libya,147.9341942
oilcropspulses,Lithuania,120.3215783
-oilcropspulses,Macedonia,122.9376001
+oilcropspulses,The former Yugoslav Republic of Macedonia,122.9376001
oilcropspulses,Malaysia,92.11793634
oilcropspulses,Mauritius,112.0849862
oilcropspulses,Mexico,124.4810853
-oilcropspulses,Moldova,73.08763274
+oilcropspulses,Republic of Moldova,73.08763274
oilcropspulses,Morocco,138.5174005
oilcropspulses,Namibia,202.0058409
oilcropspulses,Nepal,107.8396696
@@ -291,7 +291,7 @@ oilcropspulses,Sri Lanka,192.1423149
oilcropspulses,Sweden,138.2433855
oilcropspulses,Switzerland,221.11562397506
oilcropspulses,Tajikistan,144.6866249
-oilcropspulses,Tanzania,148.7252875
+oilcropspulses,United Republic of Tanzania,148.7252875
oilcropspulses,Thailand,177.2312846
oilcropspulses,Togo,109.1875469
oilcropspulses,Trinidad and Tobago,174.3187867
@@ -299,10 +299,10 @@ oilcropspulses,Tunisia,143.0447591
oilcropspulses,Turkey,171.2320848
oilcropspulses,Ukraine,81.75135656
oilcropspulses,United Kingdom,124.8175039
-oilcropspulses,United States,111.8854923
+oilcropspulses,United States of America,111.8854923
oilcropspulses,Uruguay,144.0381733
-oilcropspulses,Venezuela,118.5787589
-oilcropspulses,Vietnam,147.6662518
+oilcropspulses,Venezuela (Bolivarian Republic of),118.5787589
+oilcropspulses,Viet Nam,147.6662518
oilcropspulses,Yemen,78.3068284
oilcropspulses,Zambia,113.556785
sugar,Albania,243.41563812338
@@ -315,7 +315,7 @@ sugar,Bangladesh,160.6460709
sugar,Belarus,169.3088349
sugar,Belgium,153.8338815
sugar,Benin,101.9497456
-sugar,Bolivia,106.7758592
+sugar,Bolivia (Plurinational State of),106.7758592
sugar,Bosnia and Herzegovina,213.7561662
sugar,Botswana,243.41563812338
sugar,Brazil,97.3271165
@@ -325,7 +325,7 @@ sugar,Cambodia,208.6447322
sugar,Cameroon,165.7052506
sugar,Canada,183.2204301
sugar,Chile,130.4245185
-sugar,China mainland,188.9751258
+sugar,China,188.9751258
sugar,Colombia,119.0241462
sugar,Costa Rica,154.7559642
sugar,Cote d'Ivoire,149.5856568
@@ -349,7 +349,7 @@ sugar,Honduras,132.8160403
sugar,Hungary,139.1784734
sugar,India,133.6704135
sugar,Indonesia,144.2674492
-sugar,Iran,148.3373256
+sugar,Iran (Islamic Republic of),148.3373256
sugar,Ireland,221.041738
sugar,Israel,154.7864933
sugar,Italy,158.5384916
@@ -357,16 +357,16 @@ sugar,Jamaica,145.1489451
sugar,Japan,243.41563812338
sugar,Jordan,148.0204367
sugar,Kazakhstan,132.1824922
-sugar,Laos,222.3385277
+sugar,Lao People's Democratic Republic,222.3385277
sugar,Latvia,176.9408183
sugar,Lebanon,188.1214814
sugar,Libya,107.9961537
sugar,Lithuania,183.8728701
-sugar,Macedonia,155.2953263
+sugar,The former Yugoslav Republic of Macedonia,155.2953263
sugar,Malaysia,137.3472938
sugar,Mauritius,132.2308204
sugar,Mexico,153.7907688
-sugar,Moldova,161.6624437
+sugar,Republic of Moldova,161.6624437
sugar,Morocco,100.9084271
sugar,Namibia,217.0628669
sugar,Nepal,111.2535617
@@ -393,7 +393,7 @@ sugar,Sri Lanka,131.1277754
sugar,Sweden,174.2968704
sugar,Switzerland,180.3225964
sugar,Tajikistan,168.2572359
-sugar,Tanzania,235.8783932
+sugar,United Republic of Tanzania,235.8783932
sugar,Thailand,99.598198
sugar,Togo,79.19037477662
sugar,Trinidad and Tobago,79.19037477662
@@ -401,10 +401,10 @@ sugar,Tunisia,163.004311
sugar,Turkey,150.5763826
sugar,Ukraine,201.0693249
sugar,United Kingdom,171.537862
-sugar,United States,197.7838808
+sugar,United States of America,197.7838808
sugar,Uruguay,135.5747425
-sugar,Venezuela,87.11431924
-sugar,Vietnam,159.8005345
+sugar,Venezuela (Bolivarian Republic of),87.11431924
+sugar,Viet Nam,159.8005345
sugar,Yemen,117.7933137
sugar,Zambia,140.9802926
fruitveg,Albania,2372.19619
@@ -417,7 +417,7 @@ fruitveg,Bangladesh,2223.798275
fruitveg,Belarus,2976.009494
fruitveg,Belgium,2788.137866
fruitveg,Benin,3059.040142
-fruitveg,Bolivia,1029.790401
+fruitveg,Bolivia (Plurinational State of),1029.790401
fruitveg,Bosnia and Herzegovina,2504.159861
fruitveg,Botswana,4574.06158445
fruitveg,Brazil,1858.600925
@@ -427,7 +427,7 @@ fruitveg,Cambodia,1305.682513
fruitveg,Cameroon,1428.739068
fruitveg,Canada,3087.84287
fruitveg,Chile,2874.664805
-fruitveg,China mainland,2761.06552
+fruitveg,China,2761.06552
fruitveg,Colombia,1669.240015
fruitveg,Costa Rica,1627.526919
fruitveg,Cote d'Ivoire,1472.258859
@@ -451,7 +451,7 @@ fruitveg,Honduras,1444.863219
fruitveg,Hungary,2196.759321
fruitveg,India,1603.281272
fruitveg,Indonesia,1635.308944
-fruitveg,Iran,2123.699881
+fruitveg,Iran (Islamic Republic of),2123.699881
fruitveg,Ireland,4179.123552
fruitveg,Israel,4574.06158445
fruitveg,Italy,3646.703559
@@ -459,16 +459,16 @@ fruitveg,Jamaica,3299.269589
fruitveg,Japan,4574.06158445
fruitveg,Jordan,2356.963338
fruitveg,Kazakhstan,2991.873368
-fruitveg,Laos,3503.532017
+fruitveg,Lao People's Democratic Republic,3503.532017
fruitveg,Latvia,3547.795985
fruitveg,Lebanon,1945.031105
fruitveg,Libya,1864.948853
fruitveg,Lithuania,3815.60173
-fruitveg,Macedonia,1884.801427
+fruitveg,The former Yugoslav Republic of Macedonia,1884.801427
fruitveg,Malaysia,1386.048222
fruitveg,Mauritius,3921.798973
fruitveg,Mexico,2269.315685
-fruitveg,Moldova,2132.050718
+fruitveg,Republic of Moldova,2132.050718
fruitveg,Morocco,2742.101007
fruitveg,Namibia,4259.796793
fruitveg,Nepal,1785.334633
@@ -495,7 +495,7 @@ fruitveg,Sri Lanka,1387.466196
fruitveg,Sweden,3520.262095
fruitveg,Switzerland,4574.06158445
fruitveg,Tajikistan,2671.742929
-fruitveg,Tanzania,1442.945586
+fruitveg,United Republic of Tanzania,1442.945586
fruitveg,Thailand,3213.469106
fruitveg,Togo,2128.099838
fruitveg,Trinidad and Tobago,2433.225931
@@ -503,10 +503,10 @@ fruitveg,Tunisia,4574.06158445
fruitveg,Turkey,2522.289638
fruitveg,Ukraine,2113.083896
fruitveg,United Kingdom,3146.658808
-fruitveg,United States,2803.108364
+fruitveg,United States of America,2803.108364
fruitveg,Uruguay,2250.469367
-fruitveg,Venezuela,2525.508269
-fruitveg,Vietnam,3197.6771
+fruitveg,Venezuela (Bolivarian Republic of),2525.508269
+fruitveg,Viet Nam,3197.6771
fruitveg,Yemen,982.6973265
fruitveg,Zambia,4574.06158445
ruminants,Albania,471.7523856
@@ -519,7 +519,7 @@ ruminants,Bangladesh,1045.400534
ruminants,Belarus,792.3386163
ruminants,Belgium,741.3649117
ruminants,Benin,581.2460453
-ruminants,Bolivia,690.769975
+ruminants,Bolivia (Plurinational State of),690.769975
ruminants,Bosnia and Herzegovina,754.4064957
ruminants,Botswana,1342.357639
ruminants,Brazil,833.0336289
@@ -529,7 +529,7 @@ ruminants,Cambodia,1445.76882554432
ruminants,Cameroon,1445.76882554432
ruminants,Canada,991.0792445
ruminants,Chile,1006.860106
-ruminants,China mainland,719.3683338
+ruminants,China,719.3683338
ruminants,Colombia,1181.604304
ruminants,Costa Rica,636.6212808
ruminants,Cote d'Ivoire,1445.76882554432
@@ -553,7 +553,7 @@ ruminants,Honduras,691.9648457
ruminants,Hungary,450.5923083
ruminants,India,660.7409701
ruminants,Indonesia,825.6028816
-ruminants,Iran,1445.76882554432
+ruminants,Iran (Islamic Republic of),1445.76882554432
ruminants,Ireland,792.9994557
ruminants,Israel,1445.76882554432
ruminants,Italy,1309.123501
@@ -561,16 +561,16 @@ ruminants,Jamaica,871.6951648
ruminants,Japan,1445.76882554432
ruminants,Jordan,788.29226
ruminants,Kazakhstan,689.616268
-ruminants,Laos,1445.76882554432
+ruminants,Lao People's Democratic Republic,1445.76882554432
ruminants,Latvia,435.9150061
ruminants,Lebanon,1445.76882554432
ruminants,Libya,325.6716682
ruminants,Lithuania,550.3116751
-ruminants,Macedonia,715.1734737
+ruminants,The former Yugoslav Republic of Macedonia,715.1734737
ruminants,Malaysia,547.8845888
ruminants,Mauritius,921.9835373
ruminants,Mexico,959.846144
-ruminants,Moldova,267.473278
+ruminants,Republic of Moldova,267.473278
ruminants,Morocco,1445.76882554432
ruminants,Namibia,1445.76882554432
ruminants,Nepal,631.0101377
@@ -597,7 +597,7 @@ ruminants,Sri Lanka,867.3935138
ruminants,Sweden,887.9397178
ruminants,Switzerland,1445.76882554432
ruminants,Tajikistan,997.7770931
-ruminants,Tanzania,681.5113153
+ruminants,United Republic of Tanzania,681.5113153
ruminants,Thailand,459.1178988
ruminants,Togo,513.3686663
ruminants,Trinidad and Tobago,732.3204339
@@ -605,10 +605,10 @@ ruminants,Tunisia,1445.76882554432
ruminants,Turkey,1445.76882554432
ruminants,Ukraine,581.0564832
ruminants,United Kingdom,904.8860692
-ruminants,United States,797.7844668
+ruminants,United States of America,797.7844668
ruminants,Uruguay,1032.953949
-ruminants,Venezuela,1445.76882554432
-ruminants,Vietnam,723.3069675
+ruminants,Venezuela (Bolivarian Republic of),1445.76882554432
+ruminants,Viet Nam,723.3069675
ruminants,Yemen,449.9112561
ruminants,Zambia,1445.76882554432
monogastrics,Albania,775.8964451
@@ -621,7 +621,7 @@ monogastrics,Bangladesh,1214.338793
monogastrics,Belarus,1279.849134
monogastrics,Belgium,1560.570322
monogastrics,Benin,1064.422535
-monogastrics,Bolivia,1368.326375
+monogastrics,Bolivia (Plurinational State of),1368.326375
monogastrics,Bosnia and Herzegovina,1341.227045
monogastrics,Botswana,1977.864785
monogastrics,Brazil,1091.12286
@@ -631,7 +631,7 @@ monogastrics,Cambodia,901.0135671
monogastrics,Cameroon,1634.934993
monogastrics,Canada,1931.48315
monogastrics,Chile,1174.115475
-monogastrics,China mainland,580.1221573
+monogastrics,China,580.1221573
monogastrics,Colombia,1408.737158
monogastrics,Costa Rica,1610.709601
monogastrics,Cote d'Ivoire,2146.974805
@@ -655,7 +655,7 @@ monogastrics,Honduras,876.8733212
monogastrics,Hungary,1395.367813
monogastrics,India,1496.406606
monogastrics,Indonesia,946.2689629
-monogastrics,Iran,1833.172895
+monogastrics,Iran (Islamic Republic of),1833.172895
monogastrics,Ireland,1415.886153
monogastrics,Israel,2164.9992973776
monogastrics,Italy,1672.386644
@@ -663,16 +663,16 @@ monogastrics,Jamaica,1003.138399
monogastrics,Japan,2164.9992973776
monogastrics,Jordan,1191.862848
monogastrics,Kazakhstan,814.8992383
-monogastrics,Laos,1039.381184
+monogastrics,Lao People's Democratic Republic,1039.381184
monogastrics,Latvia,1080.68315
monogastrics,Lebanon,1759.76048
monogastrics,Libya,1110.918013
monogastrics,Lithuania,1051.214808
-monogastrics,Macedonia,1407.656961
+monogastrics,The former Yugoslav Republic of Macedonia,1407.656961
monogastrics,Malaysia,1188.726783
monogastrics,Mauritius,2164.9992973776
monogastrics,Mexico,872.9418119
-monogastrics,Moldova,848.9258778
+monogastrics,Republic of Moldova,848.9258778
monogastrics,Morocco,2164.9992973776
monogastrics,Namibia,1608.141046
monogastrics,Nepal,996.825767
@@ -699,7 +699,7 @@ monogastrics,Sri Lanka,1677.169832
monogastrics,Sweden,1887.15737
monogastrics,Switzerland,1929.199911
monogastrics,Tajikistan,1502.166663
-monogastrics,Tanzania,794.2390127
+monogastrics,United Republic of Tanzania,794.2390127
monogastrics,Thailand,739.3409538
monogastrics,Togo,531.1234636224
monogastrics,Trinidad and Tobago,1127.936245
@@ -707,9 +707,9 @@ monogastrics,Tunisia,1753.388795
monogastrics,Turkey,1308.068828
monogastrics,Ukraine,1545.779083
monogastrics,United Kingdom,1299.952635
-monogastrics,United States,1006.221832
+monogastrics,United States of America,1006.221832
monogastrics,Uruguay,1354.895716
-monogastrics,Venezuela,1931.368557
-monogastrics,Vietnam,794.1845411
+monogastrics,Venezuela (Bolivarian Republic of),1931.368557
+monogastrics,Viet Nam,794.1845411
monogastrics,Yemen,1295.510318
monogastrics,Zambia,1023.744932
diff --git a/src/ac/ed/lurg/demand/ElasticDemandManager.java b/src/ac/ed/lurg/demand/ElasticDemandManager.java
index e444f9c1..7512ffcc 100755
--- a/src/ac/ed/lurg/demand/ElasticDemandManager.java
+++ b/src/ac/ed/lurg/demand/ElasticDemandManager.java
@@ -71,7 +71,7 @@ public class ElasticDemandManager extends AbstractSSPDemandManager {
Map<CommodityType, Double> foodDemands = new HashMap<CommodityType, Double>();
SspData baseSspData = sspManager.get(ssp_scenario, ModelConfig.BASE_YEAR, c);
- double baseGdpPc = baseSspData.getGdp();
+ double baseGdpPc = baseSspData.getGdpPc();
Map<CommodityType, Double> baseExpCpcMap = baseCpcCache.get(c);
if (baseExpCpcMap == null) { // we should only do this in the first year
--
GitLab