From a33e4a8234789d52018575ce2b76238198220a5a Mon Sep 17 00:00:00 2001 From: Peter Alexander <peter@blackhillock.co.uk> Date: Fri, 27 Sep 2019 11:43:43 +0100 Subject: [PATCH] Change to apply forced protected areas at a constant rate --- src/ac/ed/lurg/country/CountryAgentManager.java | 1 - src/ac/ed/lurg/landuse/LandUseItem.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ac/ed/lurg/country/CountryAgentManager.java b/src/ac/ed/lurg/country/CountryAgentManager.java index 25624af5..8fe33be5 100644 --- a/src/ac/ed/lurg/country/CountryAgentManager.java +++ b/src/ac/ed/lurg/country/CountryAgentManager.java @@ -20,7 +20,6 @@ import ac.ed.lurg.landuse.IrrigationItem; import ac.ed.lurg.landuse.IrrigationRasterSet; import ac.ed.lurg.landuse.LandUseItem; import ac.ed.lurg.types.CropType; -import ac.ed.lurg.utils.LazyHashMap; import ac.ed.lurg.utils.LogWriter; import ac.ed.lurg.yield.YieldRaster; import ac.sac.raster.IntegerRasterItem; diff --git a/src/ac/ed/lurg/landuse/LandUseItem.java b/src/ac/ed/lurg/landuse/LandUseItem.java index 25df5728..c59c08aa 100644 --- a/src/ac/ed/lurg/landuse/LandUseItem.java +++ b/src/ac/ed/lurg/landuse/LandUseItem.java @@ -319,8 +319,8 @@ public class LandUseItem implements InterpolatingRasterItem<LandUseItem>, Serial double proportion = 1.0; if (year < ModelConfig.FORCE_PROTECTED_AREAS_END_YEAR) - proportion = 1.0 - (ModelConfig.FORCE_PROTECTED_AREAS_END_YEAR - year) / (double)(ModelConfig.FORCE_PROTECTED_AREAS_END_YEAR - ModelConfig.FORCE_PROTECTED_AREAS_START_YEAR); - + proportion = 1.0 / (ModelConfig.FORCE_PROTECTED_AREAS_END_YEAR - year); + suitable = Math.max(0, currentAgri + natAvailForAgriExclMinRateSlope * proportion); // netNatAvailForAgri is negative, but suitable area < 0 is not sensible (seems to happen with high barren areas) } else -- GitLab