Automated merge with bundle:/var/folders/q0/_71d_v6x7_db44ndq976wzym0000gn/T/SourceTreeTemp.q5Bg8x

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

 package ac.ed.lurg.country.gams;
 
 import ac.ed.lurg.types.CommodityType;
-import ac.ed.lurg.utils.LogWriter;
 
 public class GamsCommodityDemand {
 

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;

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();