trans/graphhopper-jsprit
1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
Code Issues Releases Wiki Activity

CR

Browse source
This commit is contained in:
kobyb 2017-11-26 10:03:52 +02:00
parent a83bed51c5
commit beff879471
1 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
jsprit-io/src/main/java/com/graphhopper/jsprit/io/algorithm/VehicleRoutingAlgorithms.java
View file

@ -413,11 +413,11 @@ public class VehicleRoutingAlgorithms {
return createAlgo(vrp, algorithmConfig.getXMLConfiguration(), 0, stateManager, null); return createAlgo(vrp, algorithmConfig.getXMLConfiguration(), 0, stateManager, null);
} }
public static VehicleRoutingAlgorithm readAndCreateAlgorithm(final VehicleRoutingProblem vrp, int nThreads, final String configFileName, StateManager stateManager) { public static VehicleRoutingAlgorithm readAndCreateAlgorithm(final VehicleRoutingProblem vrp, int nThreads, final String configFileName, StateManager stateManager, SolutionCostCalculator solutionCostCalculator) {
AlgorithmConfig algorithmConfig = new AlgorithmConfig(); AlgorithmConfig algorithmConfig = new AlgorithmConfig();
AlgorithmConfigXmlReader xmlReader = new AlgorithmConfigXmlReader(algorithmConfig); AlgorithmConfigXmlReader xmlReader = new AlgorithmConfigXmlReader(algorithmConfig);
xmlReader.read(configFileName); xmlReader.read(configFileName);
return createAlgo(vrp, algorithmConfig.getXMLConfiguration(), nThreads, stateManager, null); return createAlgo(vrp, algorithmConfig.getXMLConfiguration(), nThreads, stateManager, solutionCostCalculator);
} }
public static VehicleRoutingAlgorithm readAndCreateAlgorithm(VehicleRoutingProblem vrp, int nThreads, String configFileName) { public static VehicleRoutingAlgorithm readAndCreateAlgorithm(VehicleRoutingProblem vrp, int nThreads, String configFileName) {
@ -427,13 +427,6 @@ public class VehicleRoutingAlgorithms {
return createAlgo(vrp, algorithmConfig.getXMLConfiguration(), nThreads, null, null); return createAlgo(vrp, algorithmConfig.getXMLConfiguration(), nThreads, null, null);
} }
public static VehicleRoutingAlgorithm readAndCreateAlgorithm(VehicleRoutingProblem vrp, int nThreads, String configFileName, StateManager stateMan, SolutionCostCalculator solutionCostCalculator) {
AlgorithmConfig algorithmConfig = new AlgorithmConfig();
AlgorithmConfigXmlReader xmlReader = new AlgorithmConfigXmlReader(algorithmConfig);
xmlReader.read(configFileName);
return createAlgo(vrp, algorithmConfig.getXMLConfiguration(), nThreads, stateMan, solutionCostCalculator);
}
private static class OpenRouteStateVerifier implements StateUpdater, ReverseActivityVisitor { private static class OpenRouteStateVerifier implements StateUpdater, ReverseActivityVisitor {
private End end; private End end;