mirror of
https://github.com/graphhopper/jsprit.git
synced 2020-01-24 07:45:05 +01:00
internal experiments with insertionCalc
This commit is contained in:
parent
ad24158651
commit
3bf9c288ca
8 changed files with 41 additions and 20 deletions
14
jsprit-core/src/main/java/algorithms/CalcUtils.java
Normal file
14
jsprit-core/src/main/java/algorithms/CalcUtils.java
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
package algorithms;
|
||||
|
||||
import basics.route.TourActivity;
|
||||
|
||||
class CalcUtils {
|
||||
|
||||
static double getStartTimeAtAct(double startTimeAtPrevAct, double tpTime_prevAct_nextAct, TourActivity nextAct){
|
||||
return Math.max(startTimeAtPrevAct + tpTime_prevAct_nextAct, nextAct.getTheoreticalEarliestOperationStartTime()) + nextAct.getOperationTime();
|
||||
}
|
||||
|
||||
static double getStartTimeAtAct(double nextActArrTime, TourActivity nextAct){
|
||||
return Math.max(nextActArrTime, nextAct.getTheoreticalEarliestOperationStartTime()) + nextAct.getOperationTime();
|
||||
}
|
||||
}
|
||||
|
|
@ -18,6 +18,7 @@ import util.Neighborhood;
|
|||
import algorithms.HardConstraints.HardRouteLevelConstraint;
|
||||
import basics.Job;
|
||||
import basics.Service;
|
||||
import basics.costs.VehicleRoutingTransportCosts;
|
||||
import basics.route.Driver;
|
||||
import basics.route.End;
|
||||
import basics.route.ServiceActivity;
|
||||
|
|
@ -45,15 +46,18 @@ final class CalculatesServiceInsertion implements JobInsertionCalculator{
|
|||
|
||||
private MarginalsCalculus marginalCalculus;
|
||||
|
||||
private VehicleRoutingTransportCosts transportCosts;
|
||||
|
||||
public void setNeighborhood(Neighborhood neighborhood) {
|
||||
this.neighborhood = neighborhood;
|
||||
logger.info("initialise neighborhood " + neighborhood);
|
||||
}
|
||||
|
||||
public CalculatesServiceInsertion(MarginalsCalculus marginalsCalculus, HardRouteLevelConstraint hardRouteLevelConstraint) {
|
||||
public CalculatesServiceInsertion(VehicleRoutingTransportCosts routingCosts, MarginalsCalculus marginalsCalculus, HardRouteLevelConstraint hardRouteLevelConstraint) {
|
||||
super();
|
||||
this.marginalCalculus = marginalsCalculus;
|
||||
this.hardRouteLevelConstraint = hardRouteLevelConstraint;
|
||||
this.transportCosts = routingCosts;
|
||||
logger.info("initialise " + this);
|
||||
}
|
||||
|
||||
|
|
@ -89,6 +93,7 @@ final class CalculatesServiceInsertion implements JobInsertionCalculator{
|
|||
End end = End.newInstance(newVehicle.getLocationId(), 0.0, newVehicle.getLatestArrival());
|
||||
|
||||
TourActivity prevAct = start;
|
||||
double prevActStartTime = newVehicleDepartureTime;
|
||||
int actIndex = 0;
|
||||
|
||||
for(TourActivity nextAct : currentRoute.getTourActivities().getActivities()){
|
||||
|
|
@ -96,7 +101,7 @@ final class CalculatesServiceInsertion implements JobInsertionCalculator{
|
|||
break;
|
||||
}
|
||||
if(neighborhood.areNeighbors(deliveryAct2Insert.getLocationId(), prevAct.getLocationId()) && neighborhood.areNeighbors(deliveryAct2Insert.getLocationId(), nextAct.getLocationId())){
|
||||
Marginals mc = calculate(iFacts, prevAct, nextAct, deliveryAct2Insert);
|
||||
Marginals mc = calculate(iFacts, prevAct, nextAct, deliveryAct2Insert, prevActStartTime);
|
||||
if(mc != null){
|
||||
if(mc.getAdditionalCosts() < bestCost){
|
||||
bestCost = mc.getAdditionalCosts();
|
||||
|
|
@ -106,11 +111,12 @@ final class CalculatesServiceInsertion implements JobInsertionCalculator{
|
|||
}
|
||||
}
|
||||
prevAct = nextAct;
|
||||
prevActStartTime = CalcUtils.getStartTimeAtAct(prevActStartTime, transportCosts.getTransportTime(prevAct.getLocationId(), nextAct.getLocationId(), prevActStartTime, newDriver, newVehicle), nextAct);
|
||||
actIndex++;
|
||||
}
|
||||
End nextAct = end;
|
||||
if(neighborhood.areNeighbors(deliveryAct2Insert.getLocationId(), prevAct.getLocationId()) && neighborhood.areNeighbors(deliveryAct2Insert.getLocationId(), nextAct.getLocationId())){
|
||||
Marginals mc = calculate(iFacts, prevAct, nextAct, deliveryAct2Insert);
|
||||
Marginals mc = calculate(iFacts, prevAct, nextAct, deliveryAct2Insert, prevActStartTime);
|
||||
if(mc != null) {
|
||||
if(mc.getAdditionalCosts() < bestCost){
|
||||
bestCost = mc.getAdditionalCosts();
|
||||
|
|
@ -129,8 +135,8 @@ final class CalculatesServiceInsertion implements JobInsertionCalculator{
|
|||
return insertionData;
|
||||
}
|
||||
|
||||
public Marginals calculate(InsertionFacts iFacts, TourActivity prevAct, TourActivity nextAct, TourActivity newAct) {
|
||||
return marginalCalculus.calculate(iFacts, prevAct, nextAct, newAct);
|
||||
public Marginals calculate(InsertionFacts iFacts, TourActivity prevAct, TourActivity nextAct, TourActivity newAct, double departureTimeAtPrevAct) {
|
||||
return marginalCalculus.calculate(iFacts, prevAct, nextAct, newAct, departureTimeAtPrevAct);
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -215,7 +215,7 @@ class CalculatorBuilder {
|
|||
|
||||
private CalculatorPlusListeners createStandardLocal(VehicleRoutingProblem vrp, StateManager activityStates2){
|
||||
MarginalsCalculus defaultCalc = new MarginalsCalculusTriangleInequality(vrp.getTransportCosts(), vrp.getActivityCosts(), new HardConstraints.HardTimeWindowConstraint(activityStates2) );
|
||||
JobInsertionCalculator standardServiceInsertion = new CalculatesServiceInsertion(defaultCalc, new HardConstraints.HardLoadConstraint(activityStates2));
|
||||
JobInsertionCalculator standardServiceInsertion = new CalculatesServiceInsertion(vrp.getTransportCosts(), defaultCalc, new HardConstraints.HardLoadConstraint(activityStates2));
|
||||
|
||||
((CalculatesServiceInsertion) standardServiceInsertion).setNeighborhood(vrp.getNeighborhood());
|
||||
CalculatorPlusListeners calcPlusListeners = new CalculatorPlusListeners(standardServiceInsertion);
|
||||
|
|
|
|||
|
|
@ -4,6 +4,6 @@ import basics.route.TourActivity;
|
|||
|
||||
interface MarginalsCalculus {
|
||||
|
||||
Marginals calculate(InsertionFacts iFacts, TourActivity prevAct, TourActivity nextAct, TourActivity newAct);
|
||||
Marginals calculate(InsertionFacts iFacts, TourActivity prevAct, TourActivity nextAct, TourActivity newAct, double depTimeAtPrevAct);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,19 +20,17 @@ class MarginalsCalculusTriangleInequality implements MarginalsCalculus{
|
|||
}
|
||||
|
||||
@Override
|
||||
public Marginals calculate(InsertionFacts iFacts, TourActivity prevAct, TourActivity nextAct, TourActivity newAct) {
|
||||
double tp_costs_prevAct_newAct = routingCosts.getTransportCost(prevAct.getLocationId(), newAct.getLocationId(), prevAct.getEndTime(), iFacts.getNewDriver(), iFacts.getNewVehicle());
|
||||
double tp_time_prevAct_newAct = routingCosts.getTransportTime(prevAct.getLocationId(), newAct.getLocationId(), prevAct.getEndTime(), iFacts.getNewDriver(), iFacts.getNewVehicle());
|
||||
public Marginals calculate(InsertionFacts iFacts, TourActivity prevAct, TourActivity nextAct, TourActivity newAct, double depTimeAtPrevAct) {
|
||||
double tp_costs_prevAct_newAct = routingCosts.getTransportCost(prevAct.getLocationId(), newAct.getLocationId(), depTimeAtPrevAct, iFacts.getNewDriver(), iFacts.getNewVehicle());
|
||||
double tp_time_prevAct_newAct = routingCosts.getTransportTime(prevAct.getLocationId(), newAct.getLocationId(), depTimeAtPrevAct, iFacts.getNewDriver(), iFacts.getNewVehicle());
|
||||
|
||||
double newAct_arrTime = prevAct.getEndTime() + tp_time_prevAct_newAct;
|
||||
double newAct_arrTime = depTimeAtPrevAct + tp_time_prevAct_newAct;
|
||||
|
||||
if(!hardConstraint.fulfilled(iFacts, newAct, newAct_arrTime)){
|
||||
return null;
|
||||
}
|
||||
|
||||
double newAct_operationStartTime = Math.max(newAct_arrTime, newAct.getTheoreticalEarliestOperationStartTime());
|
||||
|
||||
double newAct_endTime = newAct_operationStartTime + newAct.getOperationTime();
|
||||
double newAct_endTime = CalcUtils.getStartTimeAtAct(newAct_arrTime, newAct);
|
||||
|
||||
double act_costs_newAct = activityCosts.getActivityCost(newAct, newAct_arrTime, iFacts.getNewDriver(), iFacts.getNewVehicle());
|
||||
|
||||
|
|
@ -50,8 +48,10 @@ class MarginalsCalculusTriangleInequality implements MarginalsCalculus{
|
|||
double totalCosts = tp_costs_prevAct_newAct + tp_costs_newAct_nextAct + act_costs_newAct + act_costs_nextAct;
|
||||
|
||||
double oldCosts;
|
||||
double oldTime;
|
||||
if(iFacts.getRoute().isEmpty()){
|
||||
oldCosts = 0.0;
|
||||
oldTime = 0.0;
|
||||
}
|
||||
else{
|
||||
double tp_costs_prevAct_nextAct = routingCosts.getTransportCost(prevAct.getLocationId(), nextAct.getLocationId(), prevAct.getEndTime(), iFacts.getRoute().getDriver(), iFacts.getRoute().getVehicle());
|
||||
|
|
@ -59,10 +59,11 @@ class MarginalsCalculusTriangleInequality implements MarginalsCalculus{
|
|||
|
||||
double actCost_nextAct = activityCosts.getActivityCost(nextAct, arrTime_nextAct, iFacts.getRoute().getDriver(), iFacts.getRoute().getVehicle());
|
||||
oldCosts = tp_costs_prevAct_nextAct + actCost_nextAct;
|
||||
oldTime = (nextAct.getArrTime() - iFacts.getRoute().getDepartureTime());
|
||||
}
|
||||
|
||||
double additionalCosts = totalCosts - oldCosts;
|
||||
double additionalTime = nextAct_arrTime - nextAct.getArrTime();
|
||||
double additionalTime = (nextAct_arrTime - iFacts.getNewDepTime()) - oldTime;
|
||||
|
||||
return new Marginals(additionalCosts,additionalTime);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue