From 3828bd0cb6af34772c077daa5e77026a33837ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-David=20Be=CC=81langer?= Date: Wed, 30 Jul 2014 23:21:03 -0400 Subject: [PATCH 1/2] new signatures of the VehicleRoutingAlgorithms.createAlgorithm method that allow one to specify the nThreads with AlgorithmConfig algorithmConfig or URL configURL --- .../core/algorithm/io/VehicleRoutingAlgorithms.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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..cdaad5f7 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 @@ -368,6 +368,9 @@ public class VehicleRoutingAlgorithms { public static VehicleRoutingAlgorithm createAlgorithm(final VehicleRoutingProblem vrp, final AlgorithmConfig algorithmConfig){ 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. @@ -382,6 +385,12 @@ public class VehicleRoutingAlgorithms { xmlReader.read(configURL); 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. From 68ebf95b2059257c41246ab51ae5d7ee314a5900 Mon Sep 17 00:00:00 2001 From: jsprit Date: Wed, 6 Aug 2014 23:11:52 +0200 Subject: [PATCH 2/2] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index fdf34498..913fb0e8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ jsprit ====== +[![Build Status](https://travis-ci.org/jsprit/jsprit.svg?branch=master)](https://travis-ci.org/jsprit/jsprit) + jsprit is a java based, open source toolkit for solving rich traveling salesman (TSP) and vehicle routing problems (VRP). It is lightweight, flexible and easy-to-use, and based on a single all-purpose meta-heuristic currently solving - Capacitated VRP