Removing erronous price changes

src/ac/ed/lurg/country/AbstractCountryAgent.java

@@ -39,7 +39,19 @@ public abstract class AbstractCountryAgent {
 		currentMinDemandFract = getMinDemandFraction();
 	}
 
-	protected abstract void calculateCountryPrices(Map<CropType, GlobalPrice> worldPrices);
+	private void calculateCountryPrices(Map<CropType, GlobalPrice> worldPrices){
+		Map<CropType, CountryPrice> countryPrices = new HashMap <CropType, CountryPrice>();
+
+		for (CropType c : CropType.getImportedTypes()) {
+			GlobalPrice worldPrice = worldPrices.get(c);
+			Double tb = tradeBarriers.get(c);
+			LogWriter.println(worldPrice + " " + c);
+			CountryPrice prices = new CountryPrice(worldPrice.getCountryImportPrice(tb==null ? 0 : tb, currentTimestep), worldPrice.getExportPrice());
+			countryPrices.put(c, prices);
+		}
+
+		currentCountryPrices = countryPrices;
+	}
 	
 	private void calculateDemand() {
 		Map<CommodityType, Double> producerPrices = getProducerCommodityPrices();

src/ac/ed/lurg/country/CountryAgent.java

@@ -59,34 +59,6 @@ public class CountryAgent extends AbstractCountryAgent {
 	public RasterSet<IntegerRasterItem> getYieldClusters() {
 		return yieldClusters;
 	}
-	
-	@Override
-	protected void calculateCountryPrices(Map<CropType, GlobalPrice> worldPrices) {
-		Map<CropType, CountryPrice> countryPrices = new HashMap <CropType, CountryPrice>();
-		
-		Map<CropType, CropUsageData> cropUsageMap = previousGamsRasterOutput.getCropUsageData();
-		
-		for (CropType c : CropType.getImportedTypes()) {
-			GlobalPrice worldPrice = worldPrices.get(c);
-			Double tb = tradeBarriers.get(c);
-			CropUsageData cropUsageData = cropUsageMap.get(c);
-			LogWriter.println(worldPrice + " " + c);
-			double importsPostShock = cropUsageData.getShockedNetImports();
-			double productionPostShock = cropUsageData.getProductionExpected()-cropUsageData.getProductionShock();
-			double weighting = importsPostShock/(productionPostShock+importsPostShock);
-				
-			double importPrice = worldPrice.getCountryImportPrice(tb==null ? 0 : tb, currentTimestep) * weighting;
-			double exportPrice = worldPrice.getExportPrice() * (1-weighting);
-	
-			double newImportPrice = importPrice + exportPrice;
-	
-			CountryPrice prices = new CountryPrice(newImportPrice, worldPrice.getExportPrice());
-			countryPrices.put(c, prices);
-		}
-
-		currentCountryPrices = countryPrices;
-		
-	}
 
 	private RasterSet<IntegerRasterItem> calcYieldClusters(RasterSet<IrrigationItem> irrigData, YieldRaster countryYieldSurfaces) {
 

src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java

@@ -6,14 +6,10 @@ import java.util.Map.Entry;
 
 import ac.ed.lurg.country.AbstractCountryAgent;
 import ac.ed.lurg.country.CompositeCountry;
-import ac.ed.lurg.country.CountryPrice;
 import ac.ed.lurg.country.GlobalPrice;
-import ac.ed.lurg.country.SingleCountry;
 import ac.ed.lurg.demand.AbstractDemandManager;
 import ac.ed.lurg.landuse.CropUsageData;
-import ac.ed.lurg.types.CommodityType;
 import ac.ed.lurg.types.CropType;
-import ac.ed.lurg.utils.LogWriter;
 
 /** 
  * Country agent that is interface over data transferred to and from CRAFTY.
@@ -42,20 +38,4 @@ public class CraftyCountryAgent extends AbstractCountryAgent {
 		
 		updateNetImportsFromProdAndDemand(currentProjectedDemand, currentMinDemandFract, cropUsageData);
 	}
-	
-	@Override
-	protected void calculateCountryPrices(Map<CropType, GlobalPrice> worldPrices) {
-		Map<CropType, CountryPrice> countryPrices = new HashMap <CropType, CountryPrice>();
-
-		for (CropType c : CropType.getImportedTypes()) {
-			GlobalPrice worldPrice = worldPrices.get(c);
-			Double tb = tradeBarriers.get(c);
-			LogWriter.println(worldPrice + " " + c);
-			CountryPrice prices = new CountryPrice(worldPrice.getCountryImportPrice(tb==null ? 0 : tb, currentTimestep), worldPrice.getExportPrice());
-			countryPrices.put(c, prices);
-		}
-
-		currentCountryPrices = countryPrices;
-		
-	}
 }
\ No newline at end of file