From 04b52759e57cfaedff9c5edef9f5578ba9f8392c Mon Sep 17 00:00:00 2001 From: oblonski <4sschroeder@gmail.com> Date: Tue, 7 Oct 2014 12:54:58 +0200 Subject: [PATCH] add and test skill constraint violation checks --- .../java/jsprit/core/analysis/SolutionAnalyserTest.java | 6 ------ .../main/java/jsprit/examples/VRPWithBackhaulsExample2.java | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/jsprit-core/src/test/java/jsprit/core/analysis/SolutionAnalyserTest.java b/jsprit-core/src/test/java/jsprit/core/analysis/SolutionAnalyserTest.java index b282483b..b397f3ba 100644 --- a/jsprit-core/src/test/java/jsprit/core/analysis/SolutionAnalyserTest.java +++ b/jsprit-core/src/test/java/jsprit/core/analysis/SolutionAnalyserTest.java @@ -591,12 +591,6 @@ public class SolutionAnalyserTest { } - - @Test - public void whatHappensWhenUserSpecifiedOwnEndTime_stateManagerShouldNotOverwriteThis(){ - assertFalse(true); - } - @Test public void lateArrivalTimes_atStartActOfRoute1ShouldWork(){ SolutionAnalyser analyser = new SolutionAnalyser(vrp,solution, new SolutionAnalyser.DistanceCalculator() { diff --git a/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java b/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java index 52cde060..90942894 100644 --- a/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java +++ b/jsprit-examples/src/main/java/jsprit/examples/VRPWithBackhaulsExample2.java @@ -136,7 +136,7 @@ public class VRPWithBackhaulsExample2 { System.out.println("capViolation@beginning: " + analyser.getCapacityViolationAtBeginning(route)); System.out.println("capViolation@end: " + analyser.getCapacityViolationAtEnd(route)); System.out.println("timeWindowViolationOnRoute: " + analyser.getTimeWindowViolation(route)); - + System.out.println("skillConstraintViolatedOnRoute: " + analyser.skillConstraintIsViolated(route)); System.out.println("dist@" + route.getStart().getLocationId() + ": " + analyser.getDistanceAtActivity(route.getStart(),route)); System.out.println("timeWindowViolation@" + route.getStart().getLocationId() + ": " + analyser.getTimeWindowViolationAtActivity(route.getStart(), route)); @@ -150,6 +150,7 @@ public class VRPWithBackhaulsExample2 { System.out.println("transportCosts@" + act.getLocationId() + ": " + analyser.getVariableTransportCostsAtActivity(act,route)); System.out.println("capViolation(after)@" + act.getLocationId() + ": " + analyser.getCapacityViolationAfterActivity(act,route)); System.out.println("timeWindowViolation@" + act.getLocationId() + ": " + analyser.getTimeWindowViolationAtActivity(act,route)); + System.out.println("skillConstraintViolated@" + act.getLocationId() + ": " + analyser.skillConstraintIsViolatedAtActivity(act,route)); } System.out.println("--"); System.out.println("dist@" + route.getEnd().getLocationId() + ": " + analyser.getDistanceAtActivity(route.getEnd(),route));