trans/graphhopper-jsprit
1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
Code Issues Releases Wiki Activity

mtw

Browse source
This commit is contained in:
oblonski 2015-12-13 19:55:32 +01:00
parent 02c3c96e9c
commit 1075e38504
9 changed files with 177 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

38
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionCalculator.java
View file

@ -133,27 +133,27 @@ final class ServiceInsertionCalculator implements JobInsertionCostsCalculator {
}
double actArrTime = prevActStartTime + transportCosts.getTransportTime(prevAct.getLocation(),deliveryAct2Insert.getLocation(),prevActStartTime,newDriver,newVehicle);
Collection<TimeWindow> timeWindows = service.getTimeWindows(actArrTime);
TimeWindow timeWindow = getNextTimeWindow(actArrTime,timeWindows);
if(timeWindow == null) break;
// TimeWindow timeWindow = getNextTimeWindow(actArrTime,timeWindows);
// if(timeWindow == null) break;
boolean not_fulfilled_break = true;
// for(TimeWindow timeWindow : timeWindows) {
deliveryAct2Insert.setTheoreticalEarliestOperationStartTime(timeWindow.getStart());
deliveryAct2Insert.setTheoreticalLatestOperationStartTime(timeWindow.getEnd());
ConstraintsStatus status = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct, deliveryAct2Insert, nextAct, prevActStartTime);
if (status.equals(ConstraintsStatus.FULFILLED)) {
//from job2insert induced costs at activity level
double additionalICostsAtActLevel = softActivityConstraint.getCosts(insertionContext, prevAct, deliveryAct2Insert, nextAct, prevActStartTime);
double additionalTransportationCosts = additionalTransportCostsCalculator.getCosts(insertionContext, prevAct, nextAct, deliveryAct2Insert, prevActStartTime);
if (additionalICostsAtRouteLevel + additionalICostsAtActLevel + additionalTransportationCosts < bestCost) {
bestCost = additionalICostsAtRouteLevel + additionalICostsAtActLevel + additionalTransportationCosts;
insertionIndex = actIndex;
bestTimeWindow = timeWindow;
for(TimeWindow timeWindow : timeWindows) {
deliveryAct2Insert.setTheoreticalEarliestOperationStartTime(timeWindow.getStart());
deliveryAct2Insert.setTheoreticalLatestOperationStartTime(timeWindow.getEnd());
ConstraintsStatus status = hardActivityLevelConstraint.fulfilled(insertionContext, prevAct, deliveryAct2Insert, nextAct, prevActStartTime);
if (status.equals(ConstraintsStatus.FULFILLED)) {
//from job2insert induced costs at activity level
double additionalICostsAtActLevel = softActivityConstraint.getCosts(insertionContext, prevAct, deliveryAct2Insert, nextAct, prevActStartTime);
double additionalTransportationCosts = additionalTransportCostsCalculator.getCosts(insertionContext, prevAct, nextAct, deliveryAct2Insert, prevActStartTime);
if (additionalICostsAtRouteLevel + additionalICostsAtActLevel + additionalTransportationCosts < bestCost) {
bestCost = additionalICostsAtRouteLevel + additionalICostsAtActLevel + additionalTransportationCosts;
insertionIndex = actIndex;
bestTimeWindow = timeWindow;
}
not_fulfilled_break = false;
} else if (status.equals(ConstraintsStatus.NOT_FULFILLED)) {
not_fulfilled_break = false;
}
not_fulfilled_break = false;
} else if (status.equals(ConstraintsStatus.NOT_FULFILLED)) {
not_fulfilled_break = false;
}
// }
}
if(not_fulfilled_break) break;
double nextActArrTime = prevActStartTime + transportCosts.getTransportTime(prevAct.getLocation(), nextAct.getLocation(), prevActStartTime, newDriver, newVehicle);
prevActStartTime = CalculationUtils.getActivityEndTime(nextActArrTime, nextAct);

4
jsprit-core/src/main/java/jsprit/core/algorithm/ruin/NearestNeighborhoodIterator.java
View file

@ -29,8 +29,8 @@ class NearestNeighborhoodIterator implements Iterator<Job> {
public boolean hasNext() {
if (jobCount < nJobs) {
boolean hasNext = jobIter.hasNext();
if (!hasNext)
log.warn("more jobs are requested then iterator can iterate over. probably the number of neighbors memorized in JobNeighborhoods is too small");
// if (!hasNext)
// log.warn("more jobs are requested then iterator can iterate over. probably the number of neighbors memorized in JobNeighborhoods is too small");
return hasNext;
}
return false;

28
jsprit-core/src/main/java/jsprit/core/algorithm/state/ActivityStartsAsSoonAsNextTimeWindowOpens.java
View file

@ -1,6 +1,5 @@
package jsprit.core.algorithm.state;
import jsprit.core.problem.solution.route.activity.TimeWindow;
import jsprit.core.problem.solution.route.activity.TourActivity;
/**
@ -10,19 +9,20 @@ public class ActivityStartsAsSoonAsNextTimeWindowOpens implements ActivityStartS
@Override
public double getActivityStartTime(TourActivity activity, double arrivalTime) {
TimeWindow last = null;
for(int i=activity.getTimeWindows().size()-1; i >= 0; i--){
TimeWindow tw = activity.getTimeWindows().get(i);
if(tw.getStart() <= arrivalTime && tw.getEnd() >= arrivalTime){
return arrivalTime;
}
else if(arrivalTime > tw.getEnd()){
if(last != null) return last.getStart();
else return arrivalTime;
}
last = tw;
}
return Math.max(arrivalTime,last.getStart());
return Math.max(arrivalTime,activity.getTheoreticalEarliestOperationStartTime());
// TimeWindow last = null;
// for(int i=activity.getTimeWindows().size()-1; i >= 0; i--){
// TimeWindow tw = activity.getTimeWindows().get(i);
// if(tw.getStart() <= arrivalTime && tw.getEnd() >= arrivalTime){
// return arrivalTime;
// }
// else if(arrivalTime > tw.getEnd()){
// if(last != null) return last.getStart();
// else return arrivalTime;
// }
// last = tw;
// }
// return Math.max(arrivalTime,last.getStart());
}
}

4
jsprit-core/src/main/java/jsprit/core/algorithm/state/UpdateActivityTimes.java
View file

@ -66,6 +66,10 @@ public class UpdateActivityTimes implements ActivityVisitor, StateUpdater {
timeTracker.visit(activity);
activity.setArrTime(timeTracker.getActArrTime());
activity.setEndTime(timeTracker.getActEndTime());
double theoreticalLatestOperationStartTime = activity.getTheoreticalLatestOperationStartTime();
if(activity.getArrTime() > theoreticalLatestOperationStartTime){
throw new IllegalStateException("arrTime > latestArrTime");
}
}
@Override

16
jsprit-core/src/main/java/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java
View file

@ -55,7 +55,7 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr
double latestVehicleArrival = iFacts.getNewVehicle().getLatestArrival();
Double latestArrTimeAtNextAct;
Location nextActLocation;
double nextAct_theoreticalLatestOperationStartTime = getLatestOperationStartTime(nextAct);
// double nextAct_theoreticalLatestOperationStartTime = getLatestOperationStartTime(nextAct);
if (nextAct instanceof End) {
latestArrTimeAtNextAct = latestVehicleArrival;
@ -84,14 +84,14 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr
* |--- vehicle's operation time ---|
* |--- prevAct or newAct or nextAct ---|
*/
double prevAct_theoreticalEarliestOperationStartTime = getEarliestOperationStartTime(prevAct);
double newAct_theoreticalEarliestOperationStartTime = getEarliestOperationStartTime(newAct);
// double prevAct_theoreticalEarliestOperationStartTime = getEarliestOperationStartTime(prevAct);
double newAct_theoreticalEarliestOperationStartTime = newAct.getTheoreticalEarliestOperationStartTime();
// newAct.getTheoreticalEarliestOperationStartTime();
double nextAct_theoreticalEarliestOperationStartTime = getEarliestOperationStartTime(nextAct);
// double nextAct_theoreticalEarliestOperationStartTime = getEarliestOperationStartTime(nextAct);
// nextAct.getTheoreticalEarliestOperationStartTime();
if (latestVehicleArrival < prevAct.getTheoreticalEarliestOperationStartTime() ||
latestVehicleArrival < newAct.getTheoreticalEarliestOperationStartTime() ||
latestVehicleArrival < newAct_theoreticalEarliestOperationStartTime ||
latestVehicleArrival < nextAct.getTheoreticalEarliestOperationStartTime()) {
return ConstraintsStatus.NOT_FULFILLED_BREAK;
}
@ -102,9 +102,9 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr
* |--- prevAct ---|
* |--- newAct ---|
*/
double newAct_theoreticalLatestOperationStartTime = getLatestOperationStartTime(newAct);
double newAct_theoreticalLatestOperationStartTime = newAct.getTheoreticalLatestOperationStartTime();
if (newAct.getTheoreticalLatestOperationStartTime() < prevAct.getTheoreticalEarliestOperationStartTime()) {
if (newAct_theoreticalLatestOperationStartTime < prevAct.getTheoreticalEarliestOperationStartTime()) {
return ConstraintsStatus.NOT_FULFILLED_BREAK;
}
@ -122,7 +122,7 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr
* |--- newAct ---|
* |--- nextAct ---|
*/
if(newAct_theoreticalEarliestOperationStartTime > nextAct_theoreticalLatestOperationStartTime){
if(newAct_theoreticalEarliestOperationStartTime > nextAct.getTheoreticalLatestOperationStartTime()){
return ConstraintsStatus.NOT_FULFILLED;
}
// log.info("check insertion of " + newAct + " between " + prevAct + " and " + nextAct + ". prevActDepTime=" + prevActDepTime);

2
jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/DeliverService.java
View file

@ -54,6 +54,8 @@ public final class DeliverService extends AbstractActivity implements DeliveryAc
capacity = deliveryActivity.getSize();
setIndex(deliveryActivity.getIndex());
timeWindows = new ArrayList<TimeWindow>(delivery.getTimeWindows(0.));
this.theoreticalEarliest = deliveryActivity.getTheoreticalEarliestOperationStartTime();
this.theoreticalLatest = deliveryActivity.getTheoreticalLatestOperationStartTime();
}
@Override

2
jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/PickupService.java
View file

@ -57,6 +57,8 @@ public final class PickupService extends AbstractActivity implements PickupActiv
this.depTime = pickupActivity.getEndTime();
setIndex(pickupActivity.getIndex());
timeWindows = new ArrayList<TimeWindow>(pickup.getTimeWindows(0.));
this.theoreticalEarliest = pickupActivity.getTheoreticalEarliestOperationStartTime();
this.theoreticalLatest = pickupActivity.getTheoreticalLatestOperationStartTime();
}
@Override

2
jsprit-core/src/main/java/jsprit/core/problem/solution/route/activity/ServiceActivity.java
View file

@ -92,6 +92,8 @@ public class ServiceActivity extends AbstractActivity implements JobActivity {
this.endTime = serviceActivity.getEndTime();
setIndex(serviceActivity.getIndex());
timeWindows = new ArrayList<TimeWindow>(serviceActivity.getTimeWindows());
this.theoreticalEarliest = serviceActivity.getTheoreticalEarliestOperationStartTime();
this.theoreticalLatest = serviceActivity.getTheoreticalLatestOperationStartTime();
}