diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java
index 276026c6..eb7054ae 100644
--- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java
+++ b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java
@@ -95,6 +95,7 @@ class LocalActivityInsertionCostsCalculator implements ActivityInsertionCostsCal
double tp_costs_newAct_nextAct = routingCosts.getTransportCost(newAct.getLocation(), nextAct.getLocation(), newAct_endTime, iFacts.getNewDriver(), iFacts.getNewVehicle());
double tp_time_newAct_nextAct = routingCosts.getTransportTime(newAct.getLocation(), nextAct.getLocation(), newAct_endTime, iFacts.getNewDriver(), iFacts.getNewVehicle());
double nextAct_arrTime = newAct_endTime + tp_time_newAct_nextAct;
+ double endTime_nextAct_new = CalculationUtils.getActivityEndTime(nextAct_arrTime, nextAct);
double act_costs_nextAct = activityCosts.getActivityCost(nextAct, nextAct_arrTime, iFacts.getNewDriver(), iFacts.getNewVehicle());
if(hasVariableDeparture(iFacts.getNewVehicle())){
@@ -110,7 +111,8 @@ class LocalActivityInsertionCostsCalculator implements ActivityInsertionCostsCal
}
else{
double tp_costs_prevAct_nextAct = routingCosts.getTransportCost(prevAct.getLocation(), nextAct.getLocation(), prevAct.getEndTime(), iFacts.getRoute().getDriver(), iFacts.getRoute().getVehicle());
- double arrTime_nextAct = prevAct.getEndTime() + routingCosts.getTransportTime(prevAct.getLocation(), nextAct.getLocation(), prevAct.getEndTime(), iFacts.getRoute().getDriver(), iFacts.getRoute().getVehicle());
+ double arrTime_nextAct = depTimeAtPrevAct + routingCosts.getTransportTime(prevAct.getLocation(), nextAct.getLocation(), prevAct.getEndTime(), iFacts.getRoute().getDriver(), iFacts.getRoute().getVehicle());
+ double endTime_nextAct_old = CalculationUtils.getActivityEndTime(arrTime_nextAct,nextAct);
double actCost_nextAct = activityCosts.getActivityCost(nextAct, arrTime_nextAct, iFacts.getRoute().getDriver(), iFacts.getRoute().getVehicle());
if(isStart(prevAct) && hasVariableDeparture(iFacts.getRoute().getVehicle())) {
actCost_nextAct = 0;
@@ -118,7 +120,12 @@ class LocalActivityInsertionCostsCalculator implements ActivityInsertionCostsCal
else if(hasVariableDeparture(iFacts.getRoute().getVehicle())){
actCost_nextAct = activityCosts.getActivityCost(nextAct, arrTime_nextAct + slack_time_prev, iFacts.getRoute().getDriver(), iFacts.getRoute().getVehicle());
}
- oldCosts = tp_costs_prevAct_nextAct + solutionCompletenessRatio * activityCostsWeight * actCost_nextAct;
+ double endTimeDelay_nextAct = Math.max(0,endTime_nextAct_new - endTime_nextAct_old);
+ Double futureWaiting = stateManager.getActivityState(nextAct,iFacts.getRoute().getVehicle(),InternalStates.FUTURE_WAITING,Double.class);
+ if(futureWaiting == null) futureWaiting = 0.;
+ double waitingTime_savings_timeUnit = Math.min(futureWaiting,endTimeDelay_nextAct);
+ double waitingTime_savings = waitingTime_savings_timeUnit * iFacts.getRoute().getVehicle().getType().getVehicleCostParams().perWaitingTimeUnit;
+ oldCosts = tp_costs_prevAct_nextAct + solutionCompletenessRatio * activityCostsWeight * ( actCost_nextAct + waitingTime_savings);
}
return totalCosts - oldCosts;
}
diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/InternalStates.java b/jsprit-core/src/main/java/jsprit/core/algorithm/state/InternalStates.java
index a210fc8b..c22e3839 100644
--- a/jsprit-core/src/main/java/jsprit/core/algorithm/state/InternalStates.java
+++ b/jsprit-core/src/main/java/jsprit/core/algorithm/state/InternalStates.java
@@ -46,4 +46,6 @@ public class InternalStates {
public static final StateId WAITING = new StateFactory.StateIdImpl("waiting",11);
public static final StateId TIME_SLACK = new StateFactory.StateIdImpl("time_slack",12);
+
+ public static final StateId FUTURE_WAITING = new StateFactory.StateIdImpl("future_waiting",13);
}
diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateFutureWaitingTimes.java b/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateFutureWaitingTimes.java
new file mode 100644
index 00000000..61b99284
--- /dev/null
+++ b/jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateFutureWaitingTimes.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (C) 2014 Stefan Schroeder
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3.0 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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
+ * License along with this library. If not, see .
+ ******************************************************************************/
+package jsprit.core.algorithm.state;
+
+import jsprit.core.problem.cost.VehicleRoutingTransportCosts;
+import jsprit.core.problem.solution.route.VehicleRoute;
+import jsprit.core.problem.solution.route.activity.ReverseActivityVisitor;
+import jsprit.core.problem.solution.route.activity.TourActivity;
+
+/**
+ * Updates and memorizes latest operation start times at activities.
+ *
+ * @author schroeder
+ *
+ */
+public class UpdateFutureWaitingTimes implements ReverseActivityVisitor, StateUpdater{
+
+ private StateManager states;
+
+ private VehicleRoute route;
+
+ private VehicleRoutingTransportCosts transportCosts;
+
+ private double futureWaiting;
+
+ public UpdateFutureWaitingTimes(StateManager states, VehicleRoutingTransportCosts tpCosts) {
+ super();
+ this.states = states;
+ this.transportCosts = tpCosts;
+ }
+
+ @Override
+ public void begin(VehicleRoute route) {
+ this.route = route;
+ this.futureWaiting = 0.;
+ }
+
+ @Override
+ public void visit(TourActivity activity) {
+ states.putInternalTypedActivityState(activity,route.getVehicle(),InternalStates.FUTURE_WAITING,futureWaiting);
+ futureWaiting += Math.max(activity.getTheoreticalEarliestOperationStartTime() - activity.getArrTime(),0);
+ }
+
+ @Override
+ public void finish() {}
+}
diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java
index d7509353..91c0bd75 100644
--- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java
+++ b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java
@@ -16,12 +16,13 @@
******************************************************************************/
package jsprit.core.algorithm.recreate;
-import jsprit.core.algorithm.state.StateManager;
+import jsprit.core.algorithm.state.*;
import jsprit.core.problem.Location;
import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.cost.VehicleRoutingActivityCosts;
import jsprit.core.problem.cost.VehicleRoutingTransportCosts;
import jsprit.core.problem.cost.WaitingTimeCosts;
+import jsprit.core.problem.job.Job;
import jsprit.core.problem.job.Service;
import jsprit.core.problem.misc.JobInsertionContext;
import jsprit.core.problem.solution.route.VehicleRoute;
@@ -33,6 +34,9 @@ import jsprit.core.util.CostFactory;
import org.junit.Before;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.Arrays;
+
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -156,38 +160,17 @@ public class TestLocalActivityInsertionCostsCalculator {
assertEquals(40.,c,0.01);
}
-// @Test
-// public void test_(){
-// VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
-// VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0, 0)).build();
-// Service prevS = Service.Builder.newInstance("prev").setLocation(Location.newInstance(10,0)).build();
-// Service newS = Service.Builder.newInstance("new").setLocation(Location.newInstance(40, 0)).build();
-// Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(140,150)).build();
-// ServiceActivity prevAct = ServiceActivity.newInstance(prevS);
-// ServiceActivity newAct = ServiceActivity.newInstance(newS);
-// ServiceActivity nextAct = ServiceActivity.newInstance(nextS);
-// VehicleRoute route = VehicleRoute.Builder.newInstance(v).addService(prevS).addService(nextS).build();
-// JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
-// LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),new StateManager(mock(VehicleRoutingProblem.class)) );
-// calc.setSolutionCompletenessRatio(1.);
-//// calc.setVariableStartTimeFactor(1.);
-// double c = calc.getCosts(context,prevAct,nextAct,newAct,0);
-// assertEquals(0.,c,0.01);
-// }
-
@Test
- public void test2(){
+ public void whenAddingNewBetweenStartAndAct_itShouldCalcInsertionCostsCorrectly(){
VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(false).setType(type).setStartLocation(Location.newInstance(0,0)).build();
-// VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
-//
-// Service prevS = Service.Builder.newInstance("prev").setLocation(Location.newInstance(10,0)).build();
+
Service newS = Service.Builder.newInstance("new").setServiceTime(10).setLocation(Location.newInstance(10, 0)).build();
- Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0))
- .setTimeWindow(TimeWindow.newInstance(40,50)).build();
+ Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30, 0))
+ .setTimeWindow(TimeWindow.newInstance(40, 50)).build();
Start prevAct = new Start(Location.newInstance(0,0),0,100);
-// ServiceActivity prevAct = ServiceActivity.newInstance(prevS);
+
ServiceActivity newAct = ServiceActivity.newInstance(newS);
ServiceActivity nextAct = ServiceActivity.newInstance(nextS);
VehicleRoute route = VehicleRoute.Builder.newInstance(v).addService(nextS).build();
@@ -199,10 +182,9 @@ public class TestLocalActivityInsertionCostsCalculator {
}
@Test
- public void test3(){
+ public void whenAddingNewBetweenStartAndAct2_itShouldCalcInsertionCostsCorrectly(){
VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
-// VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(false).setType(type).setStartLocation(Location.newInstance(0,0)).build();
VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(false).setType(type).setStartLocation(Location.newInstance(0,0)).build();
Service newS = Service.Builder.newInstance("new").setServiceTime(10).setLocation(Location.newInstance(10, 0)).build();
@@ -221,13 +203,13 @@ public class TestLocalActivityInsertionCostsCalculator {
}
@Test
- public void test4(){
+ public void whenAddingNewInEmptyRoute_itShouldCalcInsertionCostsCorrectly(){
VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(false).setType(type).setStartLocation(Location.newInstance(0,0)).build();
// VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
- Service newS = Service.Builder.newInstance("new").setServiceTime(10).setLocation(Location.newInstance(10, 0)).setTimeWindow(TimeWindow.newInstance(100,150)).build();
+ Service newS = Service.Builder.newInstance("new").setServiceTime(10).setLocation(Location.newInstance(10, 0)).setTimeWindow(TimeWindow.newInstance(100, 150)).build();
// Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,50)).build();
Start prevAct = new Start(Location.newInstance(0,0),0,100);
// ServiceActivity prevAct = ServiceActivity.newInstance(prevS);
@@ -242,5 +224,286 @@ public class TestLocalActivityInsertionCostsCalculator {
double c = calc.getCosts(context,prevAct,nextAct,newAct,0);
assertEquals(110.,c,0.01);
}
+
+ @Test
+ public void whenAddingNewBetweenTwoActs_itShouldCalcInsertionCostsCorrectly(){
+ VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
+
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(false).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+// VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+
+ Service prevS = Service.Builder.newInstance("prev").setLocation(Location.newInstance(10, 0)).build();
+ Service newS = Service.Builder.newInstance("new").setServiceTime(10).setLocation(Location.newInstance(20, 0)).build();
+ Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,50)).build();
+
+ ServiceActivity prevAct = ServiceActivity.newInstance(prevS);
+ ServiceActivity newAct = ServiceActivity.newInstance(newS);
+ ServiceActivity nextAct = ServiceActivity.newInstance(nextS);
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v).addService(prevS).addService(nextS).build();
+ JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),null );
+ calc.setSolutionCompletenessRatio(1.);
+ double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
+ assertEquals(-10.,c,0.01);
+ }
+
+ @Test
+ public void whenAddingNewWithTWBetweenTwoActs_itShouldCalcInsertionCostsCorrectly(){
+ VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
+
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(false).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+// VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+
+ Service prevS = Service.Builder.newInstance("prev").setLocation(Location.newInstance(10,0)).build();
+ Service newS = Service.Builder.newInstance("new").setServiceTime(10).setTimeWindow(TimeWindow.newInstance(100, 120)).setLocation(Location.newInstance(20, 0)).build();
+ Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,500)).build();
+
+ ServiceActivity prevAct = ServiceActivity.newInstance(prevS);
+ ServiceActivity newAct = ServiceActivity.newInstance(newS);
+ ServiceActivity nextAct = ServiceActivity.newInstance(nextS);
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v).addService(prevS).addService(nextS).build();
+ JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),null );
+ calc.setSolutionCompletenessRatio(0.5);
+ double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
+ assertEquals(35.,c,0.01);
+ }
+
+ @Test
+ public void whenAddingNewWithTWBetweenTwoActs2_itShouldCalcInsertionCostsCorrectly(){
+ VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
+
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(false).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+// VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+
+ Service prevS = Service.Builder.newInstance("prev").setLocation(Location.newInstance(10,0)).build();
+ Service newS = Service.Builder.newInstance("new").setServiceTime(10).setTimeWindow(TimeWindow.newInstance(100,120)).setLocation(Location.newInstance(20, 0)).build();
+ Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,500)).build();
+
+ Service afterNextS = Service.Builder.newInstance("afterNext").setLocation(Location.newInstance(40,0)).setTimeWindow(TimeWindow.newInstance(400,500)).build();
+
+ ServiceActivity prevAct = ServiceActivity.newInstance(prevS);
+ ServiceActivity newAct = ServiceActivity.newInstance(newS);
+ ServiceActivity nextAct = ServiceActivity.newInstance(nextS);
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v).addService(prevS).addService(nextS).addService(afterNextS).build();
+ JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),null );
+ calc.setSolutionCompletenessRatio(1.);
+ double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
+ assertEquals(-90.,c,0.01);
+ //360
+ //270
+ }
+
+ @Test
+ public void whenAddingNewWithTWBetweenTwoActs3_itShouldCalcInsertionCostsCorrectly(){
+ VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
+
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(false).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+// VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+
+ Service prevS = Service.Builder.newInstance("prev").setLocation(Location.newInstance(10,0)).build();
+ Service newS = Service.Builder.newInstance("new").setServiceTime(10).setTimeWindow(TimeWindow.newInstance(100,120)).setLocation(Location.newInstance(20, 0)).build();
+ Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,500)).build();
+
+ Service afterNextS = Service.Builder.newInstance("afterNext").setLocation(Location.newInstance(40,0)).setTimeWindow(TimeWindow.newInstance(80,500)).build();
+ Service afterAfterNextS = Service.Builder.newInstance("afterAfterNext").setLocation(Location.newInstance(40,0)).setTimeWindow(TimeWindow.newInstance(100,500)).build();
+
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addVehicle(v).addJob(prevS).addJob(newS).addJob(nextS)
+ .addJob(afterNextS).addJob(afterAfterNextS).build();
+
+ TourActivity prevAct = vrp.getActivities(prevS).get(0);
+ TourActivity newAct = vrp.getActivities(newS).get(0);
+ TourActivity nextAct = vrp.getActivities(nextS).get(0);
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v).setJobActivityFactory(vrp.getJobActivityFactory()).addService(prevS).addService(nextS).addService(afterNextS).addService(afterAfterNextS).build();
+
+ StateManager stateManager = getStateManager(vrp,route);
+
+ JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),stateManager);
+ calc.setSolutionCompletenessRatio(1.);
+ double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
+ assertEquals(20.,c,0.01);
+ //start-delay = new - old = 120 - 40 = 80 > future waiting time savings = 30 + 20 + 10
+ //ref: 10 + 50 + 20 = 80
+ //new: 80 - 10 - 30 - 20 = 20
+ /*
+ w(new) + w(next) - w_old(next) - min{start_delay(next),future_waiting}
+ */
+ }
+
+ @Test
+ public void whenAddingNewWithTWBetweenTwoActs4_itShouldCalcInsertionCostsCorrectly(){
+ VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
+
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(false).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+// VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+
+ Service prevS = Service.Builder.newInstance("prev").setLocation(Location.newInstance(10,0)).build();
+ Service newS = Service.Builder.newInstance("new").setServiceTime(10).setTimeWindow(TimeWindow.newInstance(100,120)).setLocation(Location.newInstance(20, 0)).build();
+ Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,500)).build();
+
+ Service afterNextS = Service.Builder.newInstance("afterNext").setLocation(Location.newInstance(40,0)).setTimeWindow(TimeWindow.newInstance(80,500)).build();
+ Service afterAfterNextS = Service.Builder.newInstance("afterAfterNext").setLocation(Location.newInstance(50,0)).setTimeWindow(TimeWindow.newInstance(100,500)).build();
+
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addVehicle(v).addJob(prevS).addJob(newS).addJob(nextS)
+ .addJob(afterNextS).addJob(afterAfterNextS).build();
+
+ TourActivity prevAct = vrp.getActivities(prevS).get(0);
+ TourActivity newAct = vrp.getActivities(newS).get(0);
+ TourActivity nextAct = vrp.getActivities(nextS).get(0);
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v).setJobActivityFactory(vrp.getJobActivityFactory()).addService(prevS).addService(nextS).addService(afterNextS).addService(afterAfterNextS).build();
+ JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
+
+ StateManager stateManager = getStateManager(vrp, route);
+
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),stateManager);
+ calc.setSolutionCompletenessRatio(1.);
+ double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
+ assertEquals(30.,c,0.01);
+ //ref: 10 + 30 + 10 = 50
+ //new: 50 - 50 = 0
+
+ /*
+ activity start time delay at next act = start-time-old - start-time-new is always bigger than subsequent waiting time savings
+ */
+ /*
+ old = 10 + 30 + 10 = 50
+ new = 80 + 0 - 10 - min{80,40} = 30
+ */
+ }
+
+ @Test
+ public void whenAddingNewWithTWBetweenTwoActs4WithVarStart_itShouldCalcInsertionCostsCorrectly(){
+ VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
+
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+// VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+
+ Service prevS = Service.Builder.newInstance("prev").setLocation(Location.newInstance(10,0)).build();
+ Service newS = Service.Builder.newInstance("new").setServiceTime(10).setTimeWindow(TimeWindow.newInstance(100,120)).setLocation(Location.newInstance(20, 0)).build();
+ Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,500)).build();
+
+ Service afterNextS = Service.Builder.newInstance("afterNext").setLocation(Location.newInstance(40,0)).setTimeWindow(TimeWindow.newInstance(80,500)).build();
+ Service afterAfterNextS = Service.Builder.newInstance("afterAfterNext").setLocation(Location.newInstance(50,0)).setTimeWindow(TimeWindow.newInstance(100,500)).build();
+
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addVehicle(v).addJob(prevS).addJob(newS).addJob(nextS)
+ .addJob(afterNextS).addJob(afterAfterNextS).build();
+
+ TourActivity prevAct = vrp.getActivities(prevS).get(0);
+ TourActivity newAct = vrp.getActivities(newS).get(0);
+ TourActivity nextAct = vrp.getActivities(nextS).get(0);
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v).setJobActivityFactory(vrp.getJobActivityFactory()).addService(prevS).addService(nextS).addService(afterNextS).addService(afterAfterNextS).build();
+ JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
+
+ StateManager stateManager = getStateManager(vrp, route);
+
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),stateManager);
+ calc.setSolutionCompletenessRatio(1.);
+ double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
+ assertEquals(0.,c,0.01);
+ /*
+ activity start time delay at next act = start-time-old - start-time-new is always bigger than subsequent waiting time savings
+ */
+ /*
+ old = 10 + 30 + 10 = 50
+ new = 80 + 0 - 10 - min{80,40} = 30
+ */
+ }
+
+ @Test
+ public void whenAddingNewWithTWBetweenTwoActs3WithVarStart_itShouldCalcInsertionCostsCorrectly(){
+ VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
+
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+// VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+
+ Service prevS = Service.Builder.newInstance("prev").setLocation(Location.newInstance(10,0)).build();
+ Service newS = Service.Builder.newInstance("new").setServiceTime(10).setTimeWindow(TimeWindow.newInstance(50,70)).setLocation(Location.newInstance(20, 0)).build();
+ Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,70)).build();
+
+ Service afterNextS = Service.Builder.newInstance("afterNext").setLocation(Location.newInstance(40,0)).setTimeWindow(TimeWindow.newInstance(50,100)).build();
+ Service afterAfterNextS = Service.Builder.newInstance("afterAfterNext").setLocation(Location.newInstance(50,0)).setTimeWindow(TimeWindow.newInstance(100,500)).build();
+
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addVehicle(v).addJob(prevS).addJob(newS).addJob(nextS)
+ .addJob(afterNextS).addJob(afterAfterNextS).build();
+
+ TourActivity prevAct = vrp.getActivities(prevS).get(0);
+ TourActivity newAct = vrp.getActivities(newS).get(0);
+ TourActivity nextAct = vrp.getActivities(nextS).get(0);
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v).setJobActivityFactory(vrp.getJobActivityFactory()).addService(prevS).addService(nextS).addService(afterNextS).addService(afterAfterNextS).build();
+ JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
+
+ StateManager stateManager = getStateManager(vrp, route);
+
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),stateManager);
+ calc.setSolutionCompletenessRatio(1.);
+ double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
+ assertEquals(-10.,c,0.01);
+ /*
+ activity start time delay at next act = start-time-old - start-time-new is always bigger than subsequent waiting time savings
+ */
+ /*
+ old = s:40,act1:50,act2:60,act3:70,act4:80 --> w=20
+ new = s:30,act1:40,act2:50,act3:70,act4:80,act5:90 --> w=10 => -10
+ */
+ }
+
+ @Test
+ public void whenAddingNewWithTWBetweenTwoActs2WithVarStart_itShouldCalcInsertionCostsCorrectly(){
+ VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
+
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+// VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(true).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+
+ Service prevS = Service.Builder.newInstance("prev").setLocation(Location.newInstance(10,0)).build();
+ Service newS = Service.Builder.newInstance("new").setServiceTime(10).setTimeWindow(TimeWindow.newInstance(10,20)).setLocation(Location.newInstance(20, 0)).build();
+ Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,70)).build();
+
+ Service afterNextS = Service.Builder.newInstance("afterNext").setLocation(Location.newInstance(40,0)).setTimeWindow(TimeWindow.newInstance(50,100)).build();
+ Service afterAfterNextS = Service.Builder.newInstance("afterAfterNext").setLocation(Location.newInstance(50,0)).setTimeWindow(TimeWindow.newInstance(100,500)).build();
+
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addVehicle(v).addJob(prevS).addJob(newS).addJob(nextS)
+ .addJob(afterNextS).addJob(afterAfterNextS).build();
+
+ TourActivity prevAct = vrp.getActivities(prevS).get(0);
+ TourActivity newAct = vrp.getActivities(newS).get(0);
+ TourActivity nextAct = vrp.getActivities(nextS).get(0);
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v).setJobActivityFactory(vrp.getJobActivityFactory()).addService(prevS).addService(nextS).addService(afterNextS).addService(afterAfterNextS).build();
+ JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
+
+ StateManager stateManager = getStateManager(vrp, route);
+
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),stateManager);
+ calc.setSolutionCompletenessRatio(1.);
+ double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
+ assertEquals(20.,c,0.01);
+ /*
+ activity start time delay at next act = start-time-old - start-time-new is always bigger than subsequent waiting time savings
+ */
+ /*
+ old = s:40,act1:50,act2:60,act3:70,act4:80 --> w=20
+ new = s:0,act1:10,act2:20,act3:40,act4:50,act5:60 --> w=40 => 20
+ */
+ }
+
+ private StateManager getStateManager(VehicleRoutingProblem vrp, VehicleRoute route) {
+ StateManager stateManager = new StateManager(vrp);
+ stateManager.addStateUpdater(new UpdateTimeSlack(stateManager,vrp.getTransportCosts()));
+ stateManager.addStateUpdater(new UpdateActivityTimes(vrp.getTransportCosts()));
+ stateManager.addStateUpdater(new UpdateVehicleDependentPracticalTimeWindows(stateManager,vrp.getTransportCosts()));
+ stateManager.addStateUpdater(new UpdateFutureWaitingTimes(stateManager,vrp.getTransportCosts()));
+ stateManager.addStateUpdater(new UpdateDepartureTime(vrp.getTransportCosts()));
+ stateManager.informInsertionStarts(Arrays.asList(route),new ArrayList());
+ return stateManager;
+ }
}
diff --git a/jsprit-examples/src/main/java/jsprit/examples/VariableStartAndWaitingTimeExample.java b/jsprit-examples/src/main/java/jsprit/examples/VariableStartAndWaitingTimeExample.java
index 915b5d78..20b0f6c5 100644
--- a/jsprit-examples/src/main/java/jsprit/examples/VariableStartAndWaitingTimeExample.java
+++ b/jsprit-examples/src/main/java/jsprit/examples/VariableStartAndWaitingTimeExample.java
@@ -35,25 +35,26 @@ public class VariableStartAndWaitingTimeExample {
public static void main(String[] args) {
- VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("type").setCostPerDistance(1.5).setCostPerWaitingTime(1.0).build();
+ VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("type").setCostPerDistance(2.5).setCostPerWaitingTime(2.0).build();
+// VehicleTypeImpl type1 = VehicleTypeImpl.Builder.newInstance("type1").setCostPerDistance(1.5).setCostPerWaitingTime(.0).build();
VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setType(type).setReturnToDepot(true)
.setHasVariableDepartureTime(true).setStartLocation(Location.newInstance(0, 0)).build();
VehicleImpl v3 = VehicleImpl.Builder.newInstance("v3").setType(type).setReturnToDepot(true)
.setHasVariableDepartureTime(true).setStartLocation(Location.newInstance(0, 0)).build();
VehicleImpl v4 = VehicleImpl.Builder.newInstance("v4").setType(type).setReturnToDepot(true)
- .setHasVariableDepartureTime(true).setStartLocation(Location.newInstance(0, 0)).build();
+ .setHasVariableDepartureTime(false).setStartLocation(Location.newInstance(0, 0)).build();
VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance();
Random r = RandomNumberGeneration.newInstance();
- for(int i=0;i<20;i++){
- Service s = Service.Builder.newInstance("s_"+i)
+ for(int i=0;i<40;i++){
+ Service s = Service.Builder.newInstance("s_"+i).setServiceTime(0)
// .setTimeWindow(TimeWindow.newInstance(r.nextInt(50),100+r.nextInt(150)))
.setLocation(Location.newInstance(1 - r.nextInt(5), 10 + r.nextInt(10))).build();
vrpBuilder.addJob(s);
}
- Service s1 = Service.Builder.newInstance("s12").setLocation(Location.newInstance(-3, 15)).setTimeWindow(TimeWindow.newInstance(20, 40)).build();
+ Service s1 = Service.Builder.newInstance("s12").setLocation(Location.newInstance(-3, 15)).setTimeWindow(TimeWindow.newInstance(20, 60)).build();
// Service s4 = Service.Builder.newInstance("s13").setLocation(Location.newInstance(5,15)).setTimeWindow(TimeWindow.newInstance(100, 160)).build();
- Service s2 = Service.Builder.newInstance("s10").setLocation(Location.newInstance(-1, 15)).setTimeWindow(TimeWindow.newInstance(200, 210)).build();
+ Service s2 = Service.Builder.newInstance("s10").setLocation(Location.newInstance(-1, 15)).setTimeWindow(TimeWindow.newInstance(200, 250)).build();
Service s3 = Service.Builder.newInstance("s11").setLocation(Location.newInstance(10, 10)).setTimeWindow(TimeWindow.newInstance(300, 310)).build();
vrpBuilder.addJob(s1).addJob(s2).addJob(s3).addVehicle(v4).addVehicle(v2).addVehicle(v3);
vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.FINITE);
@@ -70,8 +71,8 @@ public class VariableStartAndWaitingTimeExample {
return Jsprit.Builder.newInstance(vrp)
.addCoreStateAndConstraintStuff(true)
.setStateAndConstraintManager(stateManager, constraintManager)
- .setProperty(Jsprit.Parameter.THRESHOLD_INI, "0.1")
- .setProperty(Jsprit.Parameter.THRESHOLD_ALPHA, "0.3")
+// .setProperty(Jsprit.Parameter.THRESHOLD_INI, "0.1")
+// .setProperty(Jsprit.Parameter.THRESHOLD_ALPHA, "0.3")
// .setProperty(Parameter.)
// .setProperty(Jsprit.Parameter.CONSTRUCTION, Jsprit.Construction.BEST_INSERTION.toString())
.setObjectiveFunction(new SolutionCostCalculator() {
@@ -96,7 +97,7 @@ public class VariableStartAndWaitingTimeExample {
}
};
VehicleRoutingAlgorithm vra = algorithmFactory.createAlgorithm(vrp);
- vra.setMaxIterations(1000);
+ vra.setMaxIterations(500);
vra.addListener(new AlgorithmSearchProgressChartListener("output/search"));
VehicleRoutingProblemSolution solution = Solutions.bestOf(vra.searchSolutions());
System.out.println("c: " + solution.getCost());