From b7b0ff650c144b9b94d34121708d411dca65dff2 Mon Sep 17 00:00:00 2001 From: oblonski <4sschroeder@gmail.com> Date: Mon, 11 Aug 2014 23:00:43 +0200 Subject: [PATCH] rename badJob into unassignedJob --- .../jsprit/analysis/toolbox/SolutionPrinter.java | 4 ++-- ...ablePlusFixedSolutionCostCalculatorFactory.java | 2 +- .../algorithm/module/RuinAndRecreateModule.java | 8 ++++---- .../solution/VehicleRoutingProblemSolution.java | 14 ++++++++------ .../java/jsprit/core/algorithm/BadJobListTest.java | 8 ++++---- .../VehicleRoutingProblemSolutionTest.java | 12 ++++++------ 6 files changed, 25 insertions(+), 23 deletions(-) diff --git a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/SolutionPrinter.java b/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/SolutionPrinter.java index 34183fa3..b44821f6 100644 --- a/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/SolutionPrinter.java +++ b/jsprit-analysis/src/main/java/jsprit/analysis/toolbox/SolutionPrinter.java @@ -93,7 +93,7 @@ public class SolutionPrinter { System.out.format("+---------------+------------------------------------------+%n"); System.out.format(leftAlignSolution, "costs",solution.getCost()); System.out.format(leftAlignSolution, "nVehicles",solution.getRoutes().size()); - System.out.format(leftAlignSolution, "badJobs", solution.getBadJobs().size()); + System.out.format(leftAlignSolution, "badJobs", solution.getUnassignedJobs().size()); System.out.format("+----------------------------------------------------------+%n"); if(print.equals(Print.VERBOSE)){ @@ -132,7 +132,7 @@ public class SolutionPrinter { System.out.format("+*:=PenaltyVehicle+%n"); System.out.format("+--------------------------------------------------------------------------------------------------------------------------------+%n"); System.out.format("+*:=badJobs+%n"); - for(Job j : solution.getBadJobs()){ + for(Job j : solution.getUnassignedJobs()){ System.out.println(j.getId()); } } diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/VariablePlusFixedSolutionCostCalculatorFactory.java b/jsprit-core/src/main/java/jsprit/core/algorithm/VariablePlusFixedSolutionCostCalculatorFactory.java index 2ab22785..5e02b6f0 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/VariablePlusFixedSolutionCostCalculatorFactory.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/VariablePlusFixedSolutionCostCalculatorFactory.java @@ -52,7 +52,7 @@ public class VariablePlusFixedSolutionCostCalculatorFactory { c += stateManager.getRouteState(r, InternalStates.COSTS, Double.class); c += getFixedCosts(r.getVehicle()); } - c += solution.getBadJobs().size() * c * .1; + c += solution.getUnassignedJobs().size() * c * .1; return c; } diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/module/RuinAndRecreateModule.java b/jsprit-core/src/main/java/jsprit/core/algorithm/module/RuinAndRecreateModule.java index ff30eaba..9aca39d7 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/module/RuinAndRecreateModule.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/module/RuinAndRecreateModule.java @@ -50,10 +50,10 @@ public class RuinAndRecreateModule implements SearchStrategyModule{ Collection ruinedJobs = ruin.ruin(vrpSolution.getRoutes()); Set ruinedJobSet = new HashSet(); ruinedJobSet.addAll(ruinedJobs); - ruinedJobSet.addAll(vrpSolution.getBadJobs()); - Collection badJobs = insertion.insertJobs(vrpSolution.getRoutes(), ruinedJobSet); - vrpSolution.getBadJobs().clear(); - vrpSolution.getBadJobs().addAll(badJobs); + ruinedJobSet.addAll(vrpSolution.getUnassignedJobs()); + Collection unassignedJobs = insertion.insertJobs(vrpSolution.getRoutes(), ruinedJobSet); + vrpSolution.getUnassignedJobs().clear(); + vrpSolution.getUnassignedJobs().addAll(unassignedJobs); return vrpSolution; } diff --git a/jsprit-core/src/main/java/jsprit/core/problem/solution/VehicleRoutingProblemSolution.java b/jsprit-core/src/main/java/jsprit/core/problem/solution/VehicleRoutingProblemSolution.java index bbfc061f..68f1e621 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/solution/VehicleRoutingProblemSolution.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/solution/VehicleRoutingProblemSolution.java @@ -43,7 +43,7 @@ public class VehicleRoutingProblemSolution { private final Collection routes; - private Collection badJobs = new ArrayList(); + private Collection unassignedJobs = new ArrayList(); private double cost; @@ -54,7 +54,7 @@ public class VehicleRoutingProblemSolution { routes.add(route); } this.cost = solution.getCost(); - badJobs.addAll(solution.getBadJobs()); + unassignedJobs.addAll(solution.getUnassignedJobs()); } /** @@ -73,12 +73,14 @@ public class VehicleRoutingProblemSolution { * Constructs a solution with a number of {@link VehicleRoute}s, bad jobs and their corresponding aggregate cost value. * * @param routes routes being part of the solution + * @param unassignedJobs jobs that could not be assigned to any vehicle * @param cost total costs of solution + * */ - public VehicleRoutingProblemSolution(Collection routes, Collection badJobs, double cost) { + public VehicleRoutingProblemSolution(Collection routes, Collection unassignedJobs, double cost) { super(); this.routes = routes; - this.badJobs = badJobs; + this.unassignedJobs = unassignedJobs; this.cost = cost; } @@ -114,8 +116,8 @@ public class VehicleRoutingProblemSolution { * * @return bad jobs */ - public Collection getBadJobs(){ - return badJobs; + public Collection getUnassignedJobs(){ + return unassignedJobs; } } diff --git a/jsprit-core/src/test/java/jsprit/core/algorithm/BadJobListTest.java b/jsprit-core/src/test/java/jsprit/core/algorithm/BadJobListTest.java index 6b05dc24..e602712a 100644 --- a/jsprit-core/src/test/java/jsprit/core/algorithm/BadJobListTest.java +++ b/jsprit-core/src/test/java/jsprit/core/algorithm/BadJobListTest.java @@ -31,8 +31,8 @@ public class BadJobListTest { Collection solutions = algorithm.searchSolutions(); VehicleRoutingProblemSolution solution = Solutions.bestOf(solutions); - assertTrue(!solution.getBadJobs().contains(job1)); - assertTrue(solution.getBadJobs().contains(job2)); + assertTrue(!solution.getUnassignedJobs().contains(job1)); + assertTrue(solution.getUnassignedJobs().contains(job2)); } @Test @@ -50,8 +50,8 @@ public class BadJobListTest { Collection solutions = algorithm.searchSolutions(); VehicleRoutingProblemSolution solution = Solutions.bestOf(solutions); - assertTrue(!solution.getBadJobs().contains(job1)); - assertTrue(solution.getBadJobs().contains(job2)); + assertTrue(!solution.getUnassignedJobs().contains(job1)); + assertTrue(solution.getUnassignedJobs().contains(job2)); } } diff --git a/jsprit-core/src/test/java/jsprit/core/problem/solution/VehicleRoutingProblemSolutionTest.java b/jsprit-core/src/test/java/jsprit/core/problem/solution/VehicleRoutingProblemSolutionTest.java index efff461d..81e21ac4 100644 --- a/jsprit-core/src/test/java/jsprit/core/problem/solution/VehicleRoutingProblemSolutionTest.java +++ b/jsprit-core/src/test/java/jsprit/core/problem/solution/VehicleRoutingProblemSolutionTest.java @@ -60,7 +60,7 @@ public class VehicleRoutingProblemSolutionTest { List badJobs = new ArrayList(); badJobs.add(badJob); VehicleRoutingProblemSolution sol = new VehicleRoutingProblemSolution(Collections.emptyList(), badJobs, 10.0); - assertEquals(1,sol.getBadJobs().size()); + assertEquals(1,sol.getUnassignedJobs().size()); } @Test @@ -69,8 +69,8 @@ public class VehicleRoutingProblemSolutionTest { List badJobs = new ArrayList(); badJobs.add(badJob); VehicleRoutingProblemSolution sol = new VehicleRoutingProblemSolution(Collections.emptyList(), 10.0); - sol.getBadJobs().addAll(badJobs); - assertEquals(1, sol.getBadJobs().size()); + sol.getUnassignedJobs().addAll(badJobs); + assertEquals(1, sol.getUnassignedJobs().size()); } @Test @@ -79,7 +79,7 @@ public class VehicleRoutingProblemSolutionTest { List badJobs = new ArrayList(); badJobs.add(badJob); VehicleRoutingProblemSolution sol = new VehicleRoutingProblemSolution(Collections.emptyList(), badJobs, 10.0); - assertEquals(badJob,sol.getBadJobs().iterator().next()); + assertEquals(badJob,sol.getUnassignedJobs().iterator().next()); } @Test @@ -88,8 +88,8 @@ public class VehicleRoutingProblemSolutionTest { List badJobs = new ArrayList(); badJobs.add(badJob); VehicleRoutingProblemSolution sol = new VehicleRoutingProblemSolution(Collections.emptyList(), 10.0); - sol.getBadJobs().addAll(badJobs); - assertEquals(badJob, sol.getBadJobs().iterator().next()); + sol.getUnassignedJobs().addAll(badJobs); + assertEquals(badJob, sol.getUnassignedJobs().iterator().next()); } }