diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java index 0bb3ecb7..1d5756e0 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/PrettyAlgorithmBuilder.java @@ -93,7 +93,7 @@ public class PrettyAlgorithmBuilder { constraintManager.addConstraint(new SwitchNotFeasible(stateManager)); stateManager.updateLoadStates(); stateManager.updateTimeWindowStates(); - UpdateVehicleDependentPracticalTimeWindows twUpdater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, vrp.getTransportCosts()); + UpdateVehicleDependentPracticalTimeWindows twUpdater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, vrp.getTransportCosts(), vrp.getActivityCosts()); twUpdater.setVehiclesToUpdate(new UpdateVehicleDependentPracticalTimeWindows.VehiclesToUpdate() { Map uniqueTypes = new HashMap(); @@ -116,7 +116,7 @@ public class PrettyAlgorithmBuilder { stateManager.addStateUpdater(twUpdater); stateManager.updateSkillStates(); stateManager.addStateUpdater(new UpdateEndLocationIfRouteIsOpen()); - stateManager.addStateUpdater(new UpdateActivityTimes(vrp.getTransportCosts(), ActivityTimeTracker.ActivityPolicy.AS_SOON_AS_TIME_WINDOW_OPENS)); + stateManager.addStateUpdater(new UpdateActivityTimes(vrp.getTransportCosts(), ActivityTimeTracker.ActivityPolicy.AS_SOON_AS_TIME_WINDOW_OPENS, vrp.getActivityCosts())); stateManager.addStateUpdater(new UpdateVariableCosts(vrp.getActivityCosts(), vrp.getTransportCosts(), stateManager)); stateManager.addStateUpdater(new UpdateFutureWaitingTimes(stateManager, vrp.getTransportCosts())); } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java index 24c3d66e..a26830bc 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java @@ -542,7 +542,7 @@ public class VehicleRoutingAlgorithms { } else switchAllowed = true; ActivityTimeTracker.ActivityPolicy activityPolicy; if (stateManager.timeWindowUpdateIsActivated()) { - UpdateVehicleDependentPracticalTimeWindows timeWindowUpdater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, vrp.getTransportCosts()); + UpdateVehicleDependentPracticalTimeWindows timeWindowUpdater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, vrp.getTransportCosts(), vrp.getActivityCosts()); timeWindowUpdater.setVehiclesToUpdate(new UpdateVehicleDependentPracticalTimeWindows.VehiclesToUpdate() { Map uniqueTypes = new HashMap(); @@ -565,7 +565,7 @@ public class VehicleRoutingAlgorithms { } else { activityPolicy = ActivityTimeTracker.ActivityPolicy.AS_SOON_AS_ARRIVED; } - stateManager.addStateUpdater(new UpdateActivityTimes(vrp.getTransportCosts(), activityPolicy)); + stateManager.addStateUpdater(new UpdateActivityTimes(vrp.getTransportCosts(), activityPolicy, vrp.getActivityCosts())); stateManager.addStateUpdater(new UpdateVariableCosts(vrp.getActivityCosts(), vrp.getTransportCosts(), stateManager, activityPolicy)); final SolutionCostCalculator costCalculator; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AuxilliaryCostCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AuxilliaryCostCalculator.java index 70d8a66e..ca4f0bbc 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AuxilliaryCostCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/AuxilliaryCostCalculator.java @@ -67,7 +67,7 @@ final class AuxilliaryCostCalculator { double transportTime = routingCosts.getTransportTime(prevAct.getLocation(), act.getLocation(), departureTimePrevAct, driver, vehicle); cost += transportCost; double actStartTime = departureTimePrevAct + transportTime; - departureTimePrevAct = Math.max(actStartTime, act.getTheoreticalEarliestOperationStartTime()) + act.getOperationTime(); + departureTimePrevAct = Math.max(actStartTime, act.getTheoreticalEarliestOperationStartTime()) + activityCosts.getActivityDuration(act,actStartTime,driver,vehicle); cost += activityCosts.getActivityCost(act, actStartTime, driver, vehicle); prevAct = act; } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java index a7a6687a..961f4159 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/BreakInsertionCalculator.java @@ -40,7 +40,7 @@ import java.util.Iterator; import java.util.List; /** - * Calculator that calculates the best insertion position for a {@link com.graphhopper.jsprit.core.problem.job.Service}. + * Calculator that calculates the best insertion position for a {@link jsprit.core.problem.job.Service}. * * @author schroeder */ @@ -58,15 +58,18 @@ final class BreakInsertionCalculator implements JobInsertionCostsCalculator { private VehicleRoutingTransportCosts transportCosts; + private final VehicleRoutingActivityCosts activityCosts; + private ActivityInsertionCostsCalculator additionalTransportCostsCalculator; private JobActivityFactory activityFactory; private AdditionalAccessEgressCalculator additionalAccessEgressCalculator; - public BreakInsertionCalculator(VehicleRoutingTransportCosts routingCosts, ActivityInsertionCostsCalculator additionalTransportCostsCalculator, ConstraintManager constraintManager) { + public BreakInsertionCalculator(VehicleRoutingTransportCosts routingCosts, VehicleRoutingActivityCosts activityCosts, ActivityInsertionCostsCalculator additionalTransportCostsCalculator, ConstraintManager constraintManager) { super(); this.transportCosts = routingCosts; + this.activityCosts = activityCosts; hardRouteLevelConstraint = constraintManager; hardActivityLevelConstraint = constraintManager; softActivityConstraint = constraintManager; @@ -161,7 +164,7 @@ final class BreakInsertionCalculator implements JobInsertionCostsCalculator { } } double nextActArrTime = prevActStartTime + transportCosts.getTransportTime(prevAct.getLocation(), nextAct.getLocation(), prevActStartTime, newDriver, newVehicle); - prevActStartTime = CalculationUtils.getActivityEndTime(nextActArrTime, nextAct); + prevActStartTime = Math.max(nextActArrTime, nextAct.getTheoreticalEarliestOperationStartTime()) + activityCosts.getActivityDuration(nextAct,nextActArrTime,newDriver,newVehicle); prevAct = nextAct; actIndex++; if (breakThis) break; diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java index bde3c089..0886aecf 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/JobInsertionCostsCalculatorBuilder.java @@ -286,12 +286,12 @@ public class JobInsertionCostsCalculatorBuilder { } }; - ShipmentInsertionCalculator shipmentInsertion = new ShipmentInsertionCalculator(vrp.getTransportCosts(), actInsertionCalc, constraintManager); + ShipmentInsertionCalculator shipmentInsertion = new ShipmentInsertionCalculator(vrp.getTransportCosts(), vrp.getActivityCosts(), actInsertionCalc, constraintManager); shipmentInsertion.setJobActivityFactory(activityFactory); - ServiceInsertionCalculator serviceInsertion = new ServiceInsertionCalculator(vrp.getTransportCosts(), actInsertionCalc, constraintManager); + ServiceInsertionCalculator serviceInsertion = new ServiceInsertionCalculator(vrp.getTransportCosts(), vrp.getActivityCosts(), actInsertionCalc, constraintManager); serviceInsertion.setJobActivityFactory(activityFactory); - BreakInsertionCalculator breakInsertionCalculator = new BreakInsertionCalculator(vrp.getTransportCosts(), actInsertionCalc, constraintManager); + BreakInsertionCalculator breakInsertionCalculator = new BreakInsertionCalculator(vrp.getTransportCosts(), vrp.getActivityCosts(), actInsertionCalc, constraintManager); breakInsertionCalculator.setJobActivityFactory(activityFactory); JobCalculatorSwitcher switcher = new JobCalculatorSwitcher(); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java index e792e8fb..9267079e 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/LocalActivityInsertionCostsCalculator.java @@ -25,7 +25,6 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.End; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; -import com.graphhopper.jsprit.core.util.CalculationUtils; /** * Calculates activity insertion costs locally, i.e. by comparing the additional costs of insertion the new activity k between @@ -61,7 +60,7 @@ class LocalActivityInsertionCostsCalculator implements ActivityInsertionCostsCal double tp_costs_prevAct_newAct = routingCosts.getTransportCost(prevAct.getLocation(), newAct.getLocation(), depTimeAtPrevAct, iFacts.getNewDriver(), iFacts.getNewVehicle()); double tp_time_prevAct_newAct = routingCosts.getTransportTime(prevAct.getLocation(), newAct.getLocation(), depTimeAtPrevAct, iFacts.getNewDriver(), iFacts.getNewVehicle()); double newAct_arrTime = depTimeAtPrevAct + tp_time_prevAct_newAct; - double newAct_endTime = CalculationUtils.getActivityEndTime(newAct_arrTime, newAct); + double newAct_endTime = Math.max(newAct_arrTime, newAct.getTheoreticalEarliestOperationStartTime()) + activityCosts.getActivityDuration(newAct, newAct_arrTime, iFacts.getNewDriver(), iFacts.getNewVehicle()); double act_costs_newAct = activityCosts.getActivityCost(newAct, newAct_arrTime, iFacts.getNewDriver(), iFacts.getNewVehicle()); @@ -70,7 +69,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 endTime_nextAct_new = Math.max(nextAct_arrTime, nextAct.getTheoreticalEarliestOperationStartTime()) + activityCosts.getActivityDuration(nextAct, newAct_arrTime, iFacts.getNewDriver(), iFacts.getNewVehicle()); double act_costs_nextAct = activityCosts.getActivityCost(nextAct, nextAct_arrTime, iFacts.getNewDriver(), iFacts.getNewVehicle()); double totalCosts = tp_costs_prevAct_newAct + tp_costs_newAct_nextAct + solutionCompletenessRatio * activityCostsWeight * (act_costs_newAct + act_costs_nextAct); @@ -82,7 +81,7 @@ 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 = 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 endTime_nextAct_old = Math.max(arrTime_nextAct, nextAct.getTheoreticalEarliestOperationStartTime()) + activityCosts.getActivityDuration(nextAct, nextAct_arrTime, iFacts.getRoute().getDriver(),iFacts.getRoute().getVehicle()); double actCost_nextAct = activityCosts.getActivityCost(nextAct, arrTime_nextAct, iFacts.getRoute().getDriver(), iFacts.getRoute().getVehicle()); double endTimeDelay_nextAct = Math.max(0, endTime_nextAct_new - endTime_nextAct_old); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java index ea9d089e..db4b3dce 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java @@ -19,6 +19,7 @@ package com.graphhopper.jsprit.core.algorithm.recreate; import com.graphhopper.jsprit.core.problem.JobActivityFactory; import com.graphhopper.jsprit.core.problem.constraint.*; import com.graphhopper.jsprit.core.problem.constraint.HardActivityConstraint.ConstraintsStatus; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; import com.graphhopper.jsprit.core.problem.driver.Driver; import com.graphhopper.jsprit.core.problem.job.Job; @@ -31,14 +32,13 @@ import com.graphhopper.jsprit.core.problem.solution.route.activity.Start; import com.graphhopper.jsprit.core.problem.solution.route.activity.TimeWindow; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; -import com.graphhopper.jsprit.core.util.CalculationUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.Iterator; /** - * Calculator that calculates the best insertion position for a {@link com.graphhopper.jsprit.core.problem.job.Service}. + * Calculator that calculates the best insertion position for a {@link Service}. * * @author schroeder */ @@ -56,15 +56,18 @@ final class ServiceInsertionCalculator implements JobInsertionCostsCalculator { private VehicleRoutingTransportCosts transportCosts; + private final VehicleRoutingActivityCosts activityCosts; + private ActivityInsertionCostsCalculator additionalTransportCostsCalculator; private JobActivityFactory activityFactory; private AdditionalAccessEgressCalculator additionalAccessEgressCalculator; - public ServiceInsertionCalculator(VehicleRoutingTransportCosts routingCosts, ActivityInsertionCostsCalculator additionalTransportCostsCalculator, ConstraintManager constraintManager) { + public ServiceInsertionCalculator(VehicleRoutingTransportCosts routingCosts, VehicleRoutingActivityCosts activityCosts, ActivityInsertionCostsCalculator additionalTransportCostsCalculator, ConstraintManager constraintManager) { super(); this.transportCosts = routingCosts; + this.activityCosts = activityCosts; hardRouteLevelConstraint = constraintManager; hardActivityLevelConstraint = constraintManager; softActivityConstraint = constraintManager; @@ -154,7 +157,7 @@ final class ServiceInsertionCalculator implements JobInsertionCostsCalculator { } if(not_fulfilled_break) break; double nextActArrTime = prevActStartTime + transportCosts.getTransportTime(prevAct.getLocation(), nextAct.getLocation(), prevActStartTime, newDriver, newVehicle); - prevActStartTime = CalculationUtils.getActivityEndTime(nextActArrTime, nextAct); + prevActStartTime = Math.max(nextActArrTime, nextAct.getTheoreticalEarliestOperationStartTime()) + activityCosts.getActivityDuration(nextAct,nextActArrTime,newDriver,newVehicle); prevAct = nextAct; actIndex++; } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java index 4fd935d3..aafd487e 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java @@ -203,7 +203,7 @@ final class ServiceInsertionOnRouteLevelCalculator implements JobInsertionCostsC /** * departure time at nextAct with new vehicle */ - double depTime_nextAct_newVehicle = Math.max(arrTime_nextAct_newVehicle, nextAct.getTheoreticalEarliestOperationStartTime()) + nextAct.getOperationTime(); + double depTime_nextAct_newVehicle = Math.max(arrTime_nextAct_newVehicle, nextAct.getTheoreticalEarliestOperationStartTime()) + activityCosts.getActivityDuration(nextAct, arrTime_nextAct_newVehicle,newDriver,newVehicle); /** * set previous to next diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java index dae3cb0e..1d7415c8 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/recreate/VariableTransportCostCalculator.java @@ -17,6 +17,7 @@ package com.graphhopper.jsprit.core.algorithm.recreate; import com.graphhopper.jsprit.core.problem.constraint.SoftActivityConstraint; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; import com.graphhopper.jsprit.core.problem.solution.route.activity.End; @@ -25,11 +26,14 @@ import com.graphhopper.jsprit.core.util.CalculationUtils; public class VariableTransportCostCalculator implements SoftActivityConstraint { - private VehicleRoutingTransportCosts routingCosts; + private final VehicleRoutingTransportCosts routingCosts; - public VariableTransportCostCalculator(VehicleRoutingTransportCosts routingCosts) { + private final VehicleRoutingActivityCosts activityCosts; + + public VariableTransportCostCalculator(VehicleRoutingTransportCosts routingCosts, VehicleRoutingActivityCosts activityCosts) { super(); this.routingCosts = routingCosts; + this.activityCosts = activityCosts; } @Override @@ -38,7 +42,7 @@ public class VariableTransportCostCalculator implements SoftActivityConstraint { double tp_time_prevAct_newAct = routingCosts.getTransportTime(prevAct.getLocation(), newAct.getLocation(), depTimeAtPrevAct, iFacts.getNewDriver(), iFacts.getNewVehicle()); double newAct_arrTime = depTimeAtPrevAct + tp_time_prevAct_newAct; - double newAct_endTime = CalculationUtils.getActivityEndTime(newAct_arrTime, newAct); + double newAct_endTime = Math.max(newAct_arrTime, newAct.getTheoreticalEarliestOperationStartTime()) + activityCosts.getActivityDuration(newAct,newAct_arrTime,iFacts.getNewDriver(),iFacts.getNewVehicle()); //open routes if (nextAct instanceof End) { diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateActivityTimes.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateActivityTimes.java index 5a1a17a2..92759e05 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateActivityTimes.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateActivityTimes.java @@ -17,6 +17,7 @@ package com.graphhopper.jsprit.core.algorithm.state; import com.graphhopper.jsprit.core.problem.cost.ForwardTransportTime; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.solution.route.activity.ActivityVisitor; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; @@ -45,13 +46,13 @@ public class UpdateActivityTimes implements ActivityVisitor, StateUpdater { * activity.getArrTime() and * activity.getEndTime() */ - public UpdateActivityTimes(ForwardTransportTime transportTime) { + public UpdateActivityTimes(ForwardTransportTime transportTime, VehicleRoutingActivityCosts activityCosts) { super(); - timeTracker = new ActivityTimeTracker(transportTime); + timeTracker = new ActivityTimeTracker(transportTime,activityCosts ); } - public UpdateActivityTimes(ForwardTransportTime transportTime, ActivityTimeTracker.ActivityPolicy activityPolicy) { - timeTracker = new ActivityTimeTracker(transportTime, activityPolicy); + public UpdateActivityTimes(ForwardTransportTime transportTime, ActivityTimeTracker.ActivityPolicy activityPolicy, VehicleRoutingActivityCosts activityCosts) { + timeTracker = new ActivityTimeTracker(transportTime, activityPolicy, activityCosts); } @Override diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java index bb576476..ed403ac0 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindows.java @@ -16,6 +16,7 @@ ******************************************************************************/ package com.graphhopper.jsprit.core.algorithm.state; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.solution.route.activity.ReverseActivityVisitor; @@ -34,14 +35,17 @@ class UpdatePracticalTimeWindows implements ReverseActivityVisitor, StateUpdater private VehicleRoutingTransportCosts transportCosts; + private VehicleRoutingActivityCosts activityCosts; + private double latestArrTimeAtPrevAct; private TourActivity prevAct; - public UpdatePracticalTimeWindows(StateManager states, VehicleRoutingTransportCosts tpCosts) { + public UpdatePracticalTimeWindows(StateManager states, VehicleRoutingTransportCosts tpCosts, VehicleRoutingActivityCosts activityCosts) { super(); this.states = states; this.transportCosts = tpCosts; + this.activityCosts = activityCosts; } @Override @@ -53,7 +57,7 @@ class UpdatePracticalTimeWindows implements ReverseActivityVisitor, StateUpdater @Override public void visit(TourActivity activity) { - double potentialLatestArrivalTimeAtCurrAct = latestArrTimeAtPrevAct - transportCosts.getBackwardTransportTime(activity.getLocation(), prevAct.getLocation(), latestArrTimeAtPrevAct, route.getDriver(), route.getVehicle()) - activity.getOperationTime(); + double potentialLatestArrivalTimeAtCurrAct = latestArrTimeAtPrevAct - transportCosts.getBackwardTransportTime(activity.getLocation(), prevAct.getLocation(), latestArrTimeAtPrevAct, route.getDriver(), route.getVehicle()) - activityCosts.getActivityDuration(activity,latestArrTimeAtPrevAct,route.getDriver(),route.getVehicle()); double latestArrivalTime = Math.min(activity.getTheoreticalLatestOperationStartTime(), potentialLatestArrivalTimeAtCurrAct); states.putInternalTypedActivityState(activity, InternalStates.LATEST_OPERATION_START_TIME, latestArrivalTime); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCosts.java index 4c99217a..c3905792 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVariableCosts.java @@ -64,14 +64,14 @@ public class UpdateVariableCosts implements ActivityVisitor, StateUpdater { this.activityCost = activityCost; this.transportCost = transportCost; this.states = states; - timeTracker = new ActivityTimeTracker(transportCost); + timeTracker = new ActivityTimeTracker(transportCost, activityCost); } public UpdateVariableCosts(VehicleRoutingActivityCosts activityCosts, VehicleRoutingTransportCosts transportCosts, StateManager stateManager, ActivityTimeTracker.ActivityPolicy activityPolicy) { this.activityCost = activityCosts; this.transportCost = transportCosts; this.states = stateManager; - timeTracker = new ActivityTimeTracker(transportCosts, activityPolicy); + timeTracker = new ActivityTimeTracker(transportCosts, activityPolicy, activityCosts); } @Override diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java index 6b0aef51..f15c9393 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentPracticalTimeWindows.java @@ -59,6 +59,8 @@ public class UpdateVehicleDependentPracticalTimeWindows implements RouteVisitor, private final VehicleRoutingTransportCosts transportCosts; + private final VehicleRoutingActivityCosts activityCosts; + private VehicleRoute route; private double[] latest_arrTimes_at_prevAct; @@ -67,10 +69,11 @@ public class UpdateVehicleDependentPracticalTimeWindows implements RouteVisitor, private Collection vehicles; - public UpdateVehicleDependentPracticalTimeWindows(StateManager stateManager, VehicleRoutingTransportCosts tpCosts) { + public UpdateVehicleDependentPracticalTimeWindows(StateManager stateManager, VehicleRoutingTransportCosts tpCosts, VehicleRoutingActivityCosts activityCosts) { super(); this.stateManager = stateManager; this.transportCosts = tpCosts; + this.activityCosts = activityCosts; latest_arrTimes_at_prevAct = new double[stateManager.getMaxIndexOfVehicleTypeIdentifiers() + 1]; location_of_prevAct = new Location[stateManager.getMaxIndexOfVehicleTypeIdentifiers() + 1]; } @@ -95,9 +98,8 @@ public class UpdateVehicleDependentPracticalTimeWindows implements RouteVisitor, double latestArrTimeAtPrevAct = latest_arrTimes_at_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()]; Location prevLocation = location_of_prevAct[vehicle.getVehicleTypeIdentifier().getIndex()]; double potentialLatestArrivalTimeAtCurrAct = latestArrTimeAtPrevAct - transportCosts.getBackwardTransportTime(activity.getLocation(), prevLocation, - latestArrTimeAtPrevAct, route.getDriver(), vehicle) - activity.getOperationTime(); + latestArrTimeAtPrevAct, route.getDriver(), vehicle) - activityCosts.getActivityDuration(activity, latestArrTimeAtPrevAct, route.getDriver(), route.getVehicle()); double latestArrivalTime = Math.min(activity.getTheoreticalLatestOperationStartTime(), potentialLatestArrivalTimeAtCurrAct); -// getLatestArrivalTime(activity.getTimeWindows(), potentialLatestArrivalTimeAtCurrAct); if (latestArrivalTime < activity.getTheoreticalEarliestOperationStartTime()) { stateManager.putTypedInternalRouteState(route, vehicle, InternalStates.SWITCH_NOT_FEASIBLE, true); } @@ -108,8 +110,8 @@ public class UpdateVehicleDependentPracticalTimeWindows implements RouteVisitor, } - public void finish() {} - + public void finish() { + } } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java index 1453e334..cc442a0f 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java @@ -231,6 +231,8 @@ public class SolutionAnalyser { private StateManager stateManager; + private final VehicleRoutingActivityCosts activityCosts; + private ActivityTimeTracker.ActivityPolicy activityPolicy; private VehicleRoute route; @@ -245,13 +247,14 @@ public class SolutionAnalyser { double prevActDeparture; - private SumUpActivityTimes(StateId waiting_time_id, StateId transport_time_id, StateId service_time_id, StateId too_late_id, StateManager stateManager, ActivityTimeTracker.ActivityPolicy activityPolicy) { + private SumUpActivityTimes(StateId waiting_time_id, StateId transport_time_id, StateId service_time_id, StateId too_late_id, StateManager stateManager, ActivityTimeTracker.ActivityPolicy activityPolicy, VehicleRoutingActivityCosts activityCosts) { this.waiting_time_id = waiting_time_id; this.transport_time_id = transport_time_id; this.service_time_id = service_time_id; this.too_late_id = too_late_id; this.stateManager = stateManager; this.activityPolicy = activityPolicy; + this.activityCosts = activityCosts; } @Override @@ -280,7 +283,7 @@ public class SolutionAnalyser { sum_transport_time += transportTime; prevActDeparture = activity.getEndTime(); //service time - sum_service_time += activity.getOperationTime(); + sum_service_time += activityCosts.getActivityDuration(activity,activity.getArrTime(),route.getDriver(),route.getVehicle()); stateManager.putActivityState(activity, transport_time_id, sum_transport_time); @@ -547,7 +550,7 @@ public class SolutionAnalyser { this.stateManager.updateLoadStates(); this.stateManager.updateSkillStates(); activityPolicy = ActivityTimeTracker.ActivityPolicy.AS_SOON_AS_TIME_WINDOW_OPENS; - this.stateManager.addStateUpdater(new UpdateActivityTimes(vrp.getTransportCosts(), activityPolicy)); + this.stateManager.addStateUpdater(new UpdateActivityTimes(vrp.getTransportCosts(), activityPolicy, vrp.getActivityCosts())); this.stateManager.addStateUpdater(new UpdateVariableCosts(vrp.getActivityCosts(), vrp.getTransportCosts(), stateManager)); waiting_time_id = stateManager.createStateId("waiting-time"); transport_time_id = stateManager.createStateId("transport-time"); @@ -561,7 +564,7 @@ public class SolutionAnalyser { last_transport_distance_id = stateManager.createStateId("last-transport-distance"); last_transport_time_id = stateManager.createStateId("last-transport-time"); - stateManager.addStateUpdater(new SumUpActivityTimes(waiting_time_id, transport_time_id, service_time_id, too_late_id, stateManager, activityPolicy)); + stateManager.addStateUpdater(new SumUpActivityTimes(waiting_time_id, transport_time_id, service_time_id, too_late_id, stateManager, activityPolicy, vrp.getActivityCosts())); stateManager.addStateUpdater(new DistanceUpdater(distance_id, stateManager, distanceCalculator)); stateManager.addStateUpdater(new BackhaulAndShipmentUpdater(backhaul_id, shipment_id, stateManager)); stateManager.addStateUpdater(new SkillUpdater(stateManager, skill_id)); diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/AdditionalTransportationCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/AdditionalTransportationCosts.java index 3a112f4e..ea739af4 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/AdditionalTransportationCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/AdditionalTransportationCosts.java @@ -31,6 +31,8 @@ class AdditionalTransportationCosts implements SoftActivityConstraint { private VehicleRoutingTransportCosts routingCosts; + private VehicleRoutingActivityCosts activityCosts; + /** * Constructs the calculator that calculates additional transportation costs induced by inserting new activity. *

@@ -38,10 +40,12 @@ class AdditionalTransportationCosts implements SoftActivityConstraint { *

If newVehicle.isReturnToDepot == false then the additional costs of inserting act_new between act_i and end is c(act_i,act_new) [since act_new is then the new end-of-route] * * @param routingCosts + * @param activityCosts */ - public AdditionalTransportationCosts(VehicleRoutingTransportCosts routingCosts) { + public AdditionalTransportationCosts(VehicleRoutingTransportCosts routingCosts, VehicleRoutingActivityCosts activityCosts) { super(); this.routingCosts = routingCosts; + this.activityCosts = activityCosts; } /** @@ -56,7 +60,7 @@ class AdditionalTransportationCosts implements SoftActivityConstraint { double tp_time_prevAct_newAct = routingCosts.getTransportTime(prevAct.getLocation(), newAct.getLocation(), depTimeAtPrevAct, iFacts.getNewDriver(), iFacts.getNewVehicle()); double newAct_arrTime = depTimeAtPrevAct + tp_time_prevAct_newAct; - double newAct_endTime = CalculationUtils.getActivityEndTime(newAct_arrTime, newAct); + double newAct_endTime = Math.max(newAct_arrTime, newAct.getTheoreticalEarliestOperationStartTime()) + activityCosts.getActivityDuration(newAct,newAct_arrTime,iFacts.getNewDriver(),iFacts.getNewVehicle()); //open routes if (nextAct instanceof End) { diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java index c4f80430..0c316037 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/ConstraintManager.java @@ -98,7 +98,7 @@ public class ConstraintManager implements HardActivityConstraint, HardRouteConst public void addTimeWindowConstraint() { if (!timeWindowConstraintsSet) { - addConstraint(new VehicleDependentTimeWindowConstraints(stateManager, vrp.getTransportCosts()), Priority.HIGH); + addConstraint(new VehicleDependentTimeWindowConstraints(stateManager, vrp.getTransportCosts(), vrp.getActivityCosts()), Priority.HIGH); timeWindowConstraintsSet = true; } } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/TimeWindowConstraint.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/TimeWindowConstraint.java deleted file mode 100644 index 9a6f6a33..00000000 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/TimeWindowConstraint.java +++ /dev/null @@ -1,142 +0,0 @@ -/******************************************************************************* - * 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 com.graphhopper.jsprit.core.problem.constraint; - -import com.graphhopper.jsprit.core.algorithm.state.InternalStates; -import com.graphhopper.jsprit.core.problem.Location; -import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; -import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; -import com.graphhopper.jsprit.core.problem.solution.route.activity.End; -import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; -import com.graphhopper.jsprit.core.problem.solution.route.state.RouteAndActivityStateGetter; -import com.graphhopper.jsprit.core.util.CalculationUtils; - - -/** - * @author stefan - */ -class TimeWindowConstraint implements HardActivityConstraint { - - private RouteAndActivityStateGetter states; - - private VehicleRoutingTransportCosts routingCosts; - - public TimeWindowConstraint(RouteAndActivityStateGetter states, VehicleRoutingTransportCosts routingCosts) { - super(); - this.states = states; - this.routingCosts = routingCosts; - } - - @Override - public ConstraintsStatus fulfilled(JobInsertionContext iFacts, TourActivity prevAct, TourActivity newAct, TourActivity nextAct, double prevActDepTime) { - double latestVehicleArrival = iFacts.getNewVehicle().getLatestArrival(); - Double latestArrTimeAtNextAct; - Location nextActLocation; - if (nextAct instanceof End) { - latestArrTimeAtNextAct = latestVehicleArrival; - nextActLocation = iFacts.getNewVehicle().getEndLocation(); - if (!iFacts.getNewVehicle().isReturnToDepot()) { - nextActLocation = newAct.getLocation(); - } - } else { - latestArrTimeAtNextAct = states.getActivityState(nextAct, InternalStates.LATEST_OPERATION_START_TIME, Double.class); - if (latestArrTimeAtNextAct == null) - latestArrTimeAtNextAct = nextAct.getTheoreticalLatestOperationStartTime(); - nextActLocation = nextAct.getLocation(); - } - - /* - * if latest arrival of vehicle (at its end) is smaller than earliest operation start times of activities, - * then vehicle can never conduct activities. - * - * |--- vehicle's operation time ---| - * |--- prevAct or newAct or nextAct ---| - */ - if (latestVehicleArrival < prevAct.getTheoreticalEarliestOperationStartTime() || - latestVehicleArrival < newAct.getTheoreticalEarliestOperationStartTime() || - latestVehicleArrival < nextAct.getTheoreticalEarliestOperationStartTime()) { - return ConstraintsStatus.NOT_FULFILLED_BREAK; - } - /* - * if the latest operation start-time of new activity is smaller than the earliest start of prev. activity, - * then - * - * |--- prevAct ---| - * |--- newAct ---| - */ - if (newAct.getTheoreticalLatestOperationStartTime() < prevAct.getTheoreticalEarliestOperationStartTime()) { - return ConstraintsStatus.NOT_FULFILLED_BREAK; - } - - /* - * |--- prevAct ---| - * |- earliest arrival of vehicle - * |--- nextAct ---| - */ - double arrTimeAtNextOnDirectRouteWithNewVehicle = prevActDepTime + routingCosts.getTransportTime(prevAct.getLocation(), nextAct.getLocation(), prevActDepTime, iFacts.getNewDriver(), iFacts.getNewVehicle()); - if (arrTimeAtNextOnDirectRouteWithNewVehicle > nextAct.getTheoreticalLatestOperationStartTime()) { - return ConstraintsStatus.NOT_FULFILLED_BREAK; - } - /* - * |--- newAct ---| - * |--- nextAct ---| - */ - if (newAct.getTheoreticalEarliestOperationStartTime() > nextAct.getTheoreticalLatestOperationStartTime()) { - return ConstraintsStatus.NOT_FULFILLED; - } - // log.info("check insertion of " + newAct + " between " + prevAct + " and " + nextAct + ". prevActDepTime=" + prevActDepTime); -// double latestArrTimeAtNextAct = states.getActivityState(nextAct, StateFactory.LATEST_OPERATION_START_TIME, Double.class); - double arrTimeAtNewAct = prevActDepTime + routingCosts.getTransportTime(prevAct.getLocation(), newAct.getLocation(), prevActDepTime, iFacts.getNewDriver(), iFacts.getNewVehicle()); - - - double latestArrTimeAtNewAct = Math.min(newAct.getTheoreticalLatestOperationStartTime(), latestArrTimeAtNextAct - - routingCosts.getBackwardTransportTime(nextActLocation, newAct.getLocation(), latestArrTimeAtNextAct, iFacts.getNewDriver(), - iFacts.getNewVehicle()) - newAct.getOperationTime()); - /* - * |--- prevAct ---| - * |--- vehicle's arrival @newAct - * latest arrival of vehicle @newAct ---| - */ - if (arrTimeAtNewAct > latestArrTimeAtNewAct) { - return ConstraintsStatus.NOT_FULFILLED; - } - - if (nextAct instanceof End) { - if (!iFacts.getNewVehicle().isReturnToDepot()) { - return ConstraintsStatus.FULFILLED; - } - } -// log.info(newAct + " arrTime=" + arrTimeAtNewAct); - double endTimeAtNewAct = CalculationUtils.getActivityEndTime(arrTimeAtNewAct, newAct); - double arrTimeAtNextAct = endTimeAtNewAct + routingCosts.getTransportTime(newAct.getLocation(), nextAct.getLocation(), endTimeAtNewAct, iFacts.getNewDriver(), iFacts.getNewVehicle()); - - /* - * |--- newAct ---| - * |--- vehicle's arrival @nextAct - * latest arrival of vehicle @nextAct ---| - */ - if (arrTimeAtNextAct > latestArrTimeAtNextAct) { - return ConstraintsStatus.NOT_FULFILLED; - } - -// if vehicle cannot even manage direct-route - break - if (arrTimeAtNextOnDirectRouteWithNewVehicle > latestArrTimeAtNextAct) { - return ConstraintsStatus.NOT_FULFILLED_BREAK; - } - return ConstraintsStatus.FULFILLED; - } -} diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java index f48806e7..a7f450b0 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java @@ -36,10 +36,13 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr private VehicleRoutingTransportCosts routingCosts; - public VehicleDependentTimeWindowConstraints(RouteAndActivityStateGetter states, VehicleRoutingTransportCosts routingCosts) { + private VehicleRoutingActivityCosts activityCosts; + + public VehicleDependentTimeWindowConstraints(RouteAndActivityStateGetter states, VehicleRoutingTransportCosts routingCosts, VehicleRoutingActivityCosts activityCosts) { super(); this.states = states; this.routingCosts = routingCosts; + this.activityCosts = activityCosts; } @Override @@ -82,9 +85,7 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr * |--- prevAct ---| * |--- newAct ---| */ - double newAct_theoreticalLatestOperationStartTime = newAct.getTheoreticalLatestOperationStartTime(); - - if (newAct_theoreticalLatestOperationStartTime < prevAct.getTheoreticalEarliestOperationStartTime()) { + if (newAct.getTheoreticalLatestOperationStartTime() < prevAct.getTheoreticalEarliestOperationStartTime()) { return ConstraintsStatus.NOT_FULFILLED_BREAK; } @@ -102,17 +103,17 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr * |--- newAct ---| * |--- nextAct ---| */ - if(newAct_theoreticalEarliestOperationStartTime > nextAct.getTheoreticalLatestOperationStartTime()){ + if (newAct.getTheoreticalEarliestOperationStartTime() > nextAct.getTheoreticalLatestOperationStartTime()) { return ConstraintsStatus.NOT_FULFILLED; } // log.info("check insertion of " + newAct + " between " + prevAct + " and " + nextAct + ". prevActDepTime=" + prevActDepTime); double arrTimeAtNewAct = prevActDepTime + routingCosts.getTransportTime(prevAct.getLocation(), newAct.getLocation(), prevActDepTime, iFacts.getNewDriver(), iFacts.getNewVehicle()); - double endTimeAtNewAct = CalculationUtils.getActivityEndTime(arrTimeAtNewAct, newAct); + double endTimeAtNewAct = Math.max(arrTimeAtNewAct, newAct.getTheoreticalEarliestOperationStartTime()) + activityCosts.getActivityDuration(newAct, arrTimeAtNewAct,iFacts.getNewDriver(),iFacts.getNewVehicle()); double latestArrTimeAtNewAct = - Math.min(newAct_theoreticalLatestOperationStartTime, + Math.min(newAct.getTheoreticalLatestOperationStartTime(), latestArrTimeAtNextAct - - routingCosts.getBackwardTransportTime(newAct.getLocation(),nextActLocation,latestArrTimeAtNextAct,iFacts.getNewDriver(),iFacts.getNewVehicle()) - - newAct.getOperationTime() + routingCosts.getBackwardTransportTime(newAct.getLocation(), nextActLocation, latestArrTimeAtNextAct, iFacts.getNewDriver(), iFacts.getNewVehicle()) + - activityCosts.getActivityDuration(newAct, arrTimeAtNewAct, iFacts.getNewDriver(), iFacts.getNewVehicle()) ); /* diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java index c19962de..b04d9f6c 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/VehicleRoutingActivityCosts.java @@ -58,5 +58,6 @@ public interface VehicleRoutingActivityCosts { */ public double getActivityCost(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle); + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle); } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/WaitingTimeCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/WaitingTimeCosts.java index 9eba596f..44e37e01 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/WaitingTimeCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/WaitingTimeCosts.java @@ -13,10 +13,15 @@ public class WaitingTimeCosts implements VehicleRoutingActivityCosts { public double getActivityCost(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { if (vehicle != null) { double waiting = vehicle.getType().getVehicleCostParams().perWaitingTimeUnit * Math.max(0., tourAct.getTheoreticalEarliestOperationStartTime() - arrivalTime); - double servicing = vehicle.getType().getVehicleCostParams().perServiceTimeUnit * tourAct.getOperationTime(); + double servicing = vehicle.getType().getVehicleCostParams().perServiceTimeUnit * getActivityDuration(tourAct,arrivalTime,driver,vehicle); return waiting + servicing; } return 0; } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ActivityTimeTracker.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ActivityTimeTracker.java index edb192dd..079e8fc3 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ActivityTimeTracker.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ActivityTimeTracker.java @@ -17,6 +17,7 @@ package com.graphhopper.jsprit.core.util; import com.graphhopper.jsprit.core.problem.cost.ForwardTransportTime; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.solution.route.activity.*; @@ -28,7 +29,9 @@ public class ActivityTimeTracker implements ActivityVisitor { } - private ForwardTransportTime transportTime; + private final ForwardTransportTime transportTime; + + private final VehicleRoutingActivityCosts activityCosts; private TourActivity prevAct = null; @@ -42,27 +45,19 @@ public class ActivityTimeTracker implements ActivityVisitor { private double actEndTime; - private ActivityStartStrategy startStrategy; + private ActivityPolicy activityPolicy = ActivityPolicy.AS_SOON_AS_TIME_WINDOW_OPENS; - public ActivityTimeTracker(ForwardTransportTime transportTime) { - super(); - this.transportTime = transportTime; - this.startStrategy = new ActivityStartsAsSoonAsTimeWindowOpens(); - } - - public ActivityTimeTracker(ForwardTransportTime transportTime, ActivityPolicy activityPolicy) { + public ActivityTimeTracker(ForwardTransportTime transportTime, VehicleRoutingActivityCosts activityCosts) { super(); this.transportTime = transportTime; - if(activityPolicy.equals(ActivityPolicy.AS_SOON_AS_ARRIVED)){ - this.startStrategy = new ActivityStartAsSoonAsArrived(); - } - else this.startStrategy = new ActivityStartsAsSoonAsTimeWindowOpens(); + this.activityCosts = activityCosts; } - public ActivityTimeTracker(ForwardTransportTime transportTime, ActivityStartStrategy startStrategy) { + public ActivityTimeTracker(ForwardTransportTime transportTime, ActivityPolicy activityPolicy, VehicleRoutingActivityCosts activityCosts) { super(); this.transportTime = transportTime; - this.startStrategy = startStrategy; + this.activityPolicy = activityPolicy; + this.activityCosts = activityCosts; } public double getActArrTime() { @@ -84,22 +79,36 @@ public class ActivityTimeTracker implements ActivityVisitor { @Override public void visit(TourActivity activity) { - if(!beginFirst) throw new IllegalStateException("never called begin. this however is essential here"); + if (!beginFirst) throw new IllegalStateException("never called begin. this however is essential here"); double transportTime = this.transportTime.getTransportTime(prevAct.getLocation(), activity.getLocation(), startAtPrevAct, route.getDriver(), route.getVehicle()); double arrivalTimeAtCurrAct = startAtPrevAct + transportTime; + actArrTime = arrivalTimeAtCurrAct; - double operationEndTime = startStrategy.getActivityStartTime(activity,arrivalTimeAtCurrAct) + activity.getOperationTime(); + double operationStartTime; + + if (activityPolicy.equals(ActivityPolicy.AS_SOON_AS_TIME_WINDOW_OPENS)) { + operationStartTime = Math.max(activity.getTheoreticalEarliestOperationStartTime(), arrivalTimeAtCurrAct); + } else if (activityPolicy.equals(ActivityPolicy.AS_SOON_AS_ARRIVED)) { + operationStartTime = actArrTime; + } else operationStartTime = actArrTime; + + double operationEndTime = operationStartTime + activityCosts.getActivityDuration(activity,actArrTime,route.getDriver(),route.getVehicle()); + actEndTime = operationEndTime; + prevAct = activity; startAtPrevAct = operationEndTime; + } @Override public void finish() { double transportTime = this.transportTime.getTransportTime(prevAct.getLocation(), route.getEnd().getLocation(), startAtPrevAct, route.getDriver(), route.getVehicle()); double arrivalTimeAtCurrAct = startAtPrevAct + transportTime; + actArrTime = arrivalTimeAtCurrAct; actEndTime = arrivalTimeAtCurrAct; + beginFirst = false; } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CalculationUtils.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CalculationUtils.java index 1ff6f131..3e80b9bf 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CalculationUtils.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CalculationUtils.java @@ -20,6 +20,7 @@ package com.graphhopper.jsprit.core.util; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +@Deprecated public class CalculationUtils { diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RouteUtils.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RouteUtils.java deleted file mode 100644 index 533c180a..00000000 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/RouteUtils.java +++ /dev/null @@ -1,111 +0,0 @@ -/******************************************************************************* - * 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 com.graphhopper.jsprit.core.util; - -import com.graphhopper.jsprit.core.algorithm.state.UpdateActivityTimes; -import com.graphhopper.jsprit.core.problem.cost.TransportTime; -import com.graphhopper.jsprit.core.problem.driver.DriverImpl; -import com.graphhopper.jsprit.core.problem.job.Job; -import com.graphhopper.jsprit.core.problem.job.Service; -import com.graphhopper.jsprit.core.problem.solution.route.RouteActivityVisitor; -import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; -import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; - -import java.util.Collection; - -@Deprecated -public class RouteUtils { - - /** - * Returns total service time, i.e. sum of service time of each job. - * - * @param routes - * @return - */ - public static double calculateServiceTime(Collection routes) { - double serviceTime = 0.; - for (VehicleRoute r : routes) { - for (Job j : r.getTourActivities().getJobs()) { - serviceTime += ((Service) j).getServiceDuration(); - } - } - return serviceTime; - } - - /** - * Returns total transport time. - * - * @param routes - * @param transportTimes - * @return - */ - public static double calculateTransportTime(Collection routes, TransportTime transportTimes) { - double tpTime = 0.; - for (VehicleRoute r : routes) { - TourActivity lastact = r.getStart(); - double lastActDepTime = r.getDepartureTime(); - for (TourActivity act : r.getActivities()) { - tpTime += transportTimes.getTransportTime(lastact.getLocation(), act.getLocation(), lastActDepTime, DriverImpl.noDriver(), r.getVehicle()); - lastact = act; - lastActDepTime = act.getEndTime(); - } - tpTime += transportTimes.getTransportTime(lastact.getLocation(), r.getEnd().getLocation(), lastActDepTime, DriverImpl.noDriver(), r.getVehicle()); - } - return tpTime; - } - - /** - * Returns total waiting time. - * - * @param routes - * @return - */ - public static double calculateWaitingTime(Collection routes) { - double waitingTime = 0.; - for (VehicleRoute r : routes) { - for (TourActivity act : r.getActivities()) { - waitingTime += Math.max(0., act.getTheoreticalEarliestOperationStartTime() - act.getArrTime()); - } - } - return waitingTime; - } - - /** - * Returns total operation time. - * - * @param routes - * @return - */ - public static double calulateOperationTime(Collection routes) { - double opTime = 0.; - for (VehicleRoute r : routes) { - opTime += r.getEnd().getArrTime() - r.getDepartureTime(); - } - return opTime; - } - - /** - * Updates activity arrival/end-times of activities in specified route. - * - * @param route - * @param transportTimes - */ - public static void updateActivityTimes(VehicleRoute route, TransportTime transportTimes) { - new RouteActivityVisitor().addActivityVisitor(new UpdateActivityTimes(transportTimes)).visit(route); - } - -} diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ExampleActivityCostFunction.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ExampleActivityCostFunction.java index 485d3143..08a83ca7 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ExampleActivityCostFunction.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ExampleActivityCostFunction.java @@ -39,7 +39,7 @@ public class ExampleActivityCostFunction implements VehicleRoutingActivityCosts return 0.0; } else { //waiting + act-time - double endTime = Math.max(arrivalTime, tourAct.getTheoreticalEarliestOperationStartTime()) + tourAct.getOperationTime(); + double endTime = Math.max(arrivalTime, tourAct.getTheoreticalEarliestOperationStartTime()) + getActivityDuration(tourAct,arrivalTime,driver,vehicle); double timeAtAct = endTime - arrivalTime; double totalCost = timeAtAct * parameter_timeAtAct; @@ -56,4 +56,9 @@ public class ExampleActivityCostFunction implements VehicleRoutingActivityCosts } } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + } diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java index e42bad4c..6976ec2a 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java @@ -46,6 +46,11 @@ public class VariableDepartureAndWaitingTime_IT { return vehicle.getType().getVehicleCostParams().perWaitingTimeUnit * Math.max(0, tourAct.getTheoreticalEarliestOperationStartTime() - arrivalTime); } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }; algorithmFactory = new AlgorithmFactory() { @Override diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java index 786d7a16..bd30fb4d 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ServiceInsertionAndLoadConstraintsTest.java @@ -63,6 +63,11 @@ public class ServiceInsertionAndLoadConstraintsTest { return 0; } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }; HardActivityConstraint hardActivityLevelConstraint = new HardActivityConstraint() { @@ -103,7 +108,7 @@ public class ServiceInsertionAndLoadConstraintsTest { private void createInsertionCalculator(HardRouteConstraint hardRouteLevelConstraint) { ConstraintManager constraintManager = new ConstraintManager(mock(VehicleRoutingProblem.class), mock(RouteAndActivityStateGetter.class)); constraintManager.addConstraint(hardRouteLevelConstraint); - insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager); + insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityCosts, activityInsertionCostsCalculator, constraintManager); } @Test @@ -137,9 +142,9 @@ public class ServiceInsertionAndLoadConstraintsTest { stateManager.informInsertionStarts(Arrays.asList(route), null); JobCalculatorSwitcher switcher = new JobCalculatorSwitcher(); - ServiceInsertionCalculator serviceInsertionCalc = new ServiceInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager); + ServiceInsertionCalculator serviceInsertionCalc = new ServiceInsertionCalculator(routingCosts, activityCosts, activityInsertionCostsCalculator, constraintManager); serviceInsertionCalc.setJobActivityFactory(activityFactory); - ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager); + ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityCosts, activityInsertionCostsCalculator, constraintManager); insertionCalculator.setJobActivityFactory(activityFactory); switcher.put(Pickup.class, serviceInsertionCalc); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java index f73f5f75..1d6be4d9 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/ShipmentInsertionCalculatorTest.java @@ -71,6 +71,11 @@ public class ShipmentInsertionCalculatorTest { return 0; } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }; HardRouteConstraint hardRouteLevelConstraint = new HardRouteConstraint() { @@ -101,7 +106,7 @@ public class ShipmentInsertionCalculatorTest { private void createInsertionCalculator(HardRouteConstraint hardRouteLevelConstraint) { ConstraintManager constraintManager = new ConstraintManager(mock(VehicleRoutingProblem.class), mock(RouteAndActivityStateGetter.class)); constraintManager.addConstraint(hardRouteLevelConstraint); - insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager); + insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityCosts, activityInsertionCostsCalculator, constraintManager); } @Test @@ -253,8 +258,8 @@ public class ShipmentInsertionCalculatorTest { constraintManager.addConstraint(new PickupAndDeliverShipmentLoadActivityLevelConstraint(stateManager), ConstraintManager.Priority.CRITICAL); constraintManager.addConstraint(new ShipmentPickupsFirstConstraint(), ConstraintManager.Priority.CRITICAL); - ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, - constraintManager); + ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityCosts, + activityInsertionCostsCalculator, constraintManager); insertionCalculator.setJobActivityFactory(vrp.getJobActivityFactory()); InsertionData iData = insertionCalculator.getInsertionData(route, shipment3, vehicle, 0.0, DriverImpl.noDriver(), Double.MAX_VALUE); @@ -288,8 +293,8 @@ public class ShipmentInsertionCalculatorTest { stateManager.informInsertionStarts(Arrays.asList(route), null); JobCalculatorSwitcher switcher = new JobCalculatorSwitcher(); - ServiceInsertionCalculator serviceInsertionCalc = new ServiceInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager); - ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityInsertionCostsCalculator, constraintManager); + ServiceInsertionCalculator serviceInsertionCalc = new ServiceInsertionCalculator(routingCosts, activityCosts, activityInsertionCostsCalculator, constraintManager); + ShipmentInsertionCalculator insertionCalculator = new ShipmentInsertionCalculator(routingCosts, activityCosts, activityInsertionCostsCalculator, constraintManager); switcher.put(Pickup.class, serviceInsertionCalc); switcher.put(Service.class, serviceInsertionCalc); switcher.put(Shipment.class, insertionCalculator); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java index 4723182e..14f7924e 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestCalculatesServiceInsertion.java @@ -130,7 +130,7 @@ public class TestCalculatesServiceInsertion { VehicleRoutingActivityCosts actCosts = mock(VehicleRoutingActivityCosts.class); - serviceInsertion = new ServiceInsertionCalculator(costs, new LocalActivityInsertionCostsCalculator(costs, actCosts, states), cManager); + serviceInsertion = new ServiceInsertionCalculator(costs, vrp.getActivityCosts(), new LocalActivityInsertionCostsCalculator(costs, actCosts, states), cManager); serviceInsertion.setJobActivityFactory(new JobActivityFactory() { @Override public List createActivities(Job job) { diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java index c515ee11..388b77f3 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestDepartureTimeOpt.java @@ -58,6 +58,11 @@ public class TestDepartureTimeOpt { return waiting + late; } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }); VehicleRoutingProblem vrp = vrpBuilder.addJob(service).addVehicle(vehicle).build(); @@ -86,6 +91,11 @@ public class TestDepartureTimeOpt { return waiting + late; } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }); VehicleRoutingProblem vrp = vrpBuilder.addJob(service).addVehicle(vehicle).build(); @@ -113,6 +123,11 @@ public class TestDepartureTimeOpt { return waiting + late; } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }); VehicleRoutingProblem vrp = vrpBuilder.addJob(service).addVehicle(vehicle).build(); @@ -141,6 +156,11 @@ public class TestDepartureTimeOpt { return waiting + late; } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }); VehicleRoutingProblem vrp = vrpBuilder.addJob(service).addVehicle(vehicle).build(); @@ -173,6 +193,11 @@ public class TestDepartureTimeOpt { return waiting + late; } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }); VehicleRoutingProblem vrp = vrpBuilder.addJob(service).addJob(service2).addVehicle(vehicle).build(); @@ -205,6 +230,11 @@ public class TestDepartureTimeOpt { return waiting + late; } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }); VehicleRoutingProblem vrp = vrpBuilder.addJob(service).addJob(service2).addVehicle(vehicle).build(); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java index c176c4c5..c807d214 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestLocalActivityInsertionCostsCalculator.java @@ -82,7 +82,7 @@ public class TestLocalActivityInsertionCostsCalculator { when(tpCosts.getTransportCost(loc("k"), loc("j"), 0.0, null, vehicle)).thenReturn(3.0); when(tpCosts.getTransportTime(loc("k"), loc("j"), 0.0, null, vehicle)).thenReturn(0.0); - actCosts = mock(VehicleRoutingActivityCosts.class); + actCosts = new WaitingTimeCosts(); calc = new LocalActivityInsertionCostsCalculator(tpCosts, actCosts, mock(StateManager.class)); } @@ -585,8 +585,8 @@ public class TestLocalActivityInsertionCostsCalculator { private StateManager getStateManager(VehicleRoutingProblem vrp, VehicleRoute route) { StateManager stateManager = new StateManager(vrp); - stateManager.addStateUpdater(new UpdateActivityTimes(vrp.getTransportCosts())); - stateManager.addStateUpdater(new UpdateVehicleDependentPracticalTimeWindows(stateManager, vrp.getTransportCosts())); + stateManager.addStateUpdater(new UpdateActivityTimes(vrp.getTransportCosts(), vrp.getActivityCosts())); + stateManager.addStateUpdater(new UpdateVehicleDependentPracticalTimeWindows(stateManager, vrp.getTransportCosts(), actCosts)); stateManager.addStateUpdater(new UpdateFutureWaitingTimes(stateManager, vrp.getTransportCosts())); stateManager.informInsertionStarts(Arrays.asList(route), new ArrayList()); return stateManager; diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelActivityInsertionCostEstimator.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelActivityInsertionCostEstimator.java index a4d3a8f4..7370ef8c 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelActivityInsertionCostEstimator.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelActivityInsertionCostEstimator.java @@ -73,6 +73,11 @@ public class TestRouteLevelActivityInsertionCostEstimator { return Math.max(0., arrivalTime - tourAct.getTheoreticalLatestOperationStartTime()); } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }; Service s1 = Service.Builder.newInstance("s1").setLocation(Location.newInstance("10,0")).setTimeWindow(TimeWindow.newInstance(10., 10.)).build(); Service s2 = Service.Builder.newInstance("s2").setLocation(Location.newInstance("20,0")).setTimeWindow(TimeWindow.newInstance(20., 20.)).build(); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelServiceInsertionCostEstimator.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelServiceInsertionCostEstimator.java index 0a7d2223..10695b1b 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelServiceInsertionCostEstimator.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/recreate/TestRouteLevelServiceInsertionCostEstimator.java @@ -83,6 +83,11 @@ public class TestRouteLevelServiceInsertionCostEstimator { return Math.max(0., arrivalTime - tourAct.getTheoreticalLatestOperationStartTime()); } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }; vrpBuilder.setActivityCosts(activityCosts); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindowTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindowTest.java index 5bb79a9a..7d602bae 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindowTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdatePracticalTimeWindowTest.java @@ -47,6 +47,8 @@ public class UpdatePracticalTimeWindowTest { private VehicleRoutingTransportCosts routingCosts; + private VehicleRoutingActivityCosts activityCosts; + private ReverseRouteActivityVisitor reverseActivityVisitor; private StateManager stateManager; @@ -57,13 +59,14 @@ public class UpdatePracticalTimeWindowTest { public void doBefore() { routingCosts = CostFactory.createManhattanCosts(); + activityCosts = new WaitingTimeCosts(); VehicleRoutingProblem vrpMock = mock(VehicleRoutingProblem.class); when(vrpMock.getFleetSize()).thenReturn(VehicleRoutingProblem.FleetSize.FINITE); stateManager = new StateManager(vrpMock); reverseActivityVisitor = new ReverseRouteActivityVisitor(); - reverseActivityVisitor.addActivityVisitor(new UpdatePracticalTimeWindows(stateManager, routingCosts)); + reverseActivityVisitor.addActivityVisitor(new UpdatePracticalTimeWindows(stateManager, routingCosts, activityCosts)); Pickup pickup = (Pickup) Pickup.Builder.newInstance("pick").setLocation(Location.newInstance("0,20")).setTimeWindow(TimeWindow.newInstance(0, 30)).build(); Delivery delivery = (Delivery) Delivery.Builder.newInstance("del").setLocation(Location.newInstance("20,20")).setTimeWindow(TimeWindow.newInstance(10, 40)).build(); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentTimeWindowTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentTimeWindowTest.java index c20f2758..223487c4 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentTimeWindowTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/state/UpdateVehicleDependentTimeWindowTest.java @@ -4,7 +4,9 @@ import com.graphhopper.jsprit.core.problem.AbstractActivity; import com.graphhopper.jsprit.core.problem.JobActivityFactory; import com.graphhopper.jsprit.core.problem.Location; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.WaitingTimeCosts; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.job.Service; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; @@ -40,6 +42,8 @@ public class UpdateVehicleDependentTimeWindowTest { private VehicleRoutingTransportCosts routingCosts; + private VehicleRoutingActivityCosts activityCosts; + private VehicleFleetManager fleetManager; private VehicleRoutingProblem vrp; @@ -49,6 +53,7 @@ public class UpdateVehicleDependentTimeWindowTest { VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); routingCosts = CostFactory.createEuclideanCosts(); + activityCosts = new WaitingTimeCosts(); vrpBuilder.setRoutingCost(routingCosts); vehicle = VehicleImpl.Builder.newInstance("v").setStartLocation(Location.newInstance("0,0")).setEarliestStart(0.).setLatestArrival(100.).build(); @@ -85,7 +90,7 @@ public class UpdateVehicleDependentTimeWindowTest { stateManager = new StateManager(vrp); - UpdateVehicleDependentPracticalTimeWindows updater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, routingCosts); + UpdateVehicleDependentPracticalTimeWindows updater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, routingCosts, activityCosts); updater.setVehiclesToUpdate(new UpdateVehicleDependentPracticalTimeWindows.VehiclesToUpdate() { @Override @@ -104,7 +109,7 @@ public class UpdateVehicleDependentTimeWindowTest { @Test public void whenSwitchIsNotAllowed_itShouldCalOnlyStatesOfCurrentVehicle() { stateManager = new StateManager(vrp); - UpdateVehicleDependentPracticalTimeWindows updater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, routingCosts); + UpdateVehicleDependentPracticalTimeWindows updater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, routingCosts, activityCosts); stateManager.addStateUpdater(updater); stateManager.informInsertionStarts(Arrays.asList(route), Collections.emptyList()); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblemTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblemTest.java index 734e8ba7..be8eb6a0 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblemTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblemTest.java @@ -264,6 +264,11 @@ public class VehicleRoutingProblemTest { return 4.0; } + @Override + public double getActivityDuration(TourActivity tourAct, double arrivalTime, Driver driver, Vehicle vehicle) { + return tourAct.getOperationTime(); + } + }); VehicleRoutingProblem problem = builder.build(); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java index 610d61e2..0e8074a9 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java @@ -22,7 +22,9 @@ import com.graphhopper.jsprit.core.algorithm.state.StateManager; import com.graphhopper.jsprit.core.algorithm.state.UpdateActivityTimes; import com.graphhopper.jsprit.core.algorithm.state.UpdateVehicleDependentPracticalTimeWindows; import com.graphhopper.jsprit.core.problem.*; +import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingActivityCosts; import com.graphhopper.jsprit.core.problem.cost.VehicleRoutingTransportCosts; +import com.graphhopper.jsprit.core.problem.cost.WaitingTimeCosts; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.job.Service; import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext; @@ -52,6 +54,8 @@ public class VehicleDependentTimeWindowTest { private VehicleRoutingTransportCosts routingCosts; + private VehicleRoutingActivityCosts activityCosts; + private VehicleImpl v3; private VehicleImpl v4; private VehicleImpl v5; @@ -61,6 +65,9 @@ public class VehicleDependentTimeWindowTest { public void doBefore() { VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); routingCosts = CostFactory.createEuclideanCosts(); + + activityCosts = new WaitingTimeCosts(); + vrpBuilder.setRoutingCost(routingCosts); VehicleType type = VehicleTypeImpl.Builder.newInstance("type").build(); @@ -112,7 +119,7 @@ public class VehicleDependentTimeWindowTest { final VehicleFleetManager fleetManager = new FiniteFleetManagerFactory(vehicles).createFleetManager(); - UpdateVehicleDependentPracticalTimeWindows timeWindow_updater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, routingCosts); + UpdateVehicleDependentPracticalTimeWindows timeWindow_updater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, routingCosts, activityCosts); timeWindow_updater.setVehiclesToUpdate(new UpdateVehicleDependentPracticalTimeWindows.VehiclesToUpdate() { @Override @@ -125,7 +132,7 @@ public class VehicleDependentTimeWindowTest { }); stateManager.addStateUpdater(timeWindow_updater); - stateManager.addStateUpdater(new UpdateActivityTimes(routingCosts)); + stateManager.addStateUpdater(new UpdateActivityTimes(routingCosts, activityCosts)); stateManager.informInsertionStarts(Arrays.asList(route), Collections.emptyList()); } @@ -155,7 +162,7 @@ public class VehicleDependentTimeWindowTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, vehicle, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); assertTrue(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -170,7 +177,7 @@ public class VehicleDependentTimeWindowTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, vehicle, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -185,7 +192,7 @@ public class VehicleDependentTimeWindowTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, vehicle, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); /* driverTime = 10 + 10 + 30 + 20 + 30 = 100 */ @@ -207,7 +214,7 @@ public class VehicleDependentTimeWindowTest { driverTime = 10 + 10 + 31 + 21 + 30 = 102 */ - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(1), serviceAct, route.getActivities().get(2), 20.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -225,7 +232,7 @@ public class VehicleDependentTimeWindowTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v2, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); @@ -244,7 +251,7 @@ public class VehicleDependentTimeWindowTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v3, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -262,7 +269,7 @@ public class VehicleDependentTimeWindowTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v4, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -280,7 +287,7 @@ public class VehicleDependentTimeWindowTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v6, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(1), serviceAct, route.getActivities().get(2), 30.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -298,7 +305,7 @@ public class VehicleDependentTimeWindowTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v6, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(0), serviceAct, route.getActivities().get(1), 10.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -316,7 +323,7 @@ public class VehicleDependentTimeWindowTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v6, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); assertTrue(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -332,7 +339,7 @@ public class VehicleDependentTimeWindowTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v5, route.getDriver(), 60.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 90.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest.java index a918edde..654ecee0 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest.java @@ -52,6 +52,8 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { private VehicleRoutingTransportCosts routingCosts; + private VehicleRoutingActivityCosts activityCosts; + private VehicleImpl v3; private VehicleImpl v4; private VehicleImpl v5; @@ -61,6 +63,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { public void doBefore() { VehicleRoutingProblem.Builder vrpBuilder = VehicleRoutingProblem.Builder.newInstance(); routingCosts = CostFactory.createEuclideanCosts(); + activityCosts = new WaitingTimeCosts(); vrpBuilder.setRoutingCost(routingCosts); VehicleType type = VehicleTypeImpl.Builder.newInstance("type").build(); @@ -112,7 +115,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { final VehicleFleetManager fleetManager = new FiniteFleetManagerFactory(vehicles).createFleetManager(); // stateManager.updateTimeWindowStates(); - UpdateVehicleDependentPracticalTimeWindows timeWindow_updater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, routingCosts); + UpdateVehicleDependentPracticalTimeWindows timeWindow_updater = new UpdateVehicleDependentPracticalTimeWindows(stateManager, routingCosts, activityCosts); timeWindow_updater.setVehiclesToUpdate(new UpdateVehicleDependentPracticalTimeWindows.VehiclesToUpdate() { @Override @@ -125,7 +128,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { }); stateManager.addStateUpdater(timeWindow_updater); - stateManager.addStateUpdater(new UpdateActivityTimes(routingCosts)); + stateManager.addStateUpdater(new UpdateActivityTimes(routingCosts,activityCosts)); stateManager.informInsertionStarts(Arrays.asList(route), Collections.emptyList()); } @@ -155,7 +158,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, vehicle, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); assertTrue(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -170,7 +173,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, vehicle, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -185,7 +188,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, vehicle, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); /* driverTime = 10 + 10 + 30 + 20 + 30 = 100 */ @@ -207,7 +210,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { driverTime = 10 + 10 + 31 + 21 + 30 = 102 */ - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(1), serviceAct, route.getActivities().get(2), 20.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -225,7 +228,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v2, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); @@ -244,7 +247,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v3, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -262,7 +265,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v4, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -280,7 +283,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v6, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(1), serviceAct, route.getActivities().get(2), 30.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -298,7 +301,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v6, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(0), serviceAct, route.getActivities().get(1), 10.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -316,7 +319,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v6, route.getDriver(), 0.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 30.); assertTrue(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); @@ -332,7 +335,7 @@ public class VehicleDependentTimeWindowWithStartTimeAndMaxOperationTimeTest { JobInsertionContext insertionContext = new JobInsertionContext(route, s4, v5, route.getDriver(), 60.); - HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts); + HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts); HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getActivities().get(2), serviceAct, route.getEnd(), 90.); assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED)); diff --git a/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotExample.java index 09edbce6..d0681381 100644 --- a/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleDepotExample.java @@ -105,7 +105,7 @@ public class MultipleDepotExample { SolutionPrinter.print(Solutions.bestOf(solutions)); - new Plotter(vrp, Solutions.bestOf(solutions)).plot("output/p01_solution.png", "p01"); + new Plotter(vrp, Solutions.bestOf(solutions)).setLabel(Plotter.Label.ID).plot("output/p01_solution.png", "p01"); new GraphStreamViewer(vrp, Solutions.bestOf(solutions)).setRenderDelay(100).display();