Updated MAIDADS parameters and other changes to demand. Base year now 2020.
Showing
- GAMS/IntExtOpt.gms 5 additions, 11 deletionsGAMS/IntExtOpt.gms
- data/DemandParamConv.gdx 0 additions, 0 deletionsdata/DemandParamConv.gdx
- data/animal_numbers.csv 1432 additions, 1444 deletionsdata/animal_numbers.csv
- data/base_consump.csv 1267 additions, 1267 deletionsdata/base_consump.csv
- data/base_demand_fracts.csv 1982 additions, 1801 deletionsdata/base_demand_fracts.csv
- data/bio_demand.csv 960 additions, 960 deletionsdata/bio_demand.csv
- data/calories_per_t.csv 1267 additions, 1267 deletionsdata/calories_per_t.csv
- data/consumerprices.csv 1449 additions, 1276 deletionsdata/consumerprices.csv
- data/global_stocks.csv 11 additions, 11 deletionsdata/global_stocks.csv
- data/net_imports.csv 1791 additions, 1791 deletionsdata/net_imports.csv
- data/production.csv 1793 additions, 1793 deletionsdata/production.csv
- src/ac/ed/lurg/ModelConfig.java 24 additions, 24 deletionssrc/ac/ed/lurg/ModelConfig.java
- src/ac/ed/lurg/country/AbstractCountryAgent.java 4 additions, 4 deletionssrc/ac/ed/lurg/country/AbstractCountryAgent.java
- src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java 1 addition, 1 deletionsrc/ac/ed/lurg/country/crafty/CraftyCountryAgent.java
- src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java 35 additions, 23 deletionssrc/ac/ed/lurg/country/gams/GamsDemandOptimiser.java
- src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java 11 additions, 13 deletionssrc/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
- src/ac/ed/lurg/demand/AbstractSSPDemandManager.java 2 additions, 0 deletionssrc/ac/ed/lurg/demand/AbstractSSPDemandManager.java
- src/ac/ed/lurg/demand/ElasticDemandManager.java 7 additions, 2 deletionssrc/ac/ed/lurg/demand/ElasticDemandManager.java
- src/ac/ed/lurg/types/CommodityType.java 17 additions, 9 deletionssrc/ac/ed/lurg/types/CommodityType.java
- src/ac/ed/lurg/types/CropType.java 8 additions, 8 deletionssrc/ac/ed/lurg/types/CropType.java
Loading
Please register or sign in to comment