diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java index 68810015cd28cd4393981314378ca3b949dec367..3cbe94469010890ed6d74e0bde446a513bd5fe21 100755 --- a/src/ac/ed/lurg/ModelConfig.java +++ b/src/ac/ed/lurg/ModelConfig.java @@ -409,6 +409,7 @@ public class ModelConfig { public static final boolean USE_CRAFTY_COUNTRIES = getBooleanProperty("USE_CRAFTY_COUNTRIES", false); public static final String CRAFTY_COUNTRIES_FILE= getProperty("CRAFTY_COUNTRIES_FILE", DATA_DIR + File.separator + "craftyCountries.csv"); public static final String CRAFTY_PRODUCTION_DIR = getProperty("CRAFTY_PRODUCTION_DIR", OUTPUT_DIR + File.separator + "crafty"); + public static final boolean ENABLE_CRAFTY_IMPORTS_UPDATE = getBooleanProperty("ENABLE_CRAFTY_IMPORTS_UPDATE", true); public static final boolean EXTRAPOLATE_YIELD_FERT_RESPONSE = getBooleanProperty("EXTRAPOLATE_YIELD_FERT_RESPONSE", false); diff --git a/src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java b/src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java index dc22204dfba94d406e33bd848d67c13a76ae8cf6..17d0c1e39223f44315f5f2470053479203278287 100644 --- a/src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java +++ b/src/ac/ed/lurg/country/crafty/CraftyCountryAgent.java @@ -2,6 +2,7 @@ package ac.ed.lurg.country.crafty; import java.util.Map; +import ac.ed.lurg.ModelConfig; import ac.ed.lurg.country.AbstractCountryAgent; import ac.ed.lurg.country.CompositeCountry; import ac.ed.lurg.country.CountryPrice; @@ -30,7 +31,8 @@ public class CraftyCountryAgent extends AbstractCountryAgent { public void updateProduction(Map<CropType, CropUsageData> cropUsageMap, Map<CropType, GlobalPrice> worldPrices) { this.cropUsageData = cropUsageMap; calculateCountryPricesAndDemand(worldPrices, false); - updateNetImportsFromProdAndDemand(currentProjectedDemand, currentDemandFract, cropUsageMap); + if (ModelConfig.ENABLE_CRAFTY_IMPORTS_UPDATE) + updateNetImportsFromProdAndDemand(currentProjectedDemand, currentDemandFract, cropUsageMap); } @Override