Minor change to deal with missing values in carbon/wood files.

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

@@ -347,13 +347,16 @@ public class GamsLocationOptimiser {
 			String locString = Integer.toString(locationId);
 			CarbonFluxItem cFlux = entry.getValue();
 			
+
 			for (LandCoverType prevLC : LandCoverType.getConvertibleTypes()) {
 				for (LandCoverType newLC : LandCoverType.getConvertibleTypes()) {
 					Vector<String> v = new Vector<String>();
 					v.add(prevLC.getName());
 					v.add(newLC.getName());
 					v.add(locString);
-					setGamsParamValue(cFluxRateP.addRecord(v), cFlux.getCarbonFlux(prevLC, newLC), 3);
+					// TODO Need a better way to deal with missing values
+					if (cFlux.checkForKeys(prevLC, newLC))
+						setGamsParamValue(cFluxRateP.addRecord(v), cFlux.getCarbonFlux(prevLC, newLC), 3);
 				}
 			}		
 		}
@@ -365,14 +368,15 @@ public class GamsLocationOptimiser {
 			Integer locationId = entry.getKey();
 			String locString = Integer.toString(locationId);
 			WoodYieldItem wYield = entry.getValue();
-			
+
 			for (LandCoverType prevLC : LandCoverType.getConvertibleTypes()) {
 				for (LandCoverType newLC : LandCoverType.getConvertibleTypes()) {
 					Vector<String> v = new Vector<String>();
 					v.add(prevLC.getName());
 					v.add(newLC.getName());
 					v.add(locString);
-					setGamsParamValue(woodYieldP.addRecord(v), wYield.getWoodYield(prevLC, newLC), 3);
+					if (wYield.checkForKeys(prevLC, newLC))
+						setGamsParamValue(woodYieldP.addRecord(v), wYield.getWoodYield(prevLC, newLC), 3);
 				}
 			}			
 		}