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

added skills

Browse source
This commit is contained in:
oblonski 2014-07-03 10:38:08 +02:00
parent b3cc891cc5
commit 501453490d
4 changed files with 149 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jsprit-core/src/main/java/jsprit/core/problem/constraint/ConstraintManager.java
View file

@ -118,7 +118,7 @@ public class ConstraintManager implements HardActivityStateLevelConstraint, Hard
public void addSkillsConstraint() {
if (!skillconstraintSet){
addConstraint(new SkillConstraint(stateManager));
addConstraint(new HardSkillConstraint(stateManager));
skillconstraintSet=true;
}
}

8
jsprit-core/src/main/java/jsprit/core/problem/constraint/SkillConstraint.java → jsprit-core/src/main/java/jsprit/core/problem/constraint/HardSkillConstraint.java
View file

@ -9,24 +9,24 @@ import jsprit.core.problem.solution.route.state.StateFactory;
* SkillConstraint that ensures that only vehicles with according skills can serve route and job to be inserted.
*
*/
public class SkillConstraint implements HardRouteStateLevelConstraint{
public class HardSkillConstraint implements HardRouteStateLevelConstraint{
private RouteAndActivityStateGetter states;
public SkillConstraint(RouteAndActivityStateGetter states) {
public HardSkillConstraint(RouteAndActivityStateGetter states) {
this.states = states;
}
@Override
public boolean fulfilled(JobInsertionContext insertionContext) {
for(String skill : insertionContext.getJob().getRequiredSkills().values()){
if(!insertionContext.getRoute().getVehicle().getSkills().containsSkill(skill)){
if(!insertionContext.getNewVehicle().getSkills().containsSkill(skill)){
return false;
}
}
Skills requiredSkillsForRoute = states.getRouteState(insertionContext.getRoute(), StateFactory.SKILLS, Skills.class);
for(String skill : requiredSkillsForRoute.values()){
if(!insertionContext.getRoute().getVehicle().getSkills().containsSkill(skill)){
if(!insertionContext.getNewVehicle().getSkills().containsSkill(skill)){
return false;
}
}

24
jsprit-core/src/test/java/jsprit/core/problem/constraint/SkillConstraintTest.java
View file

@ -44,7 +44,7 @@ public class SkillConstraintTest {
stateManager = new StateManager(mock(VehicleRoutingTransportCosts.class));
stateManager.addStateUpdater(new UpdateSkills(stateManager));
stateManager.update(route);
skillConstraint = new SkillConstraint(stateManager);
skillConstraint = new HardSkillConstraint(stateManager);
}
@Test
@ -57,6 +57,17 @@ public class SkillConstraintTest {
assertFalse(skillConstraint.fulfilled(insertionContext));
}
@Test
public void whenJobToBeInsertedRequiresSkillsThatVehicle2DoesNotHave_itShouldReturnFalse(){
Service s4 = mock(Service.class);
when(s4.getRequiredSkills()).thenReturn(Skills.Builder.newInstance().addSkill("skill5").build());
Vehicle vehicle2 = mock(Vehicle.class);
when(vehicle2.getSkills()).thenReturn(Skills.Builder.newInstance()
.addAllSkills(Arrays.asList("skill1","skill2","skill3","skill4")).build());
JobInsertionContext insertionContext = new JobInsertionContext(route,s4,vehicle2,route.getDriver(),0.);
assertFalse(skillConstraint.fulfilled(insertionContext));
}
@Test
public void whenJobToBeInsertedRequiresSkillsThatVehicleHave_itShouldReturnTrue(){
Service s4 = mock(Service.class);
@ -67,6 +78,17 @@ public class SkillConstraintTest {
assertTrue(skillConstraint.fulfilled(insertionContext));
}
@Test
public void whenJobToBeInsertedRequiresSkillsThatVehicle2Have_itShouldReturnTrue(){
Service s4 = mock(Service.class);
when(s4.getRequiredSkills()).thenReturn(Skills.Builder.newInstance().addSkill("skill4").build());
Vehicle vehicle2 = mock(Vehicle.class);
when(vehicle2.getSkills()).thenReturn(Skills.Builder.newInstance()
.addAllSkills(Arrays.asList("skill1","skill2","skill3","skill4","skill5")).build());
JobInsertionContext insertionContext = new JobInsertionContext(route,s4,vehicle2,route.getDriver(),0.);
assertTrue(skillConstraint.fulfilled(insertionContext));
}
@Test
public void whenRouteToBeOvertakenRequiresSkillsThatVehicleDoesNotHave_itShouldReturnFalse(){
Service s4 = mock(Service.class);