Remove ?minFeedRate? as not used

GAMS/IntExtOpt.gms

@@ -32,7 +32,6 @@
  
  SCALAR meatEfficency                        efficiency of converting feed and pasture into animal products;
  SCALAR landChangeCost                       cost required to add ha of agricultural land;
- SCALAR minFeedRate                          minimum rate of feed for producing animal products (why is this needed?);
  SCALAR fertiliserUnitCost                   fert cost at max fert rate;
  SCALAR otherIParam                          yield response to other intensity;
  SCALAR otherICost                           cost of other intensity;
@@ -45,7 +44,7 @@ $load location, suitableLandArea, demand, landChangeCost
 $load previousArea, previousFertIntensity, previousIrrigIntensity, previousOtherIntensity
 $load yieldNone, yieldFertOnly, yieldIrrigOnly, yieldBoth
 $load fertParam, irrigParam, otherIParam, exportPrices, importPrices, maxNetImport, minNetImport, unhandledCropArea
-$load meatEfficency, minFeedRate, otherICost, irrigCost, irrigMaxRate, irrigConstraint, fertiliserUnitCost, domesticPriceMarkup
+$load meatEfficency, otherICost, irrigCost, irrigMaxRate, irrigConstraint, fertiliserUnitCost, domesticPriceMarkup
 $gdxin    
  
  SCALAR delta use to smooth power function see 7.5 www.gams.com dd docs solversconopt.pdf / 0.00000000001 /  

src/ac/ed/lurg/ModelConfig.java

@@ -162,7 +162,6 @@ public class ModelConfig {
 	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.5);
 	public static final double LAND_CHANGE_COST = getDoubleProperty("LAND_CHANGE_COST", 0.6);
-	public static final double MIN_FEED_RATE = getDoubleProperty("MIN_FEED_RATE", 0.15);
 	public static final double SEED_AND_WASTE_FRACTION = getDoubleProperty("SEED_AND_WASTE_FRACTION", 0.15);  
 
 	public static final double TECHNOLOGY_CHANGE_ANNUAL_RATE = IS_CALIBRATION_RUN ? 0.0 : getDoubleProperty("TECHNOLOGY_CHANGE_ANNUAL_RATE", 0.0);
@@ -173,7 +172,7 @@ public class ModelConfig {
 
 	public static final double MARKET_LAMBA = getDoubleProperty("MARKET_LAMBA", 0.5); // controls international market price adjustment rate
 
-	public static final double POPULATION_AGGREG_LIMIT = getDoubleProperty("POPULATION_AGGREG_LIMIT", 40.0);  // in millions, smaller countries are aggregated on a regional basis
+	public static final double POPULATION_AGGREG_LIMIT = getDoubleProperty("POPULATION_AGGREG_LIMIT", 30.0);  // in millions, smaller countries are aggregated on a regional basis
 	
 	public static final double UNHANDLED_CROP_AREA = getDoubleProperty("UNHANDLED_CROP_AREA", 0.3);  // includes fruit veg forage crops set aside and failed crop
 	
@@ -181,7 +180,7 @@ public class ModelConfig {
 	public static final double OTHER_INTENSITY_PARAM = getDoubleProperty("OTHER_INTENSITY_PARAM", 3.22);
 
 	public static final double IRRIG_COST_SCALE_FACTOR = getDoubleProperty("IRRIG_COST_SCALE_FACTOR", 0.02);
-	public static final double FERTILISER_COST_PER_T = getDoubleProperty("FERTILISER_COST_PER_T", 0.87 * 1.4 * 2); // £900/t N *  1.4$/£ * 2NPK/N
+	public static final double FERTILISER_COST_PER_T = getDoubleProperty("FERTILISER_COST_PER_T", 0.5007 / 0.18); 
 	public static final double FERTILISER_MAX_COST = FERTILISER_COST_PER_T * MAX_FERT_AMOUNT/1000;
 	
 	public static final double DOMESTIC_PRICE_MARKUP = getDoubleProperty("DOMESTIC_PRICE_MARKUP", 1.2);

src/ac/ed/lurg/country/CompositeCountryManager.java

 package ac.ed.lurg.country;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;

src/ac/ed/lurg/country/gams/GamsCountryInput.java

@@ -54,10 +54,6 @@ public class GamsCountryInput {
 		return ModelConfig.LAND_CHANGE_COST;
 	}
 
-	public double getMinFeedRate() {
-		return ModelConfig.MIN_FEED_RATE;
-	}
-
 	public Map<CropType, Double> getMinNetImport() {
 		Map<CropType, Double> netImport = new HashMap<CropType, Double>();
 		for (Map.Entry<CropType, ImportExportConstraint> entry : importConstraints.entrySet()) {

src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java

@@ -220,7 +220,6 @@ public class GamsLocationOptimiser {
 		addScalar(inDB, "otherICost",ModelConfig.OTHER_INTENSITY_COST, 3);
 		addScalar(inDB, "otherIParam", ModelConfig.OTHER_INTENSITY_PARAM, 3);
 		addScalar(inDB, "landChangeCost", countryInput.getLandChangeCost(), 3);
-		addScalar(inDB, "minFeedRate", countryInput.getMinFeedRate(), 3);
 		addScalar(inDB, "unhandledCropArea", ModelConfig.UNHANDLED_CROP_AREA, 3);
 		addScalar(inDB, "domesticPriceMarkup", ModelConfig.DOMESTIC_PRICE_MARKUP, 3);
 	}