From b16250bf465db4bd4609cc836871d772101d0ce5 Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Sat, 14 Jun 2014 13:11:09 +0200 Subject: [PATCH 1/9] modified departure-time settings of core.algorithm.recreate.VehicleTypeDependentJobInsertionCalculator --- .../recreate/VehicleTypeDependentJobInsertionCalculator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java index 3d4413fe..7257607e 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/VehicleTypeDependentJobInsertionCalculator.java @@ -107,7 +107,9 @@ final class VehicleTypeDependentJobInsertionCalculator implements JobInsertionCo relevantVehicles.addAll(fleetManager.getAvailableVehicles()); } for(Vehicle v : relevantVehicles){ - double depTime = v.getEarliestDeparture(); + double depTime; + if(v == selectedVehicle) depTime = currentRoute.getDepartureTime(); + else depTime = v.getEarliestDeparture(); InsertionData iData = insertionCalculator.getInsertionData(currentRoute, jobToInsert, v, depTime, selectedDriver, bestKnownCost_); if(iData instanceof NoInsertionFound) { if(bestIData instanceof NoInsertionFound) bestIData = iData; From c7724cc87057d1972a424de84804571c05704649 Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Sat, 14 Jun 2014 13:12:41 +0200 Subject: [PATCH 2/9] set departure-time when returning InsertionData in core.algorithm.recreate.ServiceInsertionOnRouteLevelCalculator --- .../recreate/ServiceInsertionOnRouteLevelCalculator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java index ef98c37a..e943e7f9 100644 --- a/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java +++ b/jsprit-core/src/main/java/jsprit/core/algorithm/recreate/ServiceInsertionOnRouteLevelCalculator.java @@ -303,7 +303,9 @@ final class ServiceInsertionOnRouteLevelCalculator implements JobInsertionCostsC } } if(best_insertion_index == InsertionData.NO_INDEX) return InsertionData.createEmptyInsertionData(); - return new InsertionData(best_insertion_costs, InsertionData.NO_INDEX, best_insertion_index, newVehicle, newDriver); + InsertionData insertionData = new InsertionData(best_insertion_costs, InsertionData.NO_INDEX, best_insertion_index, newVehicle, newDriver); + insertionData.setVehicleDepartureTime(start.getEndTime()); + return insertionData; } /** From 4f6d004e2842866bacc08c903e47d8befa0fb92b Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Sat, 14 Jun 2014 14:02:44 +0200 Subject: [PATCH 3/9] updated plugins --- pom.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 5ed85642..2ae66c3f 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ target target/classes target/test-classes - ${artifactId}-${version} + ${project.artifactId}-${project.version} src/main/resources @@ -205,6 +205,7 @@ org.apache.maven.plugins maven-source-plugin + 2.2.1 attach-sources @@ -218,6 +219,7 @@ org.apache.maven.plugins maven-javadoc-plugin + 2.9.1 attach-javadocs @@ -231,7 +233,7 @@ org.apache.maven.plugins maven-release-plugin - 2.4.1 + 2.5 v@{project.version} From 86c90290415d1936a0b7a9bc7309af62bed26b98 Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Sat, 14 Jun 2014 14:06:11 +0200 Subject: [PATCH 4/9] [maven-release-plugin] prepare release v1.3.1 --- jsprit-analysis/pom.xml | 2 +- jsprit-core/pom.xml | 2 +- jsprit-examples/pom.xml | 2 +- jsprit-instances/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jsprit-analysis/pom.xml b/jsprit-analysis/pom.xml index 0190260d..8a89c40a 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 jsprit-analysis diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index c26f1168..fedc71d5 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 jsprit-core diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index 205c96bb..c0055750 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index 6f353c27..b8bc3629 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/pom.xml b/pom.xml index 2ae66c3f..05984308 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.1 pom @@ -35,7 +35,7 @@ scm:git:git@github.com:jsprit/jsprit.git scm:git:https://github.com/jsprit/jsprit.git http://github.com/jsprit/jsprit/tree/master - HEAD + v1.3.1 From 41d8d7afbc4aea9eb96e255dc40657f54d850e97 Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Sat, 14 Jun 2014 14:07:27 +0200 Subject: [PATCH 5/9] [maven-release-plugin] rollback the release of v1.3.1 --- jsprit-analysis/pom.xml | 2 +- jsprit-core/pom.xml | 2 +- jsprit-examples/pom.xml | 2 +- jsprit-instances/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jsprit-analysis/pom.xml b/jsprit-analysis/pom.xml index 8a89c40a..0190260d 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 1.3.1 + 1.3.1-SNAPSHOT 4.0.0 jsprit-analysis diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index fedc71d5..c26f1168 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1 + 1.3.1-SNAPSHOT 4.0.0 jsprit-core diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index c0055750..205c96bb 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1 + 1.3.1-SNAPSHOT 4.0.0 diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index b8bc3629..6f353c27 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1 + 1.3.1-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 05984308..2ae66c3f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ jsprit jsprit - 1.3.1 + 1.3.1-SNAPSHOT pom @@ -35,7 +35,7 @@ scm:git:git@github.com:jsprit/jsprit.git scm:git:https://github.com/jsprit/jsprit.git http://github.com/jsprit/jsprit/tree/master - v1.3.1 + HEAD From 011a30a67da6938e2e65e65703e180d9f2956215 Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Sat, 14 Jun 2014 14:14:04 +0200 Subject: [PATCH 6/9] [maven-release-plugin] prepare release v1.3.1 --- jsprit-analysis/pom.xml | 2 +- jsprit-core/pom.xml | 2 +- jsprit-examples/pom.xml | 2 +- jsprit-instances/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jsprit-analysis/pom.xml b/jsprit-analysis/pom.xml index 0190260d..8a89c40a 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 jsprit-analysis diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index c26f1168..fedc71d5 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 jsprit-core diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index 205c96bb..c0055750 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index 6f353c27..b8bc3629 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.1 4.0.0 diff --git a/pom.xml b/pom.xml index 2ae66c3f..05984308 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.1 pom @@ -35,7 +35,7 @@ scm:git:git@github.com:jsprit/jsprit.git scm:git:https://github.com/jsprit/jsprit.git http://github.com/jsprit/jsprit/tree/master - HEAD + v1.3.1 From 3dfa7b2d59f1d92d80bf645461f1904ce4919588 Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Sat, 14 Jun 2014 14:14:12 +0200 Subject: [PATCH 7/9] [maven-release-plugin] prepare for next development iteration --- jsprit-analysis/pom.xml | 2 +- jsprit-core/pom.xml | 2 +- jsprit-examples/pom.xml | 2 +- jsprit-instances/pom.xml | 2 +- pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jsprit-analysis/pom.xml b/jsprit-analysis/pom.xml index 8a89c40a..e89f2eb3 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 1.3.1 + 1.3.2-SNAPSHOT 4.0.0 jsprit-analysis diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index fedc71d5..3544e422 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1 + 1.3.2-SNAPSHOT 4.0.0 jsprit-core diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index c0055750..8b10f4d7 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1 + 1.3.2-SNAPSHOT 4.0.0 diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index b8bc3629..f6561faa 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1 + 1.3.2-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 05984308..5aad4729 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ jsprit jsprit - 1.3.1 + 1.3.2-SNAPSHOT pom @@ -35,7 +35,7 @@ scm:git:git@github.com:jsprit/jsprit.git scm:git:https://github.com/jsprit/jsprit.git http://github.com/jsprit/jsprit/tree/master - v1.3.1 + HEAD From 06614a4daed6f0ed04ac71e2ac21c347ffe2da1e Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Sat, 14 Jun 2014 14:23:42 +0200 Subject: [PATCH 8/9] updated changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc81d7e5..74942252 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ Change-log ========== +**v1.3.1** @ 2014-06-14 + +jsprit-core +- bugfix [#104](https://github.com/jsprit/jsprit/issues/104) +- bugfix [#105](https://github.com/jsprit/jsprit/issues/105) + **v1.3.0** @ 2014-05-19 - [detailed changelog](https://github.com/jsprit/misc-rep/raw/master/changelog_1.2.0_to_1.3.0.txt) - removed deprecated code (that had been deprecated before v1.2.0) which is definitely a break change (see details above) From c7fd1a96ed2f34f754f26c291692193411c0f409 Mon Sep 17 00:00:00 2001 From: jsprit Date: Sat, 14 Jun 2014 23:23:37 +0200 Subject: [PATCH 9/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 057394c0..7a205326 100644 --- a/README.md +++ b/README.md @@ -60,4 +60,4 @@ It is mainly inspired by my research group at [KIT-ECON](http://netze.econ.kit.e If you have questions or if you use jsprit, it would be great you give feedback and let me know your experience: -Email: jsprit.vehicle.routing@gmail.com +Email: info@jspr.it