Note that this modifies arrTime and endTime of each activity in a route.
- *
- * @author stefan
- *
- */
-public class UpdateTimeSlack implements ActivityVisitor, StateUpdater{
-
- private VehicleRoute route;
-
- private StateManager stateManager;
-
- private VehicleRoutingTransportCosts costs;
-
- private double prevTimeSlack;
-
- private double prevActDeparture;
-
- private TourActivity prevAct;
-
- public UpdateTimeSlack(StateManager stateManager, VehicleRoutingTransportCosts costs) {
- this.stateManager = stateManager;
- this.costs = costs;
- }
-
- @Override
- public void begin(VehicleRoute route) {
- if(route.isEmpty()) return;
- this.route = route;
- prevActDeparture = route.getVehicle().getEarliestDeparture();
- TourActivity first = route.getActivities().get(0);
- double latestArr = stateManager.getActivityState(first,route.getVehicle(),InternalStates.LATEST_OPERATION_START_TIME,Double.class);
- double latest = latestArr - costs.getBackwardTransportCost(first.getLocation(),route.getStart().getLocation(),latestArr,route.getDriver(),route.getVehicle());
- prevTimeSlack = latest - prevActDeparture;
- prevAct = route.getStart();
- }
-
- @Override
- public void visit(TourActivity activity) {
- double actArrTime = prevActDeparture + costs.getTransportTime(prevAct.getLocation(),activity.getLocation(),prevActDeparture,route.getDriver(),route.getVehicle());
- double actEarliestStart = Math.max(actArrTime,activity.getTheoreticalEarliestOperationStartTime());
- double actLatestStart = stateManager.getActivityState(activity,route.getVehicle(),InternalStates.LATEST_OPERATION_START_TIME,Double.class);
- double latest_minus_earliest = actLatestStart - actEarliestStart;
- double time_slack_ = Math.max(actArrTime + prevTimeSlack - activity.getTheoreticalEarliestOperationStartTime(),0);
- double time_slack = Math.min(latest_minus_earliest,time_slack_);
- stateManager.putInternalTypedActivityState(activity,route.getVehicle(), InternalStates.TIME_SLACK, time_slack);
- prevTimeSlack = time_slack;
- prevAct = activity;
- prevActDeparture = actEarliestStart + activity.getOperationTime();
- }
-
- @Override
- public void finish() {}
-
-}
diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/Vehicle.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/Vehicle.java
index 59b025ff..3e5d0e96 100644
--- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/Vehicle.java
+++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/Vehicle.java
@@ -73,5 +73,4 @@ public interface Vehicle extends HasId, HasIndex {
public abstract Skills getSkills();
- public boolean hasVariableDepartureTime();
}
diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java
index acb6a2f7..9389bbce 100644
--- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java
+++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java
@@ -92,10 +92,7 @@ public class VehicleImpl extends AbstractVehicle{
return null;
}
- @Override
- public boolean hasVariableDepartureTime() {
- return false;
- }
+
}
/**
@@ -130,7 +127,6 @@ public class VehicleImpl extends AbstractVehicle{
private Location endLocation;
- private boolean hasVariableDepartureTime = false;
private Builder(String id) {
super();
@@ -150,11 +146,7 @@ public class VehicleImpl extends AbstractVehicle{
return this;
}
- public Builder setHasVariableDepartureTime(boolean hasVariableDepartureTime){
- this.hasVariableDepartureTime = hasVariableDepartureTime;
- return this;
- }
-
+
/**
* Sets the flag whether the vehicle must return to depot or not.
*
@@ -286,8 +278,6 @@ public class VehicleImpl extends AbstractVehicle{
private final Location startLocation;
- private final boolean hasVariableDepartureTime;
-
private VehicleImpl(Builder builder){
id = builder.id;
type = builder.type;
@@ -297,7 +287,6 @@ public class VehicleImpl extends AbstractVehicle{
skills = builder.skills;
endLocation = builder.endLocation;
startLocation = builder.startLocation;
- hasVariableDepartureTime = builder.hasVariableDepartureTime;
setVehicleIdentifier(new VehicleTypeKey(type.getTypeId(),startLocation.getId(),endLocation.getId(),earliestDeparture,latestArrival,skills, returnToDepot));
}
@@ -356,10 +345,6 @@ public class VehicleImpl extends AbstractVehicle{
return skills;
}
- @Override
- public boolean hasVariableDepartureTime() {
- return hasVariableDepartureTime;
- }
/* (non-Javadoc)
* @see java.lang.Object#hashCode()
diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java b/jsprit-core/src/test/java/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java
index 10a91738..baf2d17d 100644
--- a/jsprit-core/src/test/java/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java
+++ b/jsprit-core/src/test/java/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java
@@ -2,7 +2,6 @@ package jsprit.core.algorithm;
import jsprit.core.algorithm.box.Jsprit;
import jsprit.core.algorithm.state.StateManager;
-import jsprit.core.algorithm.state.UpdateDepartureTime;
import jsprit.core.analysis.SolutionAnalyser;
import jsprit.core.problem.Location;
import jsprit.core.problem.VehicleRoutingProblem;
@@ -13,22 +12,16 @@ import jsprit.core.problem.driver.Driver;
import jsprit.core.problem.job.Service;
import jsprit.core.problem.solution.SolutionCostCalculator;
import jsprit.core.problem.solution.VehicleRoutingProblemSolution;
-import jsprit.core.problem.solution.route.VehicleRoute;
import jsprit.core.problem.solution.route.activity.TimeWindow;
import jsprit.core.problem.solution.route.activity.TourActivity;
import jsprit.core.problem.vehicle.Vehicle;
import jsprit.core.problem.vehicle.VehicleImpl;
-import jsprit.core.problem.vehicle.VehicleTypeImpl;
-import jsprit.core.reporting.SolutionPrinter;
import jsprit.core.util.CostFactory;
-import jsprit.core.util.RandomNumberGeneration;
import jsprit.core.util.Solutions;
import junit.framework.Assert;
import org.junit.Before;
import org.junit.Test;
-import java.util.Random;
-
/**
* Created by schroeder on 22/07/15.
*/
@@ -56,7 +49,6 @@ public class VariableDepartureAndWaitingTime_IT {
@Override
public VehicleRoutingAlgorithm createAlgorithm(final VehicleRoutingProblem vrp) {
StateManager stateManager = new StateManager(vrp);
- stateManager.addStateUpdater(new UpdateDepartureTime(vrp.getTransportCosts(),stateManager ));
ConstraintManager constraintManager = new ConstraintManager(vrp,stateManager);
return Jsprit.Builder.newInstance(vrp)
@@ -111,256 +103,6 @@ public class VariableDepartureAndWaitingTime_IT {
Assert.assertEquals(40.+1000.,solution.getCost());
}
- @Test
- public void variableDepartureShouldWork(){
- VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(true).setStartLocation(Location.newInstance(0, 0)).build();
- Service s1 = Service.Builder.newInstance("s1").setTimeWindow(TimeWindow.newInstance(1010,1100)).setLocation(Location.newInstance(10,0)).build();
- Service s2 = Service.Builder.newInstance("s2").setTimeWindow(TimeWindow.newInstance(1020,1100)).setLocation(Location.newInstance(20,0)).build();
- final VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance()
- .addJob(s1).addJob(s2).addVehicle(v)
- .setFleetSize(VehicleRoutingProblem.FleetSize.FINITE)
- .setRoutingCost(CostFactory.createManhattanCosts())
- .setActivityCosts(activityCosts)
- .build();
- VehicleRoutingAlgorithm vra = algorithmFactory.createAlgorithm(vrp);
- VehicleRoutingProblemSolution solution = Solutions.bestOf(vra.searchSolutions());
- Assert.assertEquals(40.,solution.getCost());
- }
-
- @Test
- public void variableDepartureShouldWork2(){
- VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(true).setStartLocation(Location.newInstance(0, 0)).build();
- Service s1 = Service.Builder.newInstance("s1").setTimeWindow(TimeWindow.newInstance(1010,1100)).setLocation(Location.newInstance(10,0)).build();
- Service s2 = Service.Builder.newInstance("s2").setTimeWindow(TimeWindow.newInstance(1020,1100)).setLocation(Location.newInstance(20,0)).build();
- Service s3 = Service.Builder.newInstance("s3").setTimeWindow(TimeWindow.newInstance(1020,1100)).setLocation(Location.newInstance(15,0)).build();
- final VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance()
- .addJob(s1).addJob(s2).addVehicle(v)
- .setFleetSize(VehicleRoutingProblem.FleetSize.FINITE)
- .setRoutingCost(CostFactory.createManhattanCosts())
- .setActivityCosts(activityCosts)
- .build();
- VehicleRoutingAlgorithm vra = algorithmFactory.createAlgorithm(vrp);
- VehicleRoutingProblemSolution solution = Solutions.bestOf(vra.searchSolutions());
- Assert.assertEquals(40.,solution.getCost());
- }
-
- @Test
- public void variableDepartureShouldWork3(){
- VehicleImpl v = VehicleImpl.Builder.newInstance("v").setHasVariableDepartureTime(true).setStartLocation(Location.newInstance(0, 0)).build();
- Service s1 = Service.Builder.newInstance("s1").setLocation(Location.newInstance(0,10)).setTimeWindow(TimeWindow.newInstance(10,10)).build();
- Service s2 = Service.Builder.newInstance("s2").setLocation(Location.newInstance(5,15)).build();
- Service s3 = Service.Builder.newInstance("s3").setLocation(Location.newInstance(10,10)).build();
- final VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance()
- .addJob(s1).addJob(s2).addJob(s3).addVehicle(v)
- .setFleetSize(VehicleRoutingProblem.FleetSize.FINITE)
- .setRoutingCost(CostFactory.createEuclideanCosts())
- .setActivityCosts(activityCosts)
- .build();
- AlgorithmFactory algorithmFactory = new AlgorithmFactory() {
- @Override
- public VehicleRoutingAlgorithm createAlgorithm(final VehicleRoutingProblem vrp) {
- StateManager stateManager = new StateManager(vrp);
- stateManager.addStateUpdater(new UpdateDepartureTime(vrp.getTransportCosts(), stateManager));
- ConstraintManager constraintManager = new ConstraintManager(vrp,stateManager);
-
- return Jsprit.Builder.newInstance(vrp)
- .addCoreStateAndConstraintStuff(true)
- .setStateAndConstraintManager(stateManager,constraintManager)
- .setObjectiveFunction(new SolutionCostCalculator() {
- @Override
- public double getCosts(VehicleRoutingProblemSolution solution) {
- SolutionAnalyser sa = new SolutionAnalyser(vrp, solution, new TransportDistance() {
- @Override
- public double getDistance(Location from, Location to) {
- return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null);
- }
- });
- return sa.getWaitingTime() + sa.getDistance();
- }
- })
- .buildAlgorithm();
- }
- };
- VehicleRoutingAlgorithm vra = algorithmFactory.createAlgorithm(vrp);
- vra.setMaxIterations(100);
- VehicleRoutingProblemSolution solution = Solutions.bestOf(vra.searchSolutions());
- System.out.println("c: " + solution.getCost());
- Assert.assertEquals("s1", ((TourActivity.JobActivity) solution.getRoutes().iterator().next().getActivities().get(0)).getJob().getId());
- Assert.assertEquals("s2",((TourActivity.JobActivity)solution.getRoutes().iterator().next().getActivities().get(1)).getJob().getId());
- Assert.assertEquals("s3",((TourActivity.JobActivity)solution.getRoutes().iterator().next().getActivities().get(2)).getJob().getId());
- }
-
- @Test
- public void variableDepartureShouldWork4(){
- VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("type").setCostPerDistance(1.0).setCostPerWaitingTime(1.).build();
- VehicleImpl v = VehicleImpl.Builder.newInstance("v").setType(type).setHasVariableDepartureTime(false).setStartLocation(Location.newInstance(0, 0)).build();
- Service s1 = Service.Builder.newInstance("s1").setLocation(Location.newInstance(0,10)).setTimeWindow(TimeWindow.newInstance(15,15)).build();
- Service s2 = Service.Builder.newInstance("s2").setLocation(Location.newInstance(0,11)).setTimeWindow(TimeWindow.newInstance(100,100)).build();
- Service s3 = Service.Builder.newInstance("s3").setLocation(Location.newInstance(10,10)).build();
- final VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance()
- .addJob(s1).addJob(s2).addJob(s3).addVehicle(v)
- .setFleetSize(VehicleRoutingProblem.FleetSize.FINITE)
- .setRoutingCost(CostFactory.createEuclideanCosts())
- .build();
- AlgorithmFactory algorithmFactory = new AlgorithmFactory() {
- @Override
- public VehicleRoutingAlgorithm createAlgorithm(final VehicleRoutingProblem vrp) {
- StateManager stateManager = new StateManager(vrp);
- stateManager.addStateUpdater(new UpdateDepartureTime(vrp.getTransportCosts(), stateManager));
- ConstraintManager constraintManager = new ConstraintManager(vrp,stateManager);
-
- return Jsprit.Builder.newInstance(vrp)
- .addCoreStateAndConstraintStuff(true)
- .setStateAndConstraintManager(stateManager,constraintManager)
- .setObjectiveFunction(new SolutionCostCalculator() {
- @Override
- public double getCosts(VehicleRoutingProblemSolution solution) {
- double costs = 0.;
- for(VehicleRoute route : solution.getRoutes()){
- costs += route.getVehicle().getType().getVehicleCostParams().fix;
- TourActivity prevAct = route.getStart();
- for(TourActivity act : route.getActivities()){
- costs += vrp.getTransportCosts().getTransportCost(prevAct.getLocation(),act.getLocation(),prevAct.getEndTime(),route.getDriver(),route.getVehicle());
- costs += vrp.getActivityCosts().getActivityCost(act,act.getArrTime(),route.getDriver(),route.getVehicle());
- prevAct = act;
- }
- costs += vrp.getTransportCosts().getTransportCost(prevAct.getLocation(),route.getEnd().getLocation(),prevAct.getEndTime(),route.getDriver(),route.getVehicle());
- }
- costs += solution.getUnassignedJobs().size() * 1000;
- return costs;
- }
- })
- .buildAlgorithm();
- }
- };
- VehicleRoutingAlgorithm vra = algorithmFactory.createAlgorithm(vrp);
- vra.setMaxIterations(100);
- VehicleRoutingProblemSolution solution = Solutions.bestOf(vra.searchSolutions());
- System.out.println("c: " + solution.getCost());
- SolutionPrinter.print(vrp,solution, SolutionPrinter.Print.VERBOSE);
- Assert.assertEquals("s1", ((TourActivity.JobActivity) solution.getRoutes().iterator().next().getActivities().get(0)).getJob().getId());
- Assert.assertEquals("s3",((TourActivity.JobActivity)solution.getRoutes().iterator().next().getActivities().get(1)).getJob().getId());
- Assert.assertEquals("s2",((TourActivity.JobActivity)solution.getRoutes().iterator().next().getActivities().get(2)).getJob().getId());
- }
-
- @Test
- public void variableDepartureShouldWork5(){
- VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("type").setCostPerDistance(1.0).setCostPerWaitingTime(1.0).build();
- VehicleImpl v = VehicleImpl.Builder.newInstance("v").setType(type).setHasVariableDepartureTime(true).setStartLocation(Location.newInstance(0, 0)).build();
- VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setType(type).setHasVariableDepartureTime(true).setStartLocation(Location.newInstance(0, 0)).build();
- Service s1 = Service.Builder.newInstance("s1").setLocation(Location.newInstance(0,10)).setTimeWindow(TimeWindow.newInstance(15,15)).build();
- Service s2 = Service.Builder.newInstance("s2").setLocation(Location.newInstance(0,11)).setTimeWindow(TimeWindow.newInstance(100,100)).build();
- Service s3 = Service.Builder.newInstance("s3").setLocation(Location.newInstance(10,10)).build();
- final VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance()
- .addJob(s1).addJob(s2).addJob(s3).addVehicle(v).addVehicle(v2)
- .setFleetSize(VehicleRoutingProblem.FleetSize.FINITE)
- .setRoutingCost(CostFactory.createEuclideanCosts())
- .build();
- AlgorithmFactory algorithmFactory = new AlgorithmFactory() {
- @Override
- public VehicleRoutingAlgorithm createAlgorithm(final VehicleRoutingProblem vrp) {
- StateManager stateManager = new StateManager(vrp);
- stateManager.addStateUpdater(new UpdateDepartureTime(vrp.getTransportCosts(), stateManager));
- ConstraintManager constraintManager = new ConstraintManager(vrp,stateManager);
-
- return Jsprit.Builder.newInstance(vrp)
- .addCoreStateAndConstraintStuff(true)
- .setStateAndConstraintManager(stateManager,constraintManager)
- .setObjectiveFunction(new SolutionCostCalculator() {
- @Override
- public double getCosts(VehicleRoutingProblemSolution solution) {
- double costs = 0.;
- for(VehicleRoute route : solution.getRoutes()){
- costs += route.getVehicle().getType().getVehicleCostParams().fix;
- TourActivity prevAct = route.getStart();
- for(TourActivity act : route.getActivities()){
- costs += vrp.getTransportCosts().getTransportCost(prevAct.getLocation(),act.getLocation(),prevAct.getEndTime(),route.getDriver(),route.getVehicle());
- costs += vrp.getActivityCosts().getActivityCost(act,act.getArrTime(),route.getDriver(),route.getVehicle());
- prevAct = act;
- }
- costs += vrp.getTransportCosts().getTransportCost(prevAct.getLocation(),route.getEnd().getLocation(),prevAct.getEndTime(),route.getDriver(),route.getVehicle());
- }
- costs += solution.getUnassignedJobs().size() * 1000;
- return costs;
- }
- })
- .buildAlgorithm();
- }
- };
- VehicleRoutingAlgorithm vra = algorithmFactory.createAlgorithm(vrp);
- vra.setMaxIterations(100);
- VehicleRoutingProblemSolution solution = Solutions.bestOf(vra.searchSolutions());
- System.out.println("c: " + solution.getCost());
- SolutionPrinter.print(vrp,solution, SolutionPrinter.Print.VERBOSE);
-// Assert.assertEquals("s1", ((TourActivity.JobActivity) solution.getRoutes().iterator().next().getActivities().get(0)).getJob().getId());
-// Assert.assertEquals("s3",((TourActivity.JobActivity)solution.getRoutes().iterator().next().getActivities().get(1)).getJob().getId());
-// Assert.assertEquals("s2",((TourActivity.JobActivity)solution.getRoutes().iterator().next().getActivities().get(2)).getJob().getId());
- }
-
- @Test
- public void variableDepartureShouldWork6(){
- VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("type").setCostPerDistance(1.0).setCostPerWaitingTime(1.0).build();
- VehicleImpl v = VehicleImpl.Builder.newInstance("v").setType(type).setHasVariableDepartureTime(true).setStartLocation(Location.newInstance(0, 0)).build();
- VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setType(type).setHasVariableDepartureTime(true).setStartLocation(Location.newInstance(0, 0)).build();
- VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance();
- Random r = RandomNumberGeneration.newInstance();
- for(int i=0;i<10;i++){
- Service s = Service.Builder.newInstance("s"+i).setServiceTime(5).setLocation(Location.newInstance(0, 10 + r.nextInt(10))).build();
- vrpBuilder.addJob(s);
- }
- Service s2 = Service.Builder.newInstance("s10").setLocation(Location.newInstance(10,21)).setTimeWindow(TimeWindow.newInstance(100,110)).build();
- Service s3 = Service.Builder.newInstance("s11").setLocation(Location.newInstance(10,10)).setTimeWindow(TimeWindow.newInstance(300,310)).build();
- vrpBuilder.addJob(s2).addJob(s3).addVehicle(v).addVehicle(v2);
- vrpBuilder.setRoutingCost(CostFactory.createEuclideanCosts());
- vrpBuilder.setFleetSize(VehicleRoutingProblem.FleetSize.FINITE);
- final VehicleRoutingProblem vrp = vrpBuilder.build();
-// final VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance()
-// .addJob(s1).addJob(s2).addJob(s3).addVehicle(v).addVehicle(v2)
-// .setFleetSize(VehicleRoutingProblem.FleetSize.FINITE)
-// .setRoutingCost(CostFactory.createEuclideanCosts())
-// .build();
- AlgorithmFactory algorithmFactory = new AlgorithmFactory() {
- @Override
- public VehicleRoutingAlgorithm createAlgorithm(final VehicleRoutingProblem vrp) {
- StateManager stateManager = new StateManager(vrp);
- stateManager.addStateUpdater(new UpdateDepartureTime(vrp.getTransportCosts(), stateManager));
- ConstraintManager constraintManager = new ConstraintManager(vrp,stateManager);
-
- return Jsprit.Builder.newInstance(vrp)
- .addCoreStateAndConstraintStuff(true)
- .setStateAndConstraintManager(stateManager,constraintManager)
- .setObjectiveFunction(new SolutionCostCalculator() {
- @Override
- public double getCosts(VehicleRoutingProblemSolution solution) {
- double costs = 0.;
- for(VehicleRoute route : solution.getRoutes()){
- costs += route.getVehicle().getType().getVehicleCostParams().fix;
- TourActivity prevAct = route.getStart();
- for(TourActivity act : route.getActivities()){
- costs += vrp.getTransportCosts().getTransportCost(prevAct.getLocation(),act.getLocation(),prevAct.getEndTime(),route.getDriver(),route.getVehicle());
- costs += vrp.getActivityCosts().getActivityCost(act,act.getArrTime(),route.getDriver(),route.getVehicle());
- prevAct = act;
- }
- costs += vrp.getTransportCosts().getTransportCost(prevAct.getLocation(),route.getEnd().getLocation(),prevAct.getEndTime(),route.getDriver(),route.getVehicle());
- }
- costs += solution.getUnassignedJobs().size() * 1000;
- return costs;
- }
- })
- .buildAlgorithm();
- }
- };
- VehicleRoutingAlgorithm vra = algorithmFactory.createAlgorithm(vrp);
- vra.setMaxIterations(100);
- VehicleRoutingProblemSolution solution = Solutions.bestOf(vra.searchSolutions());
- System.out.println("c: " + solution.getCost());
- SolutionPrinter.print(vrp,solution, SolutionPrinter.Print.VERBOSE);
-// Assert.assertEquals("s1", ((TourActivity.JobActivity) solution.getRoutes().iterator().next().getActivities().get(0)).getJob().getId());
-// Assert.assertEquals("s3",((TourActivity.JobActivity)solution.getRoutes().iterator().next().getActivities().get(1)).getJob().getId());
-// Assert.assertEquals("s2",((TourActivity.JobActivity)solution.getRoutes().iterator().next().getActivities().get(2)).getJob().getId());
- }
-
-
}
diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java
index 60fc929a..0c2c4340 100644
--- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java
+++ b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java
@@ -95,7 +95,7 @@ public class ServiceInsertionAndLoadConstraintsTest {
routingCosts = CostFactory.createManhattanCosts();
VehicleType type = VehicleTypeImpl.Builder.newInstance("t").addCapacityDimension(0, 2).setCostPerDistance(1).build();
vehicle = VehicleImpl.Builder.newInstance("v").setStartLocation(Location.newInstance("0,0")).setType(type).build();
- activityInsertionCostsCalculator = new LocalActivityInsertionCostsCalculator(routingCosts, activityCosts, null);
+ activityInsertionCostsCalculator = new LocalActivityInsertionCostsCalculator(routingCosts, activityCosts, mock(StateManager.class));
createInsertionCalculator(hardRouteLevelConstraint);
vehicleRoutingProblem = mock(VehicleRoutingProblem.class);
}
diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java
index 237a8fab..6b3bc144 100644
--- a/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java
+++ b/jsprit-core/src/test/java/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java
@@ -94,7 +94,7 @@ public class ShipmentInsertionCalculatorTest {
routingCosts = CostFactory.createManhattanCosts();
VehicleType type = VehicleTypeImpl.Builder.newInstance("t").addCapacityDimension(0, 2).setCostPerDistance(1).build();
vehicle = VehicleImpl.Builder.newInstance("v").setStartLocation(Location.newInstance("0,0")).setType(type).build();
- activityInsertionCostsCalculator = new LocalActivityInsertionCostsCalculator(routingCosts, activityCosts, null);
+ activityInsertionCostsCalculator = new LocalActivityInsertionCostsCalculator(routingCosts, activityCosts, mock(StateManager.class));
createInsertionCalculator(hardRouteLevelConstraint);
vehicleRoutingProblem = mock(VehicleRoutingProblem.class);
}
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 15d29de0..c0f42345 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,7 +16,10 @@
******************************************************************************/
package jsprit.core.algorithm.recreate;
-import jsprit.core.algorithm.state.*;
+import jsprit.core.algorithm.state.StateManager;
+import jsprit.core.algorithm.state.UpdateActivityTimes;
+import jsprit.core.algorithm.state.UpdateFutureWaitingTimes;
+import jsprit.core.algorithm.state.UpdateVehicleDependentPracticalTimeWindows;
import jsprit.core.problem.Location;
import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.cost.VehicleRoutingActivityCosts;
@@ -26,7 +29,10 @@ 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;
-import jsprit.core.problem.solution.route.activity.*;
+import jsprit.core.problem.solution.route.activity.End;
+import jsprit.core.problem.solution.route.activity.Start;
+import jsprit.core.problem.solution.route.activity.TimeWindow;
+import jsprit.core.problem.solution.route.activity.TourActivity;
import jsprit.core.problem.vehicle.Vehicle;
import jsprit.core.problem.vehicle.VehicleImpl;
import jsprit.core.problem.vehicle.VehicleTypeImpl;
@@ -66,6 +72,7 @@ public class TestLocalActivityInsertionCostsCalculator {
jic = mock(JobInsertionContext.class);
when(jic.getRoute()).thenReturn(route);
when(jic.getNewVehicle()).thenReturn(vehicle);
+ when(vehicle.getType()).thenReturn(VehicleTypeImpl.Builder.newInstance("type").build());
tpCosts = mock(VehicleRoutingTransportCosts.class);
when(tpCosts.getTransportCost(loc("i"), loc("j"), 0.0, null, vehicle)).thenReturn(2.0);
@@ -76,7 +83,7 @@ public class TestLocalActivityInsertionCostsCalculator {
when(tpCosts.getTransportTime(loc("k"), loc("j"), 0.0, null, vehicle)).thenReturn(0.0);
actCosts = mock(VehicleRoutingActivityCosts.class);
- calc = new LocalActivityInsertionCostsCalculator(tpCosts, actCosts, null);
+ calc = new LocalActivityInsertionCostsCalculator(tpCosts, actCosts, mock(StateManager.class));
}
private Location loc(String i) {
@@ -87,11 +94,14 @@ public class TestLocalActivityInsertionCostsCalculator {
public void whenInsertingActBetweenTwoRouteActs_itCalcsMarginalTpCosts(){
TourActivity prevAct = mock(TourActivity.class);
when(prevAct.getLocation()).thenReturn(loc("i"));
+ when(prevAct.getIndex()).thenReturn(1);
TourActivity nextAct = mock(TourActivity.class);
when(nextAct.getLocation()).thenReturn(loc("j"));
+ when(nextAct.getIndex()).thenReturn(1);
TourActivity newAct = mock(TourActivity.class);
when(newAct.getLocation()).thenReturn(loc("k"));
-
+ when(newAct.getIndex()).thenReturn(1);
+
when(vehicle.isReturnToDepot()).thenReturn(true);
double costs = calc.getCosts(jic, prevAct, nextAct, newAct, 0.0);
@@ -102,9 +112,11 @@ public class TestLocalActivityInsertionCostsCalculator {
public void whenInsertingActBetweenLastActAndEnd_itCalcsMarginalTpCosts(){
TourActivity prevAct = mock(TourActivity.class);
when(prevAct.getLocation()).thenReturn(loc("i"));
+ when(prevAct.getIndex()).thenReturn(1);
End nextAct = End.newInstance("j", 0.0, 0.0);
TourActivity newAct = mock(TourActivity.class);
when(newAct.getLocation()).thenReturn(loc("k"));
+ when(newAct.getIndex()).thenReturn(1);
when(vehicle.isReturnToDepot()).thenReturn(true);
@@ -116,10 +128,13 @@ public class TestLocalActivityInsertionCostsCalculator {
public void whenInsertingActBetweenTwoRouteActsAndRouteIsOpen_itCalcsMarginalTpCosts(){
TourActivity prevAct = mock(TourActivity.class);
when(prevAct.getLocation()).thenReturn(loc("i"));
+ when(prevAct.getIndex()).thenReturn(1);
TourActivity nextAct = mock(TourActivity.class);
when(nextAct.getLocation()).thenReturn(loc("j"));
+ when(nextAct.getIndex()).thenReturn(1);
TourActivity newAct = mock(TourActivity.class);
when(newAct.getLocation()).thenReturn(loc("k"));
+ when(newAct.getIndex()).thenReturn(1);
when(vehicle.isReturnToDepot()).thenReturn(false);
@@ -131,9 +146,11 @@ public class TestLocalActivityInsertionCostsCalculator {
public void whenInsertingActBetweenLastActAndEndAndRouteIsOpen_itCalculatesTpCostsFromPrevToNewAct(){
TourActivity prevAct = mock(TourActivity.class);
when(prevAct.getLocation()).thenReturn(loc("i"));
+ when(prevAct.getIndex()).thenReturn(1);
End nextAct = End.newInstance("j", 0.0, 0.0);
TourActivity newAct = mock(TourActivity.class);
when(newAct.getLocation()).thenReturn(loc("k"));
+ when(newAct.getIndex()).thenReturn(1);
when(vehicle.isReturnToDepot()).thenReturn(false);
@@ -147,35 +164,48 @@ public class TestLocalActivityInsertionCostsCalculator {
VehicleImpl v = VehicleImpl.Builder.newInstance("v").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(60, 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();
+ Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,80)).build();
+
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addJob(prevS).addJob(newS).addJob(nextS).addVehicle(v).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).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(.8);
- double c = calc.getCosts(context,prevAct,nextAct,newAct,0);
- assertEquals(40.,c,0.01);
+
+ double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
+ assertEquals(50.,c,0.01);
+
+ /*
+ new: dist = 90 & wait = 0
+ old: dist = 30 & wait = 10
+ c = new - old = 90 - 40 = 50
+ */
}
@Test
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 v = VehicleImpl.Builder.newInstance("v").setType(type).setStartLocation(Location.newInstance(0,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();
- Start prevAct = new Start(Location.newInstance(0,0),0,100);
- ServiceActivity newAct = ServiceActivity.newInstance(newS);
- ServiceActivity nextAct = ServiceActivity.newInstance(nextS);
- VehicleRoute route = VehicleRoute.Builder.newInstance(v).addService(nextS).build();
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addJob(newS).addJob(nextS).addVehicle(v).build();
+
+ Start prevAct = new Start(Location.newInstance(0,0),0,100);
+ TourActivity newAct = vrp.getActivities(newS).get(0);
+ TourActivity nextAct = vrp.getActivities(nextS).get(0);
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v).setJobActivityFactory(vrp.getJobActivityFactory()).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)) );
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),new StateManager(vrp));
calc.setSolutionCompletenessRatio(1.);
double c = calc.getCosts(context,prevAct,nextAct,newAct,0);
assertEquals(-10.,c,0.01);
@@ -185,18 +215,21 @@ public class TestLocalActivityInsertionCostsCalculator {
public void whenAddingNewBetweenStartAndAct2_itShouldCalcInsertionCostsCorrectly(){
VehicleTypeImpl type = VehicleTypeImpl.Builder.newInstance("t").setCostPerWaitingTime(1.).build();
- VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setHasVariableDepartureTime(false).setType(type).setStartLocation(Location.newInstance(0,0)).build();
+ VehicleImpl v2 = VehicleImpl.Builder.newInstance("v2").setType(type).setStartLocation(Location.newInstance(0,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(140,150)).build();
+
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addJob(newS).addJob(nextS).addVehicle(v2).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(v2).addService(nextS).build();
+ TourActivity newAct = vrp.getActivities(newS).get(0);
+ TourActivity nextAct = vrp.getActivities(nextS).get(0);
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v2).setJobActivityFactory(vrp.getJobActivityFactory()).addService(nextS).build();
JobInsertionContext context = new JobInsertionContext(route,newS,v2,null,0.);
- LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(), null);
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(), new StateManager(vrp));
calc.setSolutionCompletenessRatio(1.);
double c = calc.getCosts(context,prevAct,nextAct,newAct,0);
assertEquals(-10.,c,0.01);
@@ -205,21 +238,19 @@ public class TestLocalActivityInsertionCostsCalculator {
@Test
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();
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").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 nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0)).setTimeWindow(TimeWindow.newInstance(40,50)).build();
+
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addJob(newS).addVehicle(v).build();
+
Start prevAct = new Start(Location.newInstance(0,0),0,100);
-// ServiceActivity prevAct = ServiceActivity.newInstance(prevS);
- ServiceActivity newAct = ServiceActivity.newInstance(newS);
+ TourActivity newAct = vrp.getActivities(newS).get(0);
End nextAct = new End(Location.newInstance(0,0),0,100);
-// ServiceActivity nextAct = ServiceActivity.newInstance(nextS);
-// ServiceActivity nextAct = ServiceActivity.newInstance(nextS);
- VehicleRoute route = VehicleRoute.Builder.newInstance(v).build();
+
+ VehicleRoute route = VehicleRoute.Builder.newInstance(v).setJobActivityFactory(vrp.getJobActivityFactory()).build();
JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
- LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),null );
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),new StateManager(vrp) );
calc.setSolutionCompletenessRatio(1.);
double c = calc.getCosts(context,prevAct,nextAct,newAct,0);
assertEquals(110.,c,0.01);
@@ -229,20 +260,21 @@ public class TestLocalActivityInsertionCostsCalculator {
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();
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").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);
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addJob(prevS).addJob(newS).addJob(nextS).addVehicle(v).build();
- VehicleRoute route = VehicleRoute.Builder.newInstance(v).addService(prevS).addService(nextS).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).build();
JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
- LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),null );
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),new StateManager(vrp) );
calc.setSolutionCompletenessRatio(1.);
double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
assertEquals(-10.,c,0.01);
@@ -252,20 +284,21 @@ public class TestLocalActivityInsertionCostsCalculator {
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();
+ VehicleImpl v = VehicleImpl.Builder.newInstance("v").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);
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addJob(prevS).addJob(newS).addJob(nextS).addVehicle(v).build();
- VehicleRoute route = VehicleRoute.Builder.newInstance(v).addService(prevS).addService(nextS).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).build();
JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
- LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),null );
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),new StateManager(vrp) );
calc.setSolutionCompletenessRatio(0.5);
double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
assertEquals(35.,c,0.01);
@@ -275,7 +308,7 @@ public class TestLocalActivityInsertionCostsCalculator {
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 v = VehicleImpl.Builder.newInstance("v").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();
@@ -284,33 +317,39 @@ public class TestLocalActivityInsertionCostsCalculator {
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);
+ VehicleRoutingProblem vrp = VehicleRoutingProblem.Builder.newInstance().addJob(afterNextS).addJob(prevS).addJob(newS).addJob(nextS).addVehicle(v).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).build();
+
+ StateManager stateManager = getStateManager(vrp,route);
- 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 );
+ LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),stateManager);
calc.setSolutionCompletenessRatio(1.);
double c = calc.getCosts(context,prevAct,nextAct,newAct,10);
- assertEquals(-90.,c,0.01);
- //360
- //270
+ assertEquals(-10.,c,0.01);
+ //
+ //old: dist: 0, waiting: 10 + 350 = 360
+ //new: dist: 0, waiting: 80 + 270 = 350
}
@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 v = VehicleImpl.Builder.newInstance("v").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 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();
+ 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();
@@ -321,7 +360,7 @@ public class TestLocalActivityInsertionCostsCalculator {
VehicleRoute route = VehicleRoute.Builder.newInstance(v).setJobActivityFactory(vrp.getJobActivityFactory()).addService(prevS).addService(nextS).addService(afterNextS).addService(afterAfterNextS).build();
- StateManager stateManager = getStateManager(vrp,route);
+ StateManager stateManager = getStateManager(vrp, route);
JobInsertionContext context = new JobInsertionContext(route,newS,v,null,0.);
LocalActivityInsertionCostsCalculator calc = new LocalActivityInsertionCostsCalculator(CostFactory.createEuclideanCosts(),new WaitingTimeCosts(),stateManager);
@@ -340,7 +379,7 @@ public class TestLocalActivityInsertionCostsCalculator {
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 v = VehicleImpl.Builder.newInstance("v").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();
@@ -382,7 +421,7 @@ public class TestLocalActivityInsertionCostsCalculator {
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 v = VehicleImpl.Builder.newInstance("v").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();
@@ -407,13 +446,15 @@ public class TestLocalActivityInsertionCostsCalculator {
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);
+ assertEquals(30.,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
+ new = 80
+ new - old = 80 - 40 = 40
+
*/
}
@@ -421,7 +462,7 @@ public class TestLocalActivityInsertionCostsCalculator {
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 v = VehicleImpl.Builder.newInstance("v").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();
@@ -446,148 +487,26 @@ public class TestLocalActivityInsertionCostsCalculator {
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);
+ 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:90 --> w=10
- new = s:30,act1:40,act2:50,act3:70,act4:80,act5:90 --> w=10 => -10
+ old = 10 + 40 = 50
+ new = 30 + 10 = 40
*/
}
- @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(30.,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,70,act3:(70,80),act4:90 --> w=10
- new = s:0,act1:10,act2:20,act3:(40,50),act4:50,act5:60 --> w=40 => 20
- */
- }
-
- @Test
- public void whenAddingNewWithTWBetweenTwoActs1WithVarStart_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(30.,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,70,act3:(70,80),act4:90 --> w=10
- new = s:0,act1:10,act2:20,act3:(40,50),act4:50,act5:60 --> w=40 => 20
- */
- }
-
- @Test
- public void whenAddingNewWithTWBetweenTwoActs5WithVarStart_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(0,20))
- .setLocation(Location.newInstance(20, 0)).build();
- Service nextS = Service.Builder.newInstance("next").setLocation(Location.newInstance(30,0))
-// .setTimeWindow(TimeWindow.newInstance(40,80))
- .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(40.,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,70,act3:(70,80),act4:90 --> w=10
- new = s:0,act1:10,act2:20,act3:(40,50),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 ));
stateManager.informInsertionStarts(Arrays.asList(route),new ArrayList