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

tw constraint fix (#60)

Browse source
This commit is contained in:
kandelirina 2018-08-16 16:37:11 +03:00 • committed by GitHub
parent 779be01a1f
commit 0124986886
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowConstraints.java
View file

@ -132,6 +132,9 @@ public class VehicleDependentTimeWindowConstraints implements HardActivityConstr
}
if (nextAct instanceof End) {
if (endTimeAtNewAct > latestArrTimeAtNextAct) {
return ConstraintsStatus.NOT_FULFILLED;
}
if (!iFacts.getNewVehicle().isReturnToDepot()) {
return ConstraintsStatus.FULFILLED;
}

49
jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/constraint/VehicleDependentTimeWindowTest.java
View file

@ -31,6 +31,8 @@ import com.graphhopper.jsprit.core.problem.job.Service;
import com.graphhopper.jsprit.core.problem.misc.JobInsertionContext;
import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute;
import com.graphhopper.jsprit.core.problem.solution.route.activity.PickupService;
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.*;
import com.graphhopper.jsprit.core.util.CostFactory;
import org.junit.Before;
@ -39,6 +41,8 @@ import org.junit.Test;
import java.util.*;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
* unit tests to test vehicle dependent time-windows
@ -340,5 +344,50 @@ public class VehicleDependentTimeWindowTest {
}
@Test
public void driverStartInHisTW() {
Vehicle v = mock(Vehicle.class);
when(v.getStartLocation()).thenReturn(Location.newInstance("0, 1"));
when(v.isReturnToDepot()).thenReturn(false);
when(v.getEarliestDeparture()).thenReturn(0.0);
when(v.getLatestArrival()).thenReturn(60.0);
Service s = Service.Builder.newInstance("service").setLocation(Location.newInstance("1, 0")).addTimeWindow(new TimeWindow(15, 115)).setServiceTime(50).build();
final TourActivity service = mock(TourActivity.class);
when(service.getTheoreticalEarliestOperationStartTime()).thenReturn(15.0);
when(service.getTheoreticalLatestOperationStartTime()).thenReturn(115.0);
when(service.getLocation()).thenReturn(Location.newInstance("1, 0"));
when(service.getOperationTime()).thenReturn(50.0);
route = VehicleRoute.Builder.newInstance(vehicle).addService(s).build();
JobInsertionContext insertionContext = new JobInsertionContext(route, s, v, route.getDriver(), 60.);
HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts);
HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getStart(), service, route.getEnd(), 0);
assertFalse(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED));
}
@Test
public void driverStartInHisTW2() {
Vehicle v = mock(Vehicle.class);
when(v.getStartLocation()).thenReturn(Location.newInstance(0, 1));
when(v.isReturnToDepot()).thenReturn(false);
when(v.getEarliestDeparture()).thenReturn(0.0);
when(v.getLatestArrival()).thenReturn(60.0);
Service s = Service.Builder.newInstance("service").setLocation(Location.newInstance("1, 0")).addTimeWindow(new TimeWindow(15, 115)).setServiceTime(50).build();
final TourActivity service = mock(TourActivity.class);
when(service.getTheoreticalEarliestOperationStartTime()).thenReturn(15.0);
when(service.getTheoreticalLatestOperationStartTime()).thenReturn(115.0);
when(service.getLocation()).thenReturn(Location.newInstance("1, 0"));
when(service.getOperationTime()).thenReturn(15.0);
route = VehicleRoute.Builder.newInstance(vehicle).addService(s).build();
JobInsertionContext insertionContext = new JobInsertionContext(route, s, v, route.getDriver(), 15.);
HardActivityConstraint twConstraint = new VehicleDependentTimeWindowConstraints(stateManager, routingCosts, activityCosts);
HardActivityConstraint.ConstraintsStatus status = twConstraint.fulfilled(insertionContext, route.getStart(), service, route.getEnd(), 0);
assertTrue(status.equals(HardActivityConstraint.ConstraintsStatus.FULFILLED));
}
}