Improved logging and fix tau interpolation

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);
 		}
 	}

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;