Automated merge with bundle:/var/folders/q0/_71d_v6x7_db44ndq976wzym0000gn/T/SourceTreeTemp.gEjNHC

data/sims/ssp_params.csv

 Ensemble,pname,dist,xmin,xmax,x05,xmode,x95,value
-SSP1,IRRIGATION_EFFICIENCY,beta,0.35,0.65,0.53,0.575,0.62,
-SSP2,IRRIGATION_EFFICIENCY,beta,0.35,0.65,0.47,0.5,0.53,
-SSP3,IRRIGATION_EFFICIENCY,beta,0.35,0.65,0.38,0.425,0.47,
-SSP4,IRRIGATION_EFFICIENCY,beta,0.35,0.65,0.425,0.5,0.575,
-SSP5,IRRIGATION_EFFICIENCY,beta,0.35,0.65,0.5,0.53,0.575,
+SSP1,IRRIGATION_EFFICIENCY,beta,0.175,0.325,0.265,0.2875,0.31,
+SSP2,IRRIGATION_EFFICIENCY,beta,0.175,0.325,0.235,0.25,0.265,
+SSP3,IRRIGATION_EFFICIENCY,beta,0.175,0.325,0.19,0.2125,0.235,
+SSP4,IRRIGATION_EFFICIENCY,beta,0.175,0.325,0.2125,0.25,0.2875,
+SSP5,IRRIGATION_EFFICIENCY,beta,0.175,0.325,0.25,0.265,0.2875,
 SSP1,MEAT_EFFICIENCY,beta,0.95,1.05,1.01,1.02,1.04,
 SSP2,MEAT_EFFICIENCY,beta,0.95,1.05,0.99,1,1.01,
 SSP3,MEAT_EFFICIENCY,beta,0.95,1.05,0.98,1,1.02,
@@ -54,36 +54,36 @@ SSP2,OTHER_INTENSITY_COST,beta,0.18,0.42,0.27,0.3,0.33,
 SSP3,OTHER_INTENSITY_COST,beta,0.18,0.42,0.21,0.27,0.33,
 SSP4,OTHER_INTENSITY_COST,beta,0.18,0.42,0.27,0.33,0.39,
 SSP5,OTHER_INTENSITY_COST,beta,0.18,0.42,0.21,0.24,0.3,
-SSP1,IRRIG_COST_SCALE_FACTOR,beta,0.0006,0.0014,0.001,0.0012,0.0013,
-SSP2,IRRIG_COST_SCALE_FACTOR,beta,0.0006,0.0014,0.0009,0.001,0.0011,
-SSP3,IRRIG_COST_SCALE_FACTOR,beta,0.0006,0.0014,0.0007,0.0009,0.0011,
-SSP4,IRRIG_COST_SCALE_FACTOR,beta,0.0006,0.0014,0.0009,0.0011,0.0013,
-SSP5,IRRIG_COST_SCALE_FACTOR,beta,0.0006,0.0014,0.0007,0.0008,0.001,
-SSP1,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.02,0.023,0.026,
-SSP2,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.017,0.02,0.023,
-SSP3,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.011,0.014,0.017,
-SSP4,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.014,0.017,0.02,
-SSP5,ANNUAL_MAX_IMPORT_CHANGE,beta,0.008,0.032,0.023,0.026,0.029,
+SSP1,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0013,0.0007,0.001,0.00115,
+SSP2,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0013,0.00055,0.0007,0.00085,
+SSP3,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0013,0.00025,0.00055,0.00085,
+SSP4,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0013,0.00055,0.00085,0.00115,
+SSP5,IRRIG_COST_SCALE_FACTOR,beta,0.0001,0.0013,0.00025,0.0004,0.0007,
+SSP1,ANNUAL_MAX_IMPORT_CHANGE,beta,0.013,0.037,0.025,0.028,0.031,
+SSP2,ANNUAL_MAX_IMPORT_CHANGE,beta,0.013,0.037,0.022,0.025,0.028,
+SSP3,ANNUAL_MAX_IMPORT_CHANGE,beta,0.013,0.037,0.016,0.019,0.022,
+SSP4,ANNUAL_MAX_IMPORT_CHANGE,beta,0.013,0.037,0.019,0.022,0.025,
+SSP5,ANNUAL_MAX_IMPORT_CHANGE,beta,0.013,0.037,0.028,0.031,0.034,
 SSP1,DIETARY_CLOSURE,beta,0,0.16,0.01,0.02,0.04,
 SSP2,DIETARY_CLOSURE,beta,0,0.16,0.02,0.04,0.06,
 SSP3,DIETARY_CLOSURE,beta,0,0.16,0.02,0.04,0.06,
 SSP4,DIETARY_CLOSURE,beta,0,0.16,0.01,0.04,0.06,
 SSP5,DIETARY_CLOSURE,beta,0,0.16,0.04,0.06,0.12,
-SSP1,LAND_CHANGE_COST,beta,0.55,1.05,0.8,0.9,0.95,
-SSP2,LAND_CHANGE_COST,beta,0.55,1.05,0.7,0.75,0.8,
-SSP3,LAND_CHANGE_COST,beta,0.55,1.05,0.65,0.75,0.8,
-SSP4,LAND_CHANGE_COST,beta,0.55,1.05,0.75,0.8,0.9,
-SSP5,LAND_CHANGE_COST,beta,0.55,1.05,0.6,0.65,0.7,
+SSP1,LAND_CHANGE_COST,beta,0.5,1,0.75,0.85,0.9,
+SSP2,LAND_CHANGE_COST,beta,0.5,1,0.65,0.7,0.75,
+SSP3,LAND_CHANGE_COST,beta,0.5,1,0.6,0.7,0.75,
+SSP4,LAND_CHANGE_COST,beta,0.5,1,0.7,0.75,0.85,
+SSP5,LAND_CHANGE_COST,beta,0.5,1,0.55,0.6,0.65,
 SSP1,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.3,3,1.2,1.8,2.4,
 SSP2,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.3,3,0.8,1,1.2,
 SSP3,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.3,3,0.5,0.65,0.8,
 SSP4,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.3,3,0.8,1,1.2,
 SSP5,AGRI_LAND_EXPANSION_COST_FACTOR,beta,0.3,3,1.2,1.8,2.4,
-SSP1,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
-SSP2,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
-SSP3,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
-SSP4,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
-SSP5,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
+SSP1,CROP_TO_PASTURE_COST_FACTOR,unif,0.7,1.3,,,,
+SSP2,CROP_TO_PASTURE_COST_FACTOR,unif,0.7,1.3,,,,
+SSP3,CROP_TO_PASTURE_COST_FACTOR,unif,0.7,1.3,,,,
+SSP4,CROP_TO_PASTURE_COST_FACTOR,unif,0.7,1.3,,,,
+SSP5,CROP_TO_PASTURE_COST_FACTOR,unif,0.7,1.3,,,,
 SSP1,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
 SSP2,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
 SSP3,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,

src/ac/ed/lurg/ModelConfig.java

@@ -6,6 +6,8 @@ import java.io.IOException;
 import java.util.Enumeration;
 import java.util.Properties;
 
+import ac.ed.lurg.types.ModelFitType;
+
 public class ModelConfig {
 	
 	private Properties configFile;
@@ -187,7 +189,9 @@ public class ModelConfig {
 	public static final double DIETARY_CLOSURE_GDP_CHANGE = getDoubleProperty("DIETARY_CLOSURE_GDP_CHANGE", 2.0); // 2 is double of GDP
 	public static final double DIETARY_CLOSURE_PARAM = getDoubleProperty("DIETARY_CLOSURE_PARAM", Math.log((1-DIETARY_CLOSURE))/DIETARY_CLOSURE_GDP_CHANGE); // Zero is no dietary closure, number specifies closure rate for changes in GDP per capita, e.g. Math.log(0.5)/2
 	public static final String SSP_SCENARIO = getProperty("SSP_SCENARIO", "SSP1_v9_130325");
-
+	public static final ModelFitType DEMAND_ANIMAL_PROD_FIT = ModelFitType.findByName(getProperty("DEMAND_ANIMAL_PROD_FIT", "loglinear"));
+	public static final ModelFitType DEMAND_NON_ANIMAL_PROD_FIT = ModelFitType.findByName(getProperty("DEMAND_NON_ANIMAL_PROD_FIT", "loglinear"));
+	
 	public static final double PASTURE_HARVEST_FRACTION = getDoubleProperty("PASTURE_HARVEST_FRACTION", 0.5);
 	public static final double MEAT_EFFICIENCY = getDoubleProperty("MEAT_EFFICIENCY", 1.0);  // 'meat' is includes feed conversion ratio already, this is tech. change or similar
 	public static final double IRRIGIATION_EFFICIENCY = getDoubleProperty("IRRIGIATION_EFFICIENCY", 0.25);

src/ac/ed/lurg/demand/DemandManager.java

@@ -50,7 +50,7 @@ public class DemandManager {
 			LogWriter.println("Got ssp data for " + c.getCountryName() + " of " + sd);
 
 			for (CommodityType commodity : CommodityType.getAllItems()) {
-				ModelFitType fitType = commodity.isAnimalProduct() ? ModelFitType.LOGISTIC : ModelFitType.LOGLINEAR;
+				ModelFitType fitType = commodity.isAnimalProduct() ? ModelConfig.DEMAND_ANIMAL_PROD_FIT : ModelConfig.DEMAND_NON_ANIMAL_PROD_FIT;
 				
 				DemandCurve dc = demandCurveManager.get(commodity, fitType);
 				double cpc = dc.getConsumptionPc(baseSspData.getGdpPc(), baseConsumpManager.get(c, commodity), sd.getGdpPc());