From e8d13ad7aa5c9b42a5ed523e1ef6ba5f4e95bbac Mon Sep 17 00:00:00 2001 From: oblonski Date: Fri, 23 Oct 2015 17:12:52 +0200 Subject: [PATCH] make maxTransportCost a variable property --- .../main/java/jsprit/core/algorithm/box/Jsprit.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/box/Jsprit.java b/jsprit-core/src/main/java/jsprit/core/algorithm/box/Jsprit.java index 3a7a0618..0a00b406 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/box/Jsprit.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/box/Jsprit.java @@ -97,6 +97,7 @@ public class Jsprit { RUIN_WORST_NOISE_LEVEL("worst.noise_level"), RUIN_WORST_NOISE_PROB("worst.noise_prob"), FAST_REGRET("regret.fast"), + MAX_TRANSPORT_COSTS("max_transport_costs"), CONSTRUCTION("construction"); String paraName; @@ -336,7 +337,14 @@ public class Jsprit { JobNeighborhoods jobNeighborhoods = new JobNeighborhoodsFactory().createNeighborhoods(vrp, new AvgServiceAndShipmentDistance(vrp.getTransportCosts()), (int) (vrp.getJobs().values().size() * 0.5)); jobNeighborhoods.initialise(); - final double maxCosts = jobNeighborhoods.getMaxDistance(); + + final double maxCosts; + if(properties.containsKey(Parameter.MAX_TRANSPORT_COSTS.toString())){ + maxCosts = Double.parseDouble(getProperty(Parameter.MAX_TRANSPORT_COSTS.toString())); + } + else{ + maxCosts = jobNeighborhoods.getMaxDistance(); + } IterationStartsListener noiseConfigurator; if (noThreads > 1) {