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

OPTI-515 excluded_tasks_in_vehicle_identifier (#79)

Browse source 
* infiniteWithBreaks

* originalJobActivityFactory

* if contains return

* ctor for us

* jobCanBeServedByDriversCount for infinite vrp

* test fix

* tests

* bound

* run tests

* fix

* excluded_tasks_in_vehicle_identifier
This commit is contained in:
kandelirina 2019-02-12 14:08:46 +02:00 • committed by GitHub
parent b6d7640f5a
commit 3917fe1d3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/InfiniteVehicles.java
View file

@ -86,7 +86,7 @@ class InfiniteVehicles implements VehicleFleetManager {
@Override @Override
public Collection<Vehicle> getAvailableVehicles(Vehicle withoutThisType) { public Collection<Vehicle> getAvailableVehicles(Vehicle withoutThisType) {
Collection<Vehicle> vehicles = new ArrayList<Vehicle>(); Collection<Vehicle> vehicles = new ArrayList<Vehicle>();
VehicleTypeKey thisKey = new VehicleTypeKey(withoutThisType.getType().getTypeId(), withoutThisType.getStartLocation().getId(), withoutThisType.getEndLocation().getId(), withoutThisType.getEarliestDeparture(), withoutThisType.getLatestArrival(), withoutThisType.getSkills(), withoutThisType.isReturnToDepot()); VehicleTypeKey thisKey = new VehicleTypeKey(withoutThisType.getType().getTypeId(), withoutThisType.getStartLocation().getId(), withoutThisType.getEndLocation().getId(), withoutThisType.getEarliestDeparture(), withoutThisType.getLatestArrival(), withoutThisType.getSkills(), withoutThisType.getProhibitedTasks(), withoutThisType.isReturnToDepot());
for (VehicleTypeKey key : types.keySet()) { for (VehicleTypeKey key : types.keySet()) {
if (!key.equals(thisKey)) { if (!key.equals(thisKey)) {
vehicles.add(types.get(key)); vehicles.add(types.get(key));

4
jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java
View file

@ -370,9 +370,9 @@ public class VehicleImpl extends AbstractVehicle {
// setVehicleIdentifier(new VehicleTypeKey(type.getTypeId(),startLocation.getId(),endLocation.getId(),earliestDeparture,latestArrival,skills)); // setVehicleIdentifier(new VehicleTypeKey(type.getTypeId(),startLocation.getId(),endLocation.getId(),earliestDeparture,latestArrival,skills));
if (builder.aBreak != null) { if (builder.aBreak != null) {
setVehicleIdentifier(new VehicleTypeKey(type.getTypeId(), startLocation.getId(), endLocation.getId(), earliestDeparture, latestArrival, skills, returnToDepot, getUserData(), aBreak.getTimeWindow().getStart(), aBreak.getTimeWindow().getEnd(), aBreak.getServiceDuration())); setVehicleIdentifier(new VehicleTypeKey(type.getTypeId(), startLocation.getId(), endLocation.getId(), earliestDeparture, latestArrival, skills, prohibitedTasks, returnToDepot, getUserData(), aBreak.getTimeWindow().getStart(), aBreak.getTimeWindow().getEnd(), aBreak.getServiceDuration()));
} else { } else {
setVehicleIdentifier(new VehicleTypeKey(type.getTypeId(), startLocation.getId(), endLocation.getId(), earliestDeparture, latestArrival, skills, returnToDepot, getUserData())); setVehicleIdentifier(new VehicleTypeKey(type.getTypeId(), startLocation.getId(), endLocation.getId(), earliestDeparture, latestArrival, skills, prohibitedTasks, returnToDepot, getUserData()));
} }
} }

24
jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeKey.java
View file

@ -20,7 +20,11 @@ package com.graphhopper.jsprit.core.problem.vehicle;
import com.graphhopper.jsprit.core.problem.AbstractVehicle; import com.graphhopper.jsprit.core.problem.AbstractVehicle;
import com.graphhopper.jsprit.core.problem.Skills; import com.graphhopper.jsprit.core.problem.Skills;
import java.util.Collection;
import java.util.HashSet;
import java.util.Objects; import java.util.Objects;
import java.util.Set;
/** /**
* Key to identify similar vehicles * Key to identify similar vehicles
@ -42,8 +46,9 @@ public class VehicleTypeKey extends AbstractVehicle.AbstractTypeKey {
public final double earliestBreakStart; public final double earliestBreakStart;
public final double latestBreakStart; public final double latestBreakStart;
public final double breakDuration; public final double breakDuration;
private Set<String> prohibitedTasks = new HashSet<>();
public VehicleTypeKey(String typeId, String startLocationId, String endLocationId, double earliestStart, double latestEnd, Skills skills, boolean returnToDepot, Object userData, double earliestBreakStart, double latestBreakStart, double breakDuration) { public VehicleTypeKey(String typeId, String startLocationId, String endLocationId, double earliestStart, double latestEnd, Skills skills, Collection<String> prohibitedTasks, boolean returnToDepot, Object userData, double earliestBreakStart, double latestBreakStart, double breakDuration) {
this.type = typeId; this.type = typeId;
this.startLocationId = startLocationId; this.startLocationId = startLocationId;
this.endLocationId = endLocationId; this.endLocationId = endLocationId;
@ -55,14 +60,15 @@ public class VehicleTypeKey extends AbstractVehicle.AbstractTypeKey {
this.earliestBreakStart = earliestBreakStart; this.earliestBreakStart = earliestBreakStart;
this.latestBreakStart = latestBreakStart; this.latestBreakStart = latestBreakStart;
this.breakDuration = breakDuration; this.breakDuration = breakDuration;
this.prohibitedTasks.addAll(prohibitedTasks);
} }
public VehicleTypeKey(String typeId, String startLocationId, String endLocationId, double earliestStart, double latestEnd, Skills skills, boolean returnToDepot, Object userData) { public VehicleTypeKey(String typeId, String startLocationId, String endLocationId, double earliestStart, double latestEnd, Skills skills, Collection<String> prohibitedTasks, boolean returnToDepot, Object userData) {
this(typeId, startLocationId, endLocationId, earliestStart, latestEnd, skills, returnToDepot, userData, 0, Double.MAX_VALUE, 0); this(typeId, startLocationId, endLocationId, earliestStart, latestEnd, skills, prohibitedTasks, returnToDepot, userData, 0, Double.MAX_VALUE, 0);
} }
public VehicleTypeKey(String typeId, String startLocationId, String endLocationId, double earliestStart, double latestEnd, Skills skills, boolean returnToDepot) { public VehicleTypeKey(String typeId, String startLocationId, String endLocationId, double earliestStart, double latestEnd, Skills skills, Collection<String> prohibitedTasks, boolean returnToDepot) {
this(typeId, startLocationId, endLocationId, earliestStart, latestEnd, skills, returnToDepot, null); this(typeId, startLocationId, endLocationId, earliestStart, latestEnd, skills, prohibitedTasks, returnToDepot, null);
} }
@Override @Override
@ -83,6 +89,7 @@ public class VehicleTypeKey extends AbstractVehicle.AbstractTypeKey {
if (Double.compare(that.breakDuration, breakDuration) != 0) return false; if (Double.compare(that.breakDuration, breakDuration) != 0) return false;
if (Double.compare(that.earliestBreakStart, earliestBreakStart) != 0) return false; if (Double.compare(that.earliestBreakStart, earliestBreakStart) != 0) return false;
if (Double.compare(that.latestBreakStart, latestBreakStart) != 0) return false; if (Double.compare(that.latestBreakStart, latestBreakStart) != 0) return false;
if (prohibitedTasks.size() != that.prohibitedTasks.size() || !prohibitedTasks.containsAll(that.prohibitedTasks)) return false;
return true; return true;
} }
@ -109,6 +116,7 @@ public class VehicleTypeKey extends AbstractVehicle.AbstractTypeKey {
result = 31 * result + (int) (temp ^ (temp >>> 32)); result = 31 * result + (int) (temp ^ (temp >>> 32));
temp = Double.doubleToLongBits(latestBreakStart); temp = Double.doubleToLongBits(latestBreakStart);
result = 31 * result + (int) (temp ^ (temp >>> 32)); result = 31 * result + (int) (temp ^ (temp >>> 32));
result = 31 * result + prohibitedTasks.hashCode();
return result; return result;
} }
@ -119,7 +127,11 @@ public class VehicleTypeKey extends AbstractVehicle.AbstractTypeKey {
stringBuilder.append(type).append("_").append(startLocationId).append("_").append(endLocationId) stringBuilder.append(type).append("_").append(startLocationId).append("_").append(endLocationId)
.append("_").append(Double.toString(earliestStart)).append("_").append(Double.toString(latestEnd)); .append("_").append(Double.toString(earliestStart)).append("_").append(Double.toString(latestEnd));
if (userData != null) if (userData != null)
stringBuilder.append("_").append(userData.toString()); stringBuilder.append("_").append(userData.toString()).append("_");
for (String t : prohibitedTasks)
stringBuilder.append(t).append("_");
return stringBuilder.toString(); return stringBuilder.toString();
} }

30
jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleTypeKeyTest.java
View file

@ -22,6 +22,8 @@ package com.graphhopper.jsprit.core.problem.vehicle;
import com.graphhopper.jsprit.core.problem.Location; import com.graphhopper.jsprit.core.problem.Location;
import org.junit.Test; import org.junit.Test;
import java.util.UUID;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -62,4 +64,32 @@ public class VehicleTypeKeyTest {
.setUserData(new String("it's just stupid test")).build(); .setUserData(new String("it's just stupid test")).build();
assertFalse(v1.getVehicleTypeIdentifier().equals(v2.getVehicleTypeIdentifier())); assertFalse(v1.getVehicleTypeIdentifier().equals(v2.getVehicleTypeIdentifier()));
} }
@Test
public void typeIdentifierShouldNotBeEqualWithExcludedTasks() {
String taskId1 = UUID.randomUUID().toString(), taskId2 = UUID.randomUUID().toString(), taskId3 = UUID.randomUUID().toString();
Vehicle v1 = VehicleImpl.Builder.newInstance("v1").setStartLocation(Location.newInstance("start"))
.addExcludedTask(taskId1).addExcludedTask(taskId2).addExcludedTask(taskId3)
.setUserData(new String("it's just a test")).build();
Vehicle v2 = VehicleImpl.Builder.newInstance("v2").setStartLocation(Location.newInstance("start"))
.addExcludedTask(taskId1).addExcludedTask(taskId2)
.setUserData(new String("it's just stupid test")).build();
assertFalse(v1.getVehicleTypeIdentifier().equals(v2.getVehicleTypeIdentifier()));
}
@Test
public void typeIdentifierShouldBeEqualWithExcludedTasks() {
String taskId1 = UUID.randomUUID().toString(), taskId2 = UUID.randomUUID().toString(), taskId3 = UUID.randomUUID().toString();
Vehicle v1 = VehicleImpl.Builder.newInstance("v1").setStartLocation(Location.newInstance("start"))
.addExcludedTask(taskId1).addExcludedTask(taskId2).addExcludedTask(taskId3)
.build();
Vehicle v2 = VehicleImpl.Builder.newInstance("v2").setStartLocation(Location.newInstance("start"))
.addExcludedTask(taskId2).addExcludedTask(taskId3).addExcludedTask(taskId1).addExcludedTask(taskId3)
.build();
assertTrue(v1.getVehicleTypeIdentifier().equals(v2.getVehicleTypeIdentifier()));
}
} }