diff --git a/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java b/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java index bb18c250524ebc613c0a77bbb57686b2b264d2f2..69a1f581726c0bf0da068a38ed30c15e3a5633ed 100644 --- a/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java +++ b/src/ac/ed/lurg/country/gams/GamsRasterOptimiser.java @@ -69,7 +69,8 @@ public class GamsRasterOptimiser { for (LandCoverType l : LandCoverType.values()) { double total = 0; for (LandUseItem a : areaRaster.values()) { - total += a.getLandCoverArea(l); + if (a != null) + total += a.getLandCoverArea(l); } LogWriter.printlnError("Total Area " + comment + ": " + l.getName() + ": " + total); @@ -77,10 +78,12 @@ public class GamsRasterOptimiser { double protectedAreaIncMinNatural=0, suitableArea=0, protectedArea=0, unprotectedArea=0; for (LandUseItem a : areaRaster.values()) { - protectedArea += a.getProtectedArea(); - unprotectedArea += a.getUnprotectedArea(); - protectedAreaIncMinNatural += a.getProtectedAreaIncMinNatural(); - suitableArea += a.getSuitableLand(); + if (a != null) { + protectedArea += a.getProtectedArea(); + unprotectedArea += a.getUnprotectedArea(); + protectedAreaIncMinNatural += a.getProtectedAreaIncMinNatural(); + suitableArea += a.getSuitableLand(); + } } LogWriter.println("Total protectedArea " + comment + ": " + protectedArea); LogWriter.println("Total unprotectedArea " + comment + ": " + unprotectedArea);