diff --git a/src/ac/ed/lurg/country/gams/GamsCommodityDemand.java b/src/ac/ed/lurg/country/gams/GamsCommodityDemand.java index a30bdb881e8cfd2cbb62710b862386db5f001d59..0f248eb52fb1171484a7021c29dbf91e0579669f 100644 --- a/src/ac/ed/lurg/country/gams/GamsCommodityDemand.java +++ b/src/ac/ed/lurg/country/gams/GamsCommodityDemand.java @@ -1,7 +1,6 @@ package ac.ed.lurg.country.gams; import ac.ed.lurg.types.CommodityType; -import ac.ed.lurg.utils.LogWriter; public class GamsCommodityDemand { diff --git a/src/ac/ed/lurg/country/gams/GamsDemandInput.java b/src/ac/ed/lurg/country/gams/GamsDemandInput.java index f14e61281928a094dfe77a88960133347468c061..48d47072ee355aa27c23a656434095175364fa08 100644 --- a/src/ac/ed/lurg/country/gams/GamsDemandInput.java +++ b/src/ac/ed/lurg/country/gams/GamsDemandInput.java @@ -4,7 +4,6 @@ import java.util.Map; import ac.ed.lurg.country.SingleCountry; import ac.ed.lurg.types.CommodityType; -import ac.ed.lurg.utils.LogWriter; public class GamsDemandInput { private SingleCountry country; diff --git a/src/ac/ed/lurg/shock/YieldShockManager.java b/src/ac/ed/lurg/shock/YieldShockManager.java index 218acfe614bd90365e0de8882d1f7fd6d44df18c..76f6d87cf09c5a524e4faa0d07ed2f869f1a5686 100644 --- a/src/ac/ed/lurg/shock/YieldShockManager.java +++ b/src/ac/ed/lurg/shock/YieldShockManager.java @@ -49,6 +49,7 @@ public class YieldShockManager { YieldShockReader yieldShockReader = new YieldShockReader(yieldShockMap); yieldShockReader.getRasterDataFromFile(ModelConfig.YIELDSHOCK_MAP_DIR + File.separator + mapFilename); cacheYieldShockMaps.put(mapFilename, yieldShockMap); + LogWriter.println("YieldShockManager.getYieldShockMap: added " + mapFilename + " now have " + cacheYieldShockMaps.size() + "cached"); } return yieldShockMap; @@ -79,7 +80,7 @@ public class YieldShockManager { } } - public void adjustForShocks(RasterSet<YieldShockItem> yieldShockMap, YieldRaster yieldRaster, CropType crop, double yieldAdjustment) { + private void adjustForShocks(RasterSet<YieldShockItem> yieldShockMap, YieldRaster yieldRaster, CropType crop, double yieldAdjustment) { LogWriter.println("Applying yield shock to " + crop + ", rate " + yieldAdjustment); for (Map.Entry<RasterKey, YieldShockItem> entry : yieldShockMap.entrySet()) { YieldShockItem value = entry.getValue();