From 1c451c5090c075c22cf60f03761d7232335d7aa4 Mon Sep 17 00:00:00 2001 From: oblonski <4sschroeder@gmail.com> Date: Wed, 26 Mar 2014 21:04:54 +0100 Subject: [PATCH] modified acc to AlgorithmConfig --- .../core/algorithm/io/VehicleRoutingAlgorithms.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 6a6868c7..f9570cde 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 @@ -510,12 +510,12 @@ public class VehicleRoutingAlgorithms { return readAndCreateAlgorithm(vrp, config, nuOfThreads, null, stateManager, constraintManager, true); } - public static VehicleRoutingAlgorithm readAndCreateAlgorithm(final VehicleRoutingProblem vrp, String config, + public static VehicleRoutingAlgorithm readAndCreateAlgorithm(final VehicleRoutingProblem vrp, AlgorithmConfig config, int nuOfThreads, SolutionCostCalculator solutionCostCalculator, final StateManager stateManager, ConstraintManager constraintManager, boolean addDefaultCostCalculators) { - AlgorithmConfig algorithmConfig = new AlgorithmConfig(); - AlgorithmConfigXmlReader xmlReader = new AlgorithmConfigXmlReader(algorithmConfig); - xmlReader.read(config); - return readAndCreateAlgorithm(vrp, algorithmConfig.getXMLConfiguration(),nuOfThreads, solutionCostCalculator, stateManager, constraintManager, addDefaultCostCalculators); +// AlgorithmConfig algorithmConfig = new AlgorithmConfig(); +// AlgorithmConfigXmlReader xmlReader = new AlgorithmConfigXmlReader(algorithmConfig); +// xmlReader.read(config); + return readAndCreateAlgorithm(vrp, config.getXMLConfiguration(),nuOfThreads, solutionCostCalculator, stateManager, constraintManager, addDefaultCostCalculators); } private static VehicleRoutingAlgorithm readAndCreateAlgorithm(final VehicleRoutingProblem vrp, XMLConfiguration config,