Changes to land cover conversion costs and fert/irrig constraints.
Some merges from master branch.
Showing
- GAMS/IntExtOpt.gms 22 additions, 9 deletionsGAMS/IntExtOpt.gms
- src/ac/ed/lurg/ModelConfig.java 10 additions, 14 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/gams/GamsDemandOptimiser.java 26 additions, 1 deletionsrc/ac/ed/lurg/country/gams/GamsDemandOptimiser.java
- src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java 3 additions, 6 deletionssrc/ac/ed/lurg/country/gams/GamsLocationOptimiser.java
- src/ac/ed/lurg/demand/AbstractDemandManager.java 17 additions, 5 deletionssrc/ac/ed/lurg/demand/AbstractDemandManager.java
- src/ac/ed/lurg/demand/AbstractSSPDemandManager.java 16 additions, 8 deletionssrc/ac/ed/lurg/demand/AbstractSSPDemandManager.java
- src/ac/ed/lurg/demand/DemandManagerFromFile.java 1 addition, 0 deletionssrc/ac/ed/lurg/demand/DemandManagerFromFile.java
- src/ac/ed/lurg/demand/DemandManagerSSP.java 1 addition, 0 deletionssrc/ac/ed/lurg/demand/DemandManagerSSP.java
- src/ac/ed/lurg/demand/ElasticDemandManager.java 26 additions, 8 deletionssrc/ac/ed/lurg/demand/ElasticDemandManager.java
- src/ac/ed/lurg/landuse/ConversionCostReader.java 28 additions, 25 deletionssrc/ac/ed/lurg/landuse/ConversionCostReader.java
- src/ac/ed/lurg/landuse/IrrigationRasterSet.java 2 additions, 1 deletionsrc/ac/ed/lurg/landuse/IrrigationRasterSet.java
Loading
Please register or sign in to comment