From be2358ab7c5cb50950d202a6933db64d6e0917f4 Mon Sep 17 00:00:00 2001 From: oblonski Date: Thu, 24 Sep 2015 08:00:21 +0200 Subject: [PATCH] driver breaks --- .../algorithm/recreate/BreakInsertionCalculator.java | 12 ++++-------- .../src/main/java/jsprit/examples/BreakExample.java | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java index 976537aa..192be5dd 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java @@ -11,7 +11,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public + * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . ******************************************************************************/ package jsprit.core.algorithm.recreate; @@ -80,16 +80,16 @@ final class BreakInsertionCalculator implements JobInsertionCostsCalculator{ public void setJobActivityFactory(JobActivityFactory jobActivityFactory){ this.activityFactory = jobActivityFactory; } - + @Override public String toString() { return "[name=calculatesServiceInsertion]"; } - + /** * Calculates the marginal cost of inserting job i locally. This is based on the * assumption that cost changes can entirely covered by only looking at the predecessor i-1 and its successor i+1. - * + * */ @Override public InsertionData getInsertionData(final VehicleRoute currentRoute, final Job jobToInsert, final Vehicle newVehicle, double newVehicleDepartureTime, final Driver newDriver, final double bestKnownCosts) { @@ -103,10 +103,6 @@ final class BreakInsertionCalculator implements JobInsertionCostsCalculator{ BreakActivity breakAct2Insert = (BreakActivity) activityFactory.createActivities(breakToInsert).get(0); insertionContext.getAssociatedActivities().add(breakAct2Insert); - boolean differentVehicles = false; - if(!currentRoute.isEmpty()){ - differentVehicles = currentRoute.getVehicle() != newVehicle; - } /* check hard constraints at route level */ diff --git a/jsprit-examples/src/main/java/jsprit/examples/BreakExample.java b/jsprit-examples/src/main/java/jsprit/examples/BreakExample.java index e9bba9e2..6f4b9eb5 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/BreakExample.java +++ b/jsprit-examples/src/main/java/jsprit/examples/BreakExample.java @@ -47,7 +47,7 @@ public class BreakExample { */ final int WEIGHT_INDEX = 0; VehicleTypeImpl.Builder vehicleTypeBuilder = VehicleTypeImpl.Builder.newInstance("vehicleType") - .addCapacityDimension(WEIGHT_INDEX, 2).setCostPerWaitingTime(1.); + .addCapacityDimension(WEIGHT_INDEX, 2).setCostPerWaitingTime(1.0); VehicleType vehicleType = vehicleTypeBuilder.build(); /*