From c205bc453cd90696effdfff8ca60680a01fa05a9 Mon Sep 17 00:00:00 2001
From: Peter Alexander <peter@blackhillock.co.uk>
Date: Sat, 30 Jun 2018 10:14:22 +0100
Subject: [PATCH] Reverse some of the previous parameter changes
---
GAMS/IntExtOpt.gms | 4 ++--
GAMS/LUOpt.gms | 4 ++--
src/ac/ed/lurg/ModelConfig.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/GAMS/IntExtOpt.gms b/GAMS/IntExtOpt.gms
index 7f0df3c1..8d48a680 100644
--- a/GAMS/IntExtOpt.gms
+++ b/GAMS/IntExtOpt.gms
@@ -83,8 +83,8 @@ $gdxin
PARAMETER baseCost(crop);
PARAMETER otherIntCost(crop);
- baseCost(crop) = prodCost(crop)*0.5;
- otherIntCost(crop) = baseCost(crop)*0.5 + otherICost;
+ baseCost(crop) = prodCost(crop)*0.4;
+ otherIntCost(crop) = baseCost(crop)*0.6 + otherICost;
baseCost('pasture') = 0.03;
otherIntCost('pasture') = 0.8 + otherICost;
diff --git a/GAMS/LUOpt.gms b/GAMS/LUOpt.gms
index c2e35705..50d9e3e4 100644
--- a/GAMS/LUOpt.gms
+++ b/GAMS/LUOpt.gms
@@ -84,8 +84,8 @@ $gdxin
PARAMETER baseCost(crop);
PARAMETER otherIntCost(crop);
- baseCost(crop) = prodCost(crop)*0.5;
- otherIntCost(crop) = baseCost(crop)*0.5 + otherICost;
+ baseCost(crop) = prodCost(crop)*0.4;
+ otherIntCost(crop) = baseCost(crop)*0.6 + otherICost;
baseCost('pasture') = 0.03;
otherIntCost('pasture') = 0.8 + otherICost;
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index c8ffd221..c89e50f4 100644
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -288,8 +288,8 @@ public class ModelConfig {
public static final double OTHER_INTENSITY_COST = getDoubleProperty("OTHER_INTENSITY_COST", 0.6);
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.0005);
- public static final double FERTILISER_COST_PER_T = getDoubleProperty("FERTILISER_COST_PER_T", 1.9); // $500/t, 18% N/t
+ public static final double IRRIG_COST_SCALE_FACTOR = getDoubleProperty("IRRIG_COST_SCALE_FACTOR", 0.0004);
+ public static final double FERTILISER_COST_PER_T = getDoubleProperty("FERTILISER_COST_PER_T", 1.8); // $500/t, 18% N/t
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.0);
--
GitLab