From 273a67d1acee18b7f36f7ecebb11035b0b133368 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 29 Dec 2013 22:32:11 +0100 Subject: [PATCH 01/13] Update FiniteFleetManagerFactory.java --- .../core/problem/vehicle/FiniteFleetManagerFactory.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java index 29358743..6e4abd3c 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java @@ -2,6 +2,10 @@ package jsprit.core.problem.vehicle; import java.util.Collection; +/** + * Factory that constructs a finite fleet manager. + * + */ public class FiniteFleetManagerFactory implements VehicleFleetManagerFactory{ From c06066503ae3cce24b0a1ed71b9f472dcfcc31b3 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 29 Dec 2013 22:39:36 +0100 Subject: [PATCH 02/13] Update FiniteFleetManagerFactory.java --- .../core/problem/vehicle/FiniteFleetManagerFactory.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java index 6e4abd3c..93ed62ff 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java @@ -3,7 +3,7 @@ package jsprit.core.problem.vehicle; import java.util.Collection; /** - * Factory that constructs a finite fleet manager. + * Factory that constructs a finite fleetmanager. * */ @@ -11,6 +11,9 @@ public class FiniteFleetManagerFactory implements VehicleFleetManagerFactory{ private Collection vehicles; + /** + * Constucts the factory. + */ public FiniteFleetManagerFactory(Collection vehicles) { super(); this.vehicles = vehicles; From 316379ec6c60c90c461dcd68db3003eaa176f7de Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 29 Dec 2013 22:41:27 +0100 Subject: [PATCH 03/13] Update FiniteFleetManagerFactory.java --- .../core/problem/vehicle/FiniteFleetManagerFactory.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java index 93ed62ff..c93444d8 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java @@ -3,7 +3,7 @@ package jsprit.core.problem.vehicle; import java.util.Collection; /** - * Factory that constructs a finite fleetmanager. + * Factory that creates a finite fleetmanager. * */ @@ -19,6 +19,9 @@ public class FiniteFleetManagerFactory implements VehicleFleetManagerFactory{ this.vehicles = vehicles; } + /** + * Creates the finite fleetmanager. + */ @Override public VehicleFleetManager createFleetManager() { return new VehicleFleetManagerImpl(vehicles); From b8e88b8a221eef7460c6ee82844386ad34c08c40 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 29 Dec 2013 22:41:54 +0100 Subject: [PATCH 04/13] Update FiniteFleetManagerFactory.java --- .../jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java index c93444d8..2f515f1a 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java @@ -6,7 +6,6 @@ import java.util.Collection; * Factory that creates a finite fleetmanager. * */ - public class FiniteFleetManagerFactory implements VehicleFleetManagerFactory{ private Collection vehicles; From 3d643fbebcee0ddc68f79faf4bc15daf49ba898d Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 29 Dec 2013 22:44:35 +0100 Subject: [PATCH 05/13] Update FiniteFleetManagerFactory.java --- .../vehicle/FiniteFleetManagerFactory.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java index 2f515f1a..bc295dcc 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java @@ -1,3 +1,19 @@ +/******************************************************************************* + * Copyright (C) 2013 Stefan Schroeder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + ******************************************************************************/ package jsprit.core.problem.vehicle; import java.util.Collection; From 767ac2019f09e417100573ccb9426a07e610bef0 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 29 Dec 2013 22:54:10 +0100 Subject: [PATCH 06/13] add javadoc --- .../vehicle/InfiniteFleetManagerFactory.java | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java index 458571e0..7f154fa2 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java @@ -1,17 +1,41 @@ +/******************************************************************************* + * Copyright (C) 2013 Stefan Schroeder + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + ******************************************************************************/ package jsprit.core.problem.vehicle; import java.util.Collection; - +/** + * Factory that creates an infinite fleetmanager. + */ public class InfiniteFleetManagerFactory implements VehicleFleetManagerFactory{ private Collection vehicles; + /** + * Constructs the factory. + */ public InfiniteFleetManagerFactory(Collection vehicles) { super(); this.vehicles = vehicles; } + /** + * Creates the infinite fleetmanager. + */ @Override public VehicleFleetManager createFleetManager() { return new InfiniteVehicles(vehicles); From ba4340efcf315c8735d0d27c845e9a6ce9989629 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 29 Dec 2013 23:04:22 +0100 Subject: [PATCH 07/13] Update FiniteFleetManagerFactory.java --- .../jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java index bc295dcc..4cc80939 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/FiniteFleetManagerFactory.java @@ -21,6 +21,7 @@ import java.util.Collection; /** * Factory that creates a finite fleetmanager. * + * @author schroeder */ public class FiniteFleetManagerFactory implements VehicleFleetManagerFactory{ @@ -28,6 +29,8 @@ public class FiniteFleetManagerFactory implements VehicleFleetManagerFactory{ /** * Constucts the factory. + * + * @param vehicles */ public FiniteFleetManagerFactory(Collection vehicles) { super(); From 91e8cd7b5609c6d857e04608dd250f393b8aa61b Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 29 Dec 2013 23:06:37 +0100 Subject: [PATCH 08/13] add javadoc --- .../core/problem/vehicle/InfiniteFleetManagerFactory.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java index 7f154fa2..42a3b56f 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/InfiniteFleetManagerFactory.java @@ -20,6 +20,8 @@ import java.util.Collection; /** * Factory that creates an infinite fleetmanager. + * + * @author schroeder */ public class InfiniteFleetManagerFactory implements VehicleFleetManagerFactory{ @@ -27,6 +29,8 @@ public class InfiniteFleetManagerFactory implements VehicleFleetManagerFactory{ /** * Constructs the factory. + * + * @param vehicles */ public InfiniteFleetManagerFactory(Collection vehicles) { super(); From 3cf30a396a2d75d1b10f80f7adbfefeb0989e220 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 5 Jan 2014 09:36:35 +0100 Subject: [PATCH 09/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b7fc759..426d4ce5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ jsprit ====== -jsprit is a java based, open source toolkit for solving a set of well-known traveling salesman (TSP) and vehicle routing problems (VRP). +jsprit is a java based, open source toolkit for solving rich traveling salesman (TSP) and vehicle routing problems (VRP). It is lightweight and easy-to-use, and based on heuristics currently solving - Capacitated VRP - Multiple Depot VRP From b4ae7cee9e7ca03942b8e6e6e49376fcf447ffb8 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 5 Jan 2014 09:41:54 +0100 Subject: [PATCH 10/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 426d4ce5..045189b3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ jsprit ====== jsprit is a java based, open source toolkit for solving rich traveling salesman (TSP) and vehicle routing problems (VRP). -It is lightweight and easy-to-use, and based on heuristics currently solving +It is lightweight, flexible and easy-to-use, and based on heuristics currently solving - Capacitated VRP - Multiple Depot VRP - VRP with Time Windows From aa40770c7020737a640af9366c7b10e945e454f8 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 5 Jan 2014 09:44:48 +0100 Subject: [PATCH 11/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 045189b3..db764181 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ It is lightweight, flexible and easy-to-use, and based on heuristics currently s - Dial-a-Ride Problem - Various combination of these types -Setting up the problem, modifying the algorithms and visualising the discovered solutions is as easy and handy as +Setting up the problem, defining additional constraints, modifying the algorithms and visualising the discovered solutions is as easy and handy as reading classical VRP instances to benchmark your algorithm. Additionally, jsprit can be used along with MATSim From 3f872e42fcc81f8b6ab910dbddbf799f1f161d60 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 5 Jan 2014 09:49:23 +0100 Subject: [PATCH 12/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db764181..cd98a9d2 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ It is lightweight, flexible and easy-to-use, and based on heuristics currently s - Various combination of these types Setting up the problem, defining additional constraints, modifying the algorithms and visualising the discovered solutions is as easy and handy as -reading classical VRP instances to benchmark your algorithm. +reading classical VRP instances to benchmark your algorithm. It is fit for change and extension due to a modular approach and a comprehensive set of unit-tests. Additionally, jsprit can be used along with MATSim to solve the above problem-types in real networks (i.e. without preprocessing transport times and costs). A variety of least cost path algorithms such as Dijkstra and A* From 8ca89b9c232b7c8549259cef1075707e3cbf2581 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sun, 5 Jan 2014 21:52:26 +0100 Subject: [PATCH 13/13] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cd98a9d2..a065e3d2 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ It is lightweight, flexible and easy-to-use, and based on heuristics currently s - Various combination of these types Setting up the problem, defining additional constraints, modifying the algorithms and visualising the discovered solutions is as easy and handy as -reading classical VRP instances to benchmark your algorithm. It is fit for change and extension due to a modular approach and a comprehensive set of unit-tests. +reading classical VRP instances to benchmark your algorithm. It is fit for change and extension due to a modular design and a comprehensive set of unit-tests. Additionally, jsprit can be used along with MATSim to solve the above problem-types in real networks (i.e. without preprocessing transport times and costs). A variety of least cost path algorithms such as Dijkstra and A*