Change to defaulting of intensities, hopefully to fix problem with Egypt

src/ac/ed/lurg/country/gams/GamsLocationOptimiser.java

@@ -119,16 +119,23 @@ public class GamsLocationOptimiser {
 				
 				double prevFertI, prevIrrigI, prevOtherI;
 				Intensity intensity = landUseItem.getIntensity(cropType);
+				double defaultI = CropType.PASTURE == cropType ? 0.01 : 0.5;
+
 				if (intensity==null) { // could be first time through or this crop not previously grown in this location, so give it some default values
-					double defaultI = CropType.PASTURE == cropType ? 0.01 : 0.5;
 					prevFertI = defaultI;
 					prevIrrigI = defaultI;
 					prevOtherI = defaultI;
 				}
 				else {
-					prevFertI = intensity.getFertiliserIntensity();
-					prevIrrigI = intensity.getIrrigationIntensity();
 					prevOtherI = intensity.getOtherIntensity();
+					if (prevOtherI == 0) {  // this is needed or optimizer gets a bit confused if some areas are kept as cropland but are not productive, due to zero other intensity (i.e. set aside)
+						prevFertI = defaultI;
+						prevIrrigI = defaultI;
+					}
+					else {
+						prevFertI = intensity.getFertiliserIntensity();
+						prevIrrigI = intensity.getIrrigationIntensity();
+					}
 				}
 				
 				if (DEBUG) LogWriter.println(String.format("  %d   %15s,\t %.2f,\t %.3f,\t %.3f,\t %.3f", locationId, cropType.getGamsName(), area, prevFertI, prevIrrigI, prevOtherI));