From cda8b9063024fb42abe2b171b334cb6cadc111f6 Mon Sep 17 00:00:00 2001 From: jsprit Date: Fri, 26 Sep 2014 00:13:05 +0200 Subject: [PATCH 1/5] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 24666785..b7b096ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ Change-log ========== +**v1.4.1** @ 2014-09-25 +- bugfix [#131](https://github.com/jsprit/jsprit/issues/131) +- bugfix [#134](https://github.com/jsprit/jsprit/issues/134) + **v1.4** @ 2014-09-08 ! Break change ! From 0ffd6bc9a8553c41d19acd2cfe52267f2449301a Mon Sep 17 00:00:00 2001 From: jsprit Date: Fri, 26 Sep 2014 00:15:49 +0200 Subject: [PATCH 2/5] Update WHATS_NEW.md --- WHATS_NEW.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/WHATS_NEW.md b/WHATS_NEW.md index cf92105b..b599acbb 100644 --- a/WHATS_NEW.md +++ b/WHATS_NEW.md @@ -3,6 +3,12 @@ WHATS NEW ------------------------------ +2014-09-25 new release **v1.4.1** + +It contains a critical bugfix (see [#134](https://github.com/jsprit/jsprit/issues/134)). + +------------------------------ + 2014-09-08 new release **v1.4** v1.4 breaks your code! Look at [changelog](https://github.com/jsprit/jsprit/blob/master/CHANGELOG.md) to migrate from v1.3.1 to v1.4. From 3cc66b67ca33466f3d67600cab584a6105ac00f5 Mon Sep 17 00:00:00 2001 From: jsprit Date: Fri, 26 Sep 2014 00:16:41 +0200 Subject: [PATCH 3/5] Update WHATS_NEW.md --- WHATS_NEW.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WHATS_NEW.md b/WHATS_NEW.md index b599acbb..48f7cfee 100644 --- a/WHATS_NEW.md +++ b/WHATS_NEW.md @@ -5,7 +5,7 @@ WHATS NEW 2014-09-25 new release **v1.4.1** -It contains a critical bugfix (see [#134](https://github.com/jsprit/jsprit/issues/134)). +It contains a fix of a critical bug (see [#134](https://github.com/jsprit/jsprit/issues/134)). ------------------------------ From b8fcd1df2a0ef9d8b4a6f92d38a51f8f2ab4714b Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Mon, 29 Sep 2014 22:03:19 +0200 Subject: [PATCH 4/5] add javadocs --- .../jsprit/core/problem/VehicleRoutingProblem.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java b/jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java index 1c4f4fdc..b15811e8 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java @@ -288,7 +288,12 @@ public class VehicleRoutingProblem { } - + /** + * Adds an initial vehicle route. + * + * @param route initial route + * @return the builder + */ public Builder addInitialVehicleRoute(VehicleRoute route){ addVehicle((AbstractVehicle)route.getVehicle()); for(TourActivity act : route.getActivities()){ @@ -324,6 +329,12 @@ public class VehicleRoutingProblem { } } + /** + * Adds a collection of initial vehicle routes. + * + * @param routes initial routes + * @return the builder + */ public Builder addInitialVehicleRoutes(Collection routes){ for(VehicleRoute r : routes){ addInitialVehicleRoute(r); From a4f499c7934d65aeb5585849863a09c6237bd4e3 Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Wed, 1 Oct 2014 19:35:00 +0200 Subject: [PATCH 5/5] add javadocs --- .../core/problem/VehicleRoutingProblem.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java b/jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java index b15811e8..eaa43f38 100644 --- a/jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java +++ b/jsprit-core/src/main/java/jsprit/core/problem/VehicleRoutingProblem.java @@ -739,20 +739,37 @@ public class VehicleRoutingProblem { return activityCosts; } + /** + * @return returns all location, i.e. from vehicles and jobs. + */ public Locations getLocations(){ return locations; } + /** + * @param job for which the corresponding activities needs to be returned + * @return associated activities + */ public List getActivities(Job job){ return Collections.unmodifiableList(activityMap.get(job)); } + /** + * @return total number of activities + */ public int getNuActivities(){ return nuActivities; } + /** + * @return factory that creates the activities associated to a job + */ public JobActivityFactory getJobActivityFactory(){ return jobActivityFactory; } + /** + * @param job for which the corresponding activities needs to be returned + * @return a copy of the activities that are associated to the specified job + */ public List copyAndGetActivities(Job job){ List acts = new ArrayList(); if(activityMap.containsKey(job)) {