Merge

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

@@ -253,7 +253,7 @@ public class CountryAgent {
 	private Map<CropType, Double> getMinCerealFraction(Timestep timestep) {
 		Map<CropType, Double> minCerealFraction = new HashMap<CropType, Double>();
 
-		int yearsOfChange = (timestep.getTimestep() - ModelConfig.TECHNOLOGY_CHANGE_START_STEP) * ModelConfig.TIMESTEP_SIZE;
+		int yearsOfChange = ModelConfig.IS_CALIBRATION_RUN ? 0 : (timestep.getTimestep() - ModelConfig.TECHNOLOGY_CHANGE_START_STEP) * ModelConfig.TIMESTEP_SIZE;
 
 		for (Map.Entry<CropType, Double> entry : demandManager.getBaseCerealFraction(country).entrySet()) {
 			minCerealFraction.put(entry.getKey(), entry.getValue() * Math.max(ModelConfig.TOTAL_MAX_CEREAL_CHANGE, (1- ModelConfig.ANNUAL_MAX_CEREAL_CHANGE * yearsOfChange)));