diff --git a/src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java b/src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java index d648d62217cf1a07153febef0a50f6b198a8443a..bb42fd0030d9517f47a1aabd2e3482085b5e5a80 100755 --- a/src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java +++ b/src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java @@ -73,12 +73,9 @@ public class GamsDemandOptimiser { String key = rec.getKeys()[0]; double initialTau = rec.getValue(); - LogWriter.print(key + ", initialTau=" + initialTau); CommodityType commodity = CommodityType.getForGamsName(key); - double adjusted = tauManager.getFinalTau(inputData.getYear(), initialTau, commodity); - LogWriter.println(", adjusted=" + adjusted); - + LogWriter.println(String.format("%14s: initialTau=%.6f, adjusted=%.6f", key, initialTau, adjusted)); rec.setValue(adjusted); } } diff --git a/src/ac/ed/lurg/country/gams/TauCalculationManager.java b/src/ac/ed/lurg/country/gams/TauCalculationManager.java index afe901adfbbfbf9ac19b682c624d8c16b34cb860..a56f6ef75c694c291c2ebb242667f608e6b317bf 100644 --- a/src/ac/ed/lurg/country/gams/TauCalculationManager.java +++ b/src/ac/ed/lurg/country/gams/TauCalculationManager.java @@ -40,7 +40,7 @@ public class TauCalculationManager { if(year > ModelConfig.DIET_CHANGE_START_YEAR && year < ModelConfig.DIET_CHANGE_END_YEAR) tau = initialTau + ((ModelConfig.DIET_CHANGE_START_YEAR - year) * (shiftTau - initialTau) / (ModelConfig.DIET_CHANGE_END_YEAR- ModelConfig.DIET_CHANGE_START_YEAR)); // interpolation - else if (year > ModelConfig.DIET_CHANGE_START_YEAR && year > ModelConfig.DIET_CHANGE_END_YEAR) + else if (year >= ModelConfig.DIET_CHANGE_END_YEAR) tau = shiftTau; else tau = initialTau;