Code and logfile tidy up.

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

@@ -184,27 +184,16 @@ public class GamsLocationOptimiser {
 
 		GAMSParameter minCerealFracP = inDB.addParameter("minDemandPerCereal", 1);
 		GAMSParameter minOilcropsFracP = inDB.addParameter("minDemandPerOilcrop", 1);
-
-		for (Entry<CommodityType, Map<CropType, Double>> comm : countryInput.getMinDemandFractions().entrySet()) {
-			for (Map.Entry<CropType, Double> crop : comm.getValue().entrySet()) {
-				LogWriter.println("commodity " + comm + " crop " + crop + " value" + crop.getValue());
-				double minCommFract = ModelConfig.LIMIT_DEMAND_FRACTION ? crop.getValue() : 0.0;
-				if (!Double.isNaN(minCommFract)) {
-					double dOut;
-					if (comm.getKey() == CommodityType.CEREALS){
-						LogWriter.println("crop name " + crop.getKey().getGamsName()+ " minCommFract " + minCommFract);
-						dOut = setGamsParamValueTruncate(minCerealFracP.addRecord(crop.getKey().getGamsName()),
-								minCommFract, 4);
-						LogWriter.println("dOut "  + dOut);
-					}else{
-						LogWriter.println("crop name " + crop.getKey().getGamsName()+ " minCommFract " + minCommFract);
-						dOut = setGamsParamValueTruncate(minOilcropsFracP.addRecord(crop.getKey().getGamsName()),
-								minCommFract, 4);
-						LogWriter.println("dOut "  + dOut);
-					}
-					if (DEBUG)LogWriter.println(String.format("     %15s,\t %.4f", crop.getKey().getGamsName(), dOut));
-				}
-
+		if (DEBUG) LogWriter.println("\nMinDemandFractions");
+
+		for (Entry<CommodityType, Map<CropType, Double>> entry : countryInput.getMinDemandFractions().entrySet()) {
+			CommodityType comm = entry.getKey();
+			for (Map.Entry<CropType, Double> entry2 : entry.getValue().entrySet()) {
+				CropType crop = entry2.getKey();
+				double minCommFract = ModelConfig.LIMIT_DEMAND_FRACTION ? entry2.getValue() : 0.0;			
+				GAMSParameter minCropsFracP = (comm == CommodityType.CEREALS ? minCerealFracP : minOilcropsFracP);
+				setGamsParamValueTruncate(minCropsFracP.addRecord(crop.getGamsName()), minCommFract, 4);
+				if (DEBUG) LogWriter.println(String.format("  %15s,  %10s,  %.4f", comm.getGamsName(), crop.getGamsName(), minCommFract));
 			}
 		}
 
@@ -216,8 +205,6 @@ public class GamsLocationOptimiser {
 		GAMSParameter fert_p = inDB.addParameter("fertParam", 2);
 		GAMSParameter irrig_p = inDB.addParameter("irrigParam", 2);
 		GAMSParameter irrigMaxP = inDB.addParameter("irrigMaxRate", 2);
-		
-		
 
 		for (Entry<Integer, ? extends YieldResponsesItem> entry : inputData.getYields().entrySet()) {
 			Integer locationId = entry.getKey();