From 86ec71bc1802042156b2a1dc5578b216ecf663db Mon Sep 17 00:00:00 2001
From: Peter Alexander <>
Date: Wed, 6 Jan 2021 22:20:32 +0000
Subject: [PATCH] Improved logging and fix tau interpolation
---
src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java | 5 +----
src/ac/ed/lurg/country/gams/TauCalculationManager.java | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java b/src/ac/ed/lurg/country/gams/GamsDemandOptimiser.java
index d648d622..bb42fd00 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 afe901ad..a56f6ef7 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;
--
GitLab