From 8c0ac903ff5ee10f62da946e1181b1ffd6ae947a Mon Sep 17 00:00:00 2001
From: Peter Alexander <peter@blackhillock.co.uk>
Date: Wed, 19 Aug 2015 16:38:37 +0100
Subject: [PATCH] Limit countries by config
---
src/ac/ed/lurg/ModelConfig.java | 2 ++
src/ac/ed/lurg/ModelMain.java | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index 2b40f8ed..1747fcac 100644
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -139,4 +139,6 @@ public class ModelConfig {
public static final double IRRIG_COST_SCALE_FACTOR = getDoubleProperty("IRRIG_COST_SCALE_FACTOR", 2.0);
public static final double TRANSPORT_LOSSES = getDoubleProperty("TRANSPORT_LOSSES", 0.2); // in international trade
+
+ public static final boolean DEBUG_LIMIT_COUNTRIES = getBooleanProperty("DEBUG_LIMIT_COUNTRIES", false);
}
\ No newline at end of file
diff --git a/src/ac/ed/lurg/ModelMain.java b/src/ac/ed/lurg/ModelMain.java
index 5d169487..d86ecb77 100644
--- a/src/ac/ed/lurg/ModelMain.java
+++ b/src/ac/ed/lurg/ModelMain.java
@@ -301,8 +301,10 @@ public class ModelMain {
for (CompositeCountry cc : countryGrouping) {
// DEBUG code
- if (!(cc.getName().equals("United States of America") || cc.getName().equals("Russian Federationxx") || cc.getName().equals("South Asia_otherxx")) ) {
- continue;
+ if (ModelConfig.DEBUG_LIMIT_COUNTRIES) {
+ if (!(cc.getName().equals("United States of America") || cc.getName().equals("Russian Federationxx") || cc.getName().equals("South Asia_otherxx")) ) {
+ continue;
+ }
}
List<RasterKey> keys = countryBoundaryRaster.getKeysFor(cc);
--
GitLab