From 917d5d3d2c75eea6405f6e0807484d943df1d2da Mon Sep 17 00:00:00 2001 From: oblonski Date: Wed, 22 Apr 2015 00:43:13 +0200 Subject: [PATCH] bugfix #155 --- .../src/main/java/jsprit/core/algorithm/box/Jsprit.java | 6 +++++- 1 file changed, 5 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 4101fb40..0afe2038 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 @@ -256,6 +256,8 @@ public class Jsprit { private boolean addCoreConstraints; + private SolutionCostCalculator objectiveFunction = null; + private Properties properties; private Jsprit(Builder builder) { @@ -265,6 +267,7 @@ public class Jsprit { this.noThreads = builder.noThreads; this.addCoreConstraints = builder.addConstraints; this.properties = builder.properties; + this.objectiveFunction = builder.objectiveFunction; } private VehicleRoutingAlgorithm create(final VehicleRoutingProblem vrp){ @@ -503,7 +506,8 @@ public class Jsprit { return Double.valueOf(string); } - private static SolutionCostCalculator getObjectiveFunction(final VehicleRoutingProblem vrp, final double maxCosts) { + private SolutionCostCalculator getObjectiveFunction(final VehicleRoutingProblem vrp, final double maxCosts) { + if(objectiveFunction != null) return objectiveFunction; return new SolutionCostCalculator() {