From 3dd770620404ab934e46c517e7930e93d7984574 Mon Sep 17 00:00:00 2001 From: oblonski Date: Wed, 22 Apr 2015 11:22:04 +0200 Subject: [PATCH] add todo --- .../algorithm/VehicleRoutingAlgorithm.java | 27 +------------------ .../algorithm/box/InsertionNoiseMaker.java | 2 +- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithm.java b/jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithm.java index 8fa2d250..3b4e03ca 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithm.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/VehicleRoutingAlgorithm.java @@ -125,8 +125,7 @@ public class VehicleRoutingAlgorithm { initialSolutions.add(solution); } - - private void verify(VehicleRoutingProblemSolution solution) { + private void verify(VehicleRoutingProblemSolution solution) { int nuJobs = 0; for(VehicleRoute route : solution.getRoutes()){ nuJobs += route.getTourActivities().getJobs().size(); @@ -157,7 +156,6 @@ public class VehicleRoutingAlgorithm { public void setPrematureAlgorithmTermination(PrematureAlgorithmTermination prematureAlgorithmTermination){ terminationManager = new TerminationManager(); terminationManager.addTermination(prematureAlgorithmTermination); -// this.prematureAlgorithmTermination = prematureAlgorithmTermination; } /** @@ -237,18 +235,6 @@ public class VehicleRoutingAlgorithm { algoListeners.selectedStrategy(discoveredSolution,problem,solutions); } - /** - * Returns the number of iterations. - * - * @return iterations - * @deprecated use .getMaxIterations() instead - */ - @Deprecated - public int getNuOfIterations(){ - return maxIterations; - } - - private void algorithmEnds(VehicleRoutingProblem problem, Collection solutions) { algoListeners.algorithmEnds(problem, solutions); } @@ -294,16 +280,5 @@ public class VehicleRoutingAlgorithm { return maxIterations; } - /** - * Sets max number of iterations. - * - * @param nOfIterations max number of iteration the algorithm runs - * @deprecated use .setMaxIterations(int maxIterations) instead - */ - @Deprecated - public void setNuOfIterations(int nOfIterations) { - this.maxIterations = nOfIterations; - logger.info("set nuOfIterations to " + nOfIterations); - } } diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/box/InsertionNoiseMaker.java b/jsprit-core/src/main/java/jsprit/core/algorithm/box/InsertionNoiseMaker.java index 2f3d2f91..6c7a768a 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/box/InsertionNoiseMaker.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/box/InsertionNoiseMaker.java @@ -31,7 +31,6 @@ class InsertionNoiseMaker implements SoftActivityConstraint, IterationStartsList private double noiseLevel = 0.1; - public InsertionNoiseMaker(VehicleRoutingProblem vrp, double noiseLevel, double noiseProbability) { this.vrp = vrp; this.noiseLevel = noiseLevel; @@ -39,6 +38,7 @@ class InsertionNoiseMaker implements SoftActivityConstraint, IterationStartsList determineMaxCosts(vrp); } + //@ToDo refactor determining max costs to allow skipping this private void determineMaxCosts(VehicleRoutingProblem vrp) { double max = 0.; for(Job i : vrp.getJobs().values()){