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

new signatures of the VehicleRoutingAlgorithms.createAlgorithm method that allow one to specify the nThreads with AlgorithmConfig algorithmConfig or URL configURL

Browse source
This commit is contained in:
Pierre-David Bélanger 2014-07-30 23:21:03 -04:00
parent 126b8c90c0
commit 3828bd0cb6
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
jsprit-core/src/main/java/jsprit/core/algorithm/io/VehicleRoutingAlgorithms.java
View file

@ -368,6 +368,9 @@ public class VehicleRoutingAlgorithms {
public static VehicleRoutingAlgorithm createAlgorithm(final VehicleRoutingProblem vrp, final AlgorithmConfig algorithmConfig){ public static VehicleRoutingAlgorithm createAlgorithm(final VehicleRoutingProblem vrp, final AlgorithmConfig algorithmConfig){
return createAlgo(vrp,algorithmConfig.getXMLConfiguration(),0, null); return createAlgo(vrp,algorithmConfig.getXMLConfiguration(),0, null);
} }
public static VehicleRoutingAlgorithm createAlgorithm(final VehicleRoutingProblem vrp, int nThreads, final AlgorithmConfig algorithmConfig){
return createAlgo(vrp,algorithmConfig.getXMLConfiguration(),nThreads, null);
}
/** /**
* Read and creates a {@link VehicleRoutingAlgorithm} from an url. * Read and creates a {@link VehicleRoutingAlgorithm} from an url.
@ -382,6 +385,12 @@ public class VehicleRoutingAlgorithms {
xmlReader.read(configURL); xmlReader.read(configURL);
return createAlgo(vrp,algorithmConfig.getXMLConfiguration(),0, null); return createAlgo(vrp,algorithmConfig.getXMLConfiguration(),0, null);
} }
public static VehicleRoutingAlgorithm readAndCreateAlgorithm(final VehicleRoutingProblem vrp, int nThreads, final URL configURL){
AlgorithmConfig algorithmConfig = new AlgorithmConfig();
AlgorithmConfigXmlReader xmlReader = new AlgorithmConfigXmlReader(algorithmConfig);
xmlReader.read(configURL);
return createAlgo(vrp,algorithmConfig.getXMLConfiguration(),nThreads, null);
}
/** /**
* Read and creates {@link jsprit.core.problem.VehicleRoutingProblem} from config-file. * Read and creates {@link jsprit.core.problem.VehicleRoutingProblem} from config-file.