From e1d5f3165ab03967d072acdf656412968df36fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-David=20Be=CC=81langer?= Date: Wed, 30 Jul 2014 22:48:34 -0400 Subject: [PATCH] Fix a bug where one gets an error message (solutionSelector is not know. Currently, it only knows "selectRandom" and "selectBest") when he uses selectRandomly as a selector. But selectRandom is not a valid enumeration in the selectorType restriction in the algorithm_schema.xsd. --- .../jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java b/jsprit-core/src/main/java/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java index dd17c055..d234b2ea 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java @@ -746,7 +746,7 @@ public class VehicleRoutingAlgorithms { private static SolutionSelector getSelector(HierarchicalConfiguration strategyConfig, VehicleRoutingProblem vrp, Set algorithmListeners, TypedMap definedSelectors) { String selectorName = strategyConfig.getString("selector[@name]"); - if(selectorName == null) throw new IllegalStateException("no solutionSelector defined. define either \"selectRandom\" or \"selectBest\""); + if(selectorName == null) throw new IllegalStateException("no solutionSelector defined. define either \"selectRandomly\" or \"selectBest\""); String selectorId = strategyConfig.getString("selector[@id]"); if(selectorId == null) selectorId="noId"; ModKey modKey = makeKey(selectorName,selectorId); @@ -755,7 +755,7 @@ public class VehicleRoutingAlgorithms { if(definedSelector != null) { return definedSelector; } - if(selectorName.equals("selectRandom")){ + if(selectorName.equals("selectRandomly")){ SelectRandomly selector = SelectRandomly.getInstance(); definedSelectors.put(selectorKey, selector); return selector; @@ -765,7 +765,7 @@ public class VehicleRoutingAlgorithms { definedSelectors.put(selectorKey, selector); return selector; } - throw new IllegalStateException("solutionSelector is not know. Currently, it only knows \"selectRandom\" and \"selectBest\""); + throw new IllegalStateException("solutionSelector is not know. Currently, it only knows \"selectRandomly\" and \"selectBest\""); } private static ModKey makeKey(String name, String id){