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) 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 diff --git a/jsprit-analysis/pom.xml b/jsprit-analysis/pom.xml index 0190260d..e89f2eb3 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT 4.0.0 jsprit-analysis diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index c26f1168..3544e422 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT 4.0.0 jsprit-core 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; } /** 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; diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index 205c96bb..8b10f4d7 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT 4.0.0 diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index 6f353c27..f6561faa 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -3,7 +3,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 5ed85642..5aad4729 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ jsprit jsprit - 1.3.1-SNAPSHOT + 1.3.2-SNAPSHOT pom @@ -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}