Skip to content
Snippets Groups Projects
Commit 425084a8 authored by Bart Arendarczyk's avatar Bart Arendarczyk
Browse files

Added constraint to limit global increases in exports.

parent 3694201d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/ac/ed/lurg/InternationalMarket.java
+ 3
− 3
View file @ 425084a8
...@@ -102,15 +102,15 @@ public class InternationalMarket { ...@@ -102,15 +102,15 @@ public class InternationalMarket {
for (Entry<CropType, GlobalPrice> entry : worldPrices.entrySet()) { for (Entry<CropType, GlobalPrice> entry : worldPrices.entrySet()) {
Double initialStock = initialStockLevels.get(entry.getKey()); Double initialStock = initialStockLevels.get(entry.getKey());
if (initialStock != null) { if (initialStock != null) {
entry.getValue().setStockToTargetLevel(); entry.getValue().setStockToTargetLevel(entry.getKey().getStockToUseRatio());
} }
} }
for (Map.Entry<WoodType, GlobalPrice> entry : woodPrices.entrySet()) { for (Map.Entry<WoodType, GlobalPrice> entry : woodPrices.entrySet()) {
entry.getValue().setStockToTargetLevel(); entry.getValue().setStockToTargetLevel(ModelConfig.DEFAULT_STOCK_USE_RATIO);
} }
carbonPrice.resetStock(0.0); carbonPrice.setStockToTargetLevel(ModelConfig.DEFAULT_STOCK_USE_RATIO);
} }
void determineInternationalTrade(Collection<AbstractCountryAgent> countryAgents, Timestep timestep) { void determineInternationalTrade(Collection<AbstractCountryAgent> countryAgents, Timestep timestep) {
......
src/ac/ed/lurg/ModelConfig.java
+ 17
− 17
View file @ 425084a8
...@@ -283,18 +283,18 @@ public class ModelConfig { ...@@ -283,18 +283,18 @@ public class ModelConfig {
public static final String PASTURE_C4_COLUMN = getProperty("PASTURE_C4_COLUMN", "C4G_pas"); public static final String PASTURE_C4_COLUMN = getProperty("PASTURE_C4_COLUMN", "C4G_pas");
// These are production prices in PLUM style feed equivalent terms // These are production prices in PLUM style feed equivalent terms
public static final double INITAL_PRICE_WHEAT = getDoubleProperty("INITAL_PRICE_WHEAT", 0.0556); public static final double INITAL_PRICE_WHEAT = getDoubleProperty("INITAL_PRICE_WHEAT", 0.0521);
public static final double INITAL_PRICE_MAIZE = getDoubleProperty("INITAL_PRICE_MAIZE", 0.0361); public static final double INITAL_PRICE_MAIZE = getDoubleProperty("INITAL_PRICE_MAIZE", 0.0331);
public static final double INITAL_PRICE_RICE = getDoubleProperty("INITAL_PRICE_RICE", 0.0704); public static final double INITAL_PRICE_RICE = getDoubleProperty("INITAL_PRICE_RICE", 0.0635);
public static final double INITAL_PRICE_OILCROPS_NFIX = getDoubleProperty("INITAL_PRICE_OILCROPS_NFIX", 0.0901); public static final double INITAL_PRICE_OILCROPS_NFIX = getDoubleProperty("INITAL_PRICE_OILCROPS_NFIX", 0.0894);
public static final double INITAL_PRICE_OILCROPS_OTHER = getDoubleProperty("INITAL_PRICE_OILCROPS_OTHER", 0.0899); public static final double INITAL_PRICE_OILCROPS_OTHER = getDoubleProperty("INITAL_PRICE_OILCROPS_OTHER", 0.0851);
public static final double INITAL_PRICE_PULSES = getDoubleProperty("INITAL_PRICE_PULSES", 0.0948); public static final double INITAL_PRICE_PULSES = getDoubleProperty("INITAL_PRICE_PULSES", 0.0961);
public static final double INITAL_PRICE_STARCHYROOTS = getDoubleProperty("INITAL_PRICE_STARCHYROOTS", 0.0302); public static final double INITAL_PRICE_STARCHYROOTS = getDoubleProperty("INITAL_PRICE_STARCHYROOTS", 0.0273);
public static final double INITAL_PRICE_MONOGASTRICS = getDoubleProperty("INITAL_PRICE_MONOGASTRICS", 0.0984); // value from calibration public static final double INITAL_PRICE_MONOGASTRICS = getDoubleProperty("INITAL_PRICE_MONOGASTRICS", 0.0959); // value from calibration
public static final double INITAL_PRICE_RUMINANTS = getDoubleProperty("INITAL_PRICE_RUMINANTS", 0.115); // value from calibration public static final double INITAL_PRICE_RUMINANTS = getDoubleProperty("INITAL_PRICE_RUMINANTS", 0.111); // value from calibration
public static final double INITAL_PRICE_ENERGYCROPS = getDoubleProperty("INITAL_PRICE_ENERGYCROPS", 0.014); public static final double INITAL_PRICE_ENERGYCROPS = getDoubleProperty("INITAL_PRICE_ENERGYCROPS", 0.0127);
public static final double INITAL_PRICE_FRUITVEG = getDoubleProperty("INITAL_PRICE_FRUITVEG", 0.0459); public static final double INITAL_PRICE_FRUITVEG = getDoubleProperty("INITAL_PRICE_FRUITVEG", 0.0400);
public static final double INITAL_PRICE_SUGAR = getDoubleProperty("INITAL_PRICE_SUGAR", 0.0096); public static final double INITAL_PRICE_SUGAR = getDoubleProperty("INITAL_PRICE_SUGAR", 0.00948);
// These are initial demand system prices in 2000 kcal terms // These are initial demand system prices in 2000 kcal terms
public static final double INITAL_DEMAND_PRICE_CEREALS_STARCHY_ROOTS = getDoubleProperty("INITAL_DEMAND_PRICE_CEREALS_STARCHY_ROOTS", 110.23); public static final double INITAL_DEMAND_PRICE_CEREALS_STARCHY_ROOTS = getDoubleProperty("INITAL_DEMAND_PRICE_CEREALS_STARCHY_ROOTS", 110.23);
...@@ -410,7 +410,7 @@ public class ModelConfig { ...@@ -410,7 +410,7 @@ public class ModelConfig {
public static final String CHECKPOINT_WOOD_USAGE_FILE = getProperty("CHECKPOINT_WOOD_USAGE_FILE", OUTPUT_DIR + File.separator + SERIALIZED_WOOD_USAGE_FILENAME); public static final String CHECKPOINT_WOOD_USAGE_FILE = getProperty("CHECKPOINT_WOOD_USAGE_FILE", OUTPUT_DIR + File.separator + SERIALIZED_WOOD_USAGE_FILENAME);
public static final String CHECKPOINT_CARBON_USAGE_FILE = getProperty("CHECKPOINT_CARBON_USAGE_FILE", OUTPUT_DIR + File.separator + SERIALIZED_CARBON_USAGE_FILENAME); public static final String CHECKPOINT_CARBON_USAGE_FILE = getProperty("CHECKPOINT_CARBON_USAGE_FILE", OUTPUT_DIR + File.separator + SERIALIZED_CARBON_USAGE_FILENAME);
public static final boolean USE_INITIAL_CROP_USAGE_DATA = getBooleanProperty("USE_INITIAL_CROP_USAGE_DATA", false); // Read crop usage from file rather than serialized public static final boolean USE_INITIAL_CROP_USAGE_DATA = getBooleanProperty("USE_INITIAL_CROP_USAGE_DATA", false); // Read crop usage from file rather than serialized
public static final int CALIB_TRANSITION_TIME = getIntProperty("CALIB_TRANSITION_TIME", 10); // transition from calibration to current values over this time public static final int CALIB_TRANSITION_TIME = getIntProperty("CALIB_TRANSITION_TIME", 20); // transition from calibration to current values over this time
public static final boolean MARKET_ADJ_PRICE = getBooleanProperty("MARKET_ADJ_PRICE", true); public static final boolean MARKET_ADJ_PRICE = getBooleanProperty("MARKET_ADJ_PRICE", true);
public static final boolean CHANGE_YIELD_DATA_YEAR = IS_CALIBRATION_RUN ? false : getBooleanProperty("CHANGE_YIELD_DATA_YEAR", true); public static final boolean CHANGE_YIELD_DATA_YEAR = IS_CALIBRATION_RUN ? false : getBooleanProperty("CHANGE_YIELD_DATA_YEAR", true);
...@@ -427,7 +427,7 @@ public class ModelConfig { ...@@ -427,7 +427,7 @@ public class ModelConfig {
// Import export limits // Import export limits
public static final double ANNUAL_MAX_IMPORT_CHANGE = getDoubleProperty("ANNUAL_MAX_IMPORT_CHANGE", 0.5); // Loose constraint as we have TRADE_ADJUSTMENT_COST_RATE public static final double ANNUAL_MAX_IMPORT_CHANGE = getDoubleProperty("ANNUAL_MAX_IMPORT_CHANGE", 0.5); // Loose constraint as we have TRADE_ADJUSTMENT_COST_RATE
public static final double MAX_IMPORT_CHANGE = getDoubleProperty("MAX_IMPORT_CHANGE", ANNUAL_MAX_IMPORT_CHANGE*TIMESTEP_SIZE); public static final double MAX_IMPORT_CHANGE = getDoubleProperty("MAX_IMPORT_CHANGE", ANNUAL_MAX_IMPORT_CHANGE*TIMESTEP_SIZE);
public static final double TRADE_ADJUSTMENT_COST_RATE = getDoubleProperty("TRADE_ADJUSTMENT_COST_RATE", 0.004); // Cost of changing imports/exports public static final double TRADE_ADJUSTMENT_COST_RATE = getDoubleProperty("TRADE_ADJUSTMENT_COST_RATE", 0.006); // Cost of changing imports/exports
// Price caps // Price caps
public static final String PRICE_CAP_FILE = DATA_DIR + File.separator + "price_caps.csv"; public static final String PRICE_CAP_FILE = DATA_DIR + File.separator + "price_caps.csv";
...@@ -487,7 +487,7 @@ public class ModelConfig { ...@@ -487,7 +487,7 @@ public class ModelConfig {
public static final boolean RESET_ENERGYCROP_PRICE = getBooleanProperty("RESET_ENERGYCROP_PRICE", false); // Resets price after calibration to avoid problems due to low initial demand public static final boolean RESET_ENERGYCROP_PRICE = getBooleanProperty("RESET_ENERGYCROP_PRICE", false); // Resets price after calibration to avoid problems due to low initial demand
// public static final double BIOENERGY_HEATING_VALUE_GJ_PER_T = getDoubleProperty("BIOENERGY_HEATING_VALUE_GJ_PER_T", 17.5); // GJ per t DM // public static final double BIOENERGY_HEATING_VALUE_GJ_PER_T = getDoubleProperty("BIOENERGY_HEATING_VALUE_GJ_PER_T", 17.5); // GJ per t DM
public static final double MARKET_LAMBDA = getDoubleProperty("MARKET_LAMBDA", 1.6); // controls international market price adjustment rate public static final double MARKET_LAMBDA = getDoubleProperty("MARKET_LAMBDA", 1.0); // controls international market price adjustment rate
public static final double MARKET_DELTA = getDoubleProperty("MARKET_DELTA", 0.01); // price adjustment sensitivity to stock use ratio imbalance public static final double MARKET_DELTA = getDoubleProperty("MARKET_DELTA", 0.01); // price adjustment sensitivity to stock use ratio imbalance
public static final double DEFAULT_STOCK_USE_RATIO = getDoubleProperty("DEFAULT_STOCK_USE_RATIO", 0.3); public static final double DEFAULT_STOCK_USE_RATIO = getDoubleProperty("DEFAULT_STOCK_USE_RATIO", 0.3);
...@@ -581,8 +581,8 @@ public class ModelConfig { ...@@ -581,8 +581,8 @@ public class ModelConfig {
public static final double FOREST_MANAGEMENT_COST = IS_FORESTRY_ON ? getDoubleProperty("FOREST_MANAGEMENT_COST", 2.0) : 0.0; // establishment, management etc. $1000/ha public static final double FOREST_MANAGEMENT_COST = IS_FORESTRY_ON ? getDoubleProperty("FOREST_MANAGEMENT_COST", 2.0) : 0.0; // establishment, management etc. $1000/ha
public static final double FOREST_BASE_COST = getDoubleProperty("FOREST_BASE_COST", 0.12); // $1000/ha public static final double FOREST_BASE_COST = getDoubleProperty("FOREST_BASE_COST", 0.12); // $1000/ha
public static final double WOOD_TRADE_BARRIER = getDoubleProperty("WOOD_TRADE_BARRIER", 0.1); //$1000/m3 public static final double WOOD_TRADE_BARRIER = getDoubleProperty("WOOD_TRADE_BARRIER", 0.1); //$1000/m3
public static final double INIT_ROUNDWOOD_PRICE = IS_FORESTRY_ON ? getDoubleProperty("INIT_ROUNDWOOD_PRICE", 0.06) : 0.0; // $1000/m3 public static final double INIT_ROUNDWOOD_PRICE = IS_FORESTRY_ON ? getDoubleProperty("INIT_ROUNDWOOD_PRICE", 0.0655) : 0.0; // $1000/m3
public static final double INIT_FUELWOOD_PRICE = IS_FORESTRY_ON ? getDoubleProperty("INIT_FUELWOOD_PRICE", 0.04) : 0.0; // $1000/m3 public static final double INIT_FUELWOOD_PRICE = IS_FORESTRY_ON ? getDoubleProperty("INIT_FUELWOOD_PRICE", 0.0461) : 0.0; // $1000/m3
public static final int CARBON_WOOD_MAX_TIME = getIntProperty("CARBON_WOOD_MAX_TIME", 160); // upper data limit, years public static final int CARBON_WOOD_MAX_TIME = getIntProperty("CARBON_WOOD_MAX_TIME", 160); // upper data limit, years
// Carbon // Carbon
......
src/ac/ed/lurg/country/CountryAgent.java
+ 3
− 3
View file @ 425084a8
...@@ -178,7 +178,7 @@ public class CountryAgent extends AbstractCountryAgent { ...@@ -178,7 +178,7 @@ public class CountryAgent extends AbstractCountryAgent {
if (crop.isImportedCrop()) { if (crop.isImportedCrop()) {
changeUp = cropPrice.getTradeChangeUp(maxOfProdOrSupply); changeUp = cropPrice.getTradeChangeUp(maxOfProdOrSupply);
//changeDown = cropPrice.getTradeChangeDown(maxOfProdOrSupply, crop.getStockToUseRatio()); changeDown = cropPrice.getTradeChangeDown(maxOfProdOrSupply, crop.getStockToUseRatio());
if (changeUp < 0) { // need to reduce imports to avoid negative stocks if (changeUp < 0) { // need to reduce imports to avoid negative stocks
baseTrade += changeUp; baseTrade += changeUp;
...@@ -225,7 +225,7 @@ public class CountryAgent extends AbstractCountryAgent { ...@@ -225,7 +225,7 @@ public class CountryAgent extends AbstractCountryAgent {
} else { } else {
double maxOfProdOrSupply = carbonUsageData.getCarbonCredits() + Math.max(baseTrade, 0); double maxOfProdOrSupply = carbonUsageData.getCarbonCredits() + Math.max(baseTrade, 0);
changeUp = globalCarbonPrice.getTradeChangeUp(maxOfProdOrSupply); changeUp = globalCarbonPrice.getTradeChangeUp(maxOfProdOrSupply);
changeDown = maxOfProdOrSupply * ModelConfig.MAX_IMPORT_CHANGE; changeDown = globalCarbonPrice.getTradeChangeDown(maxOfProdOrSupply, ModelConfig.DEFAULT_STOCK_USE_RATIO);
if (changeUp < 0) { // need to reduce imports to avoid negative stocks if (changeUp < 0) { // need to reduce imports to avoid negative stocks
baseTrade += changeUp; baseTrade += changeUp;
...@@ -260,7 +260,7 @@ public class CountryAgent extends AbstractCountryAgent { ...@@ -260,7 +260,7 @@ public class CountryAgent extends AbstractCountryAgent {
changeUp = changeDown = 0.0; changeUp = changeDown = 0.0;
} else { } else {
changeUp = woodPrice.getTradeChangeUp(maxOfProdOrSupply); changeUp = woodPrice.getTradeChangeUp(maxOfProdOrSupply);
changeDown = maxOfProdOrSupply * ModelConfig.MAX_IMPORT_CHANGE; changeDown = woodPrice.getTradeChangeDown(maxOfProdOrSupply, ModelConfig.DEFAULT_STOCK_USE_RATIO);
if (changeUp < 0) { // need to reduce imports to avoid negative stocks if (changeUp < 0) { // need to reduce imports to avoid negative stocks
baseTrade += changeUp; baseTrade += changeUp;
......
src/ac/ed/lurg/country/GlobalPrice.java
+ 10
− 2
View file @ 425084a8
...@@ -190,8 +190,8 @@ public class GlobalPrice implements Serializable { ...@@ -190,8 +190,8 @@ public class GlobalPrice implements Serializable {
this.stockLevel = stock; this.stockLevel = stock;
} }
public void setStockToTargetLevel() { public void setStockToTargetLevel(double targetStockUseRatio) {
stockLevel = production * stockUseRatio; stockLevel = production * targetStockUseRatio;
} }
public double getTradeChangeUp(double maxOfProdOrSupply) { public double getTradeChangeUp(double maxOfProdOrSupply) {
...@@ -205,4 +205,12 @@ public class GlobalPrice implements Serializable { ...@@ -205,4 +205,12 @@ public class GlobalPrice implements Serializable {
return (0.9 * stockLevel - (importAmount - getExportsAfterTransportLosses())) * supplyFraction; return (0.9 * stockLevel - (importAmount - getExportsAfterTransportLosses())) * supplyFraction;
} }
public double getTradeChangeDown(double maxOfProdOrSupply, double targetStockUseRatio) {
maxOfProdOrSupply += 0.05 * production / CountryManager.getInstance().getCountryCount();
double supplyFraction = maxOfProdOrSupply / (production * 1.05);
double stockShortfall = Math.max(0, production * targetStockUseRatio - stockLevel); // allow additional exports to replenish stocks
double exportShortfall = Math.max(0, 1.1 * importAmount - getExportsAfterTransportLosses()); // allow 10% excess exports
return supplyFraction * (exportShortfall + stockShortfall);
}
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment