From cda8f833b052053b5d9d82e373de380aa2a90e0e Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Thu, 17 Oct 2013 16:20:50 +0200 Subject: [PATCH 1/8] add changelog --- Changelog.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Changelog.md diff --git a/Changelog.md b/Changelog.md new file mode 100644 index 00000000..1a8c1bc5 --- /dev/null +++ b/Changelog.md @@ -0,0 +1,21 @@ +Change-log +========== +**v0.0.4** @ 2013-10-17 + +- A number of internal improvements +- License change from GPLv2 to LGPLv3 +- Add premature algorithm termination: PrematureAlgorithmBreaker.java and its implementations +- SearchStrategy.java: public SearchStrategy(SolutionSelector,SolutionAcceptor) --> public SearchStratgy(SolutionSelector,SolutionAcceptor,SolutionCostCalculator) +- SearchStrategy.java: public boolean run(...) --> public DiscoveredSolution run(...) +- VehicleImpl.VehicleType.Builder --> VehicleTypeImpl.Builder +- VehicleImpl.VehicleBuilder --> VehicleImpl.Builder + +**v0.0.3** @ 2013-06-04 + +- Bug fix - access resources in jar + +**v0.0.2** @ 2013-06-03 + +- Bug fix - access resources in jar + +**v0.0.1** @ 2013-06-02 From c2ebc02579d4635e5388c848a31b2dea8d8a38ab Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Thu, 17 Oct 2013 16:29:16 +0200 Subject: [PATCH 2/8] [maven-release-plugin] prepare release v0.0.4 --- 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 1fc93d43..36727922 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4-SNAPSHOT + 0.0.4 4.0.0 jsprit-analysis diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index 80a1cd52..2aa66144 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4-SNAPSHOT + 0.0.4 4.0.0 jsprit-core diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index bb5def55..890319d3 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4-SNAPSHOT + 0.0.4 4.0.0 diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index 3c0e1d73..39a7f34b 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4-SNAPSHOT + 0.0.4 4.0.0 diff --git a/pom.xml b/pom.xml index 7aae13de..d581193e 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ jsprit jsprit - 0.0.4-SNAPSHOT + 0.0.4 pom @@ -55,7 +55,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 + v0.0.4 From 5530d9f728c519fc1a87c511d476884fb68f5fa2 Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Thu, 17 Oct 2013 16:29:40 +0200 Subject: [PATCH 3/8] [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 36727922..afb0be4e 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4 + 0.0.5-SNAPSHOT 4.0.0 jsprit-analysis diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index 2aa66144..a3ba09b5 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4 + 0.0.5-SNAPSHOT 4.0.0 jsprit-core diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index 890319d3..357f6531 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4 + 0.0.5-SNAPSHOT 4.0.0 diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index 39a7f34b..44d5832d 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4 + 0.0.5-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index d581193e..3b3c5309 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ jsprit jsprit - 0.0.4 + 0.0.5-SNAPSHOT pom @@ -55,7 +55,7 @@ scm:git:git@github.com:jsprit/jsprit.git scm:git:https://github.com/jsprit/jsprit.git http://github.com/jsprit/jsprit/tree/master - v0.0.4 + HEAD From f0f42d76800e4823c56405d5e69ffe3c3639a8b3 Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Thu, 17 Oct 2013 16:31:38 +0200 Subject: [PATCH 4/8] [maven-release-plugin] prepare release vq --- jsprit-analysis/pom.xml | 3 ++- jsprit-core/pom.xml | 3 ++- jsprit-examples/pom.xml | 3 ++- jsprit-instances/pom.xml | 3 ++- pom.xml | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/jsprit-analysis/pom.xml b/jsprit-analysis/pom.xml index afb0be4e..ba381829 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -22,10 +22,11 @@ jsprit jsprit - 0.0.5-SNAPSHOT + q 4.0.0 jsprit-analysis + 0.0.5 jar diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index a3ba09b5..44d61352 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -22,10 +22,11 @@ jsprit jsprit - 0.0.5-SNAPSHOT + q 4.0.0 jsprit-core + 0.0.5 jsprit-core diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index 357f6531..ab7626f0 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -22,11 +22,12 @@ jsprit jsprit - 0.0.5-SNAPSHOT + q 4.0.0 jsprit-examples + 0.0.5 diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index 44d5832d..0ffaa751 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -22,11 +22,12 @@ jsprit jsprit - 0.0.5-SNAPSHOT + q 4.0.0 jsprit-instances + 0.0.5 jsprit-instances jar diff --git a/pom.xml b/pom.xml index 3b3c5309..3e86924f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ jsprit jsprit - 0.0.5-SNAPSHOT + q pom @@ -55,7 +55,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 + vq From de71cae33745bb34a3b7ca6c0d6bd8140b00a88d Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Thu, 17 Oct 2013 16:35:20 +0200 Subject: [PATCH 5/8] [maven-release-plugin] rollback the release of vq --- jsprit-analysis/pom.xml | 3 +-- jsprit-core/pom.xml | 3 +-- jsprit-examples/pom.xml | 3 +-- jsprit-instances/pom.xml | 3 +-- pom.xml | 4 ++-- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/jsprit-analysis/pom.xml b/jsprit-analysis/pom.xml index ba381829..afb0be4e 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -22,11 +22,10 @@ jsprit jsprit - q + 0.0.5-SNAPSHOT 4.0.0 jsprit-analysis - 0.0.5 jar diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index 44d61352..a3ba09b5 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -22,11 +22,10 @@ jsprit jsprit - q + 0.0.5-SNAPSHOT 4.0.0 jsprit-core - 0.0.5 jsprit-core diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index ab7626f0..357f6531 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -22,12 +22,11 @@ jsprit jsprit - q + 0.0.5-SNAPSHOT 4.0.0 jsprit-examples - 0.0.5 diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index 0ffaa751..44d5832d 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -22,12 +22,11 @@ jsprit jsprit - q + 0.0.5-SNAPSHOT 4.0.0 jsprit-instances - 0.0.5 jsprit-instances jar diff --git a/pom.xml b/pom.xml index 3e86924f..3b3c5309 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ jsprit jsprit - q + 0.0.5-SNAPSHOT pom @@ -55,7 +55,7 @@ scm:git:git@github.com:jsprit/jsprit.git scm:git:https://github.com/jsprit/jsprit.git http://github.com/jsprit/jsprit/tree/master - vq + HEAD From b991b9f34e092c3822de33dc40047c191e6ddc47 Mon Sep 17 00:00:00 2001 From: jsprit Date: Thu, 17 Oct 2013 17:24:25 +0200 Subject: [PATCH 6/8] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6c6175f0..56ac6955 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,8 @@ This software is released under [LGPL](http://opensource.org/licenses/LGPL-3.0). [Add the latest snapshot to your pom](https://github.com/jsprit/jsprit/wiki/Add-latest-snapshot-to-your-pom). +[Add the latest release to your pom](https://github.com/jsprit/jsprit/wiki/Add-latest-release-to-your-pom). + ##About The jsprit-project is created and maintained by Stefan Schröder. It is motivated by two issues. From ba75c095deebbc2d2117734a08a3764839490b86 Mon Sep 17 00:00:00 2001 From: jsprit Date: Thu, 17 Oct 2013 17:31:13 +0200 Subject: [PATCH 7/8] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 56ac6955..1213a311 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ can be used, and a dynamic and interactive visualiser greatly enhances the analy - continues improvement of code, handling and performance - relaxed API to easily build algorithms from scratch - VRP with pickups and deliveries -- release 1.0.0 ##Documentation From e9a3f98671149678485344ff5d436fb17fdae132 Mon Sep 17 00:00:00 2001 From: oblonski <4sschroeder@gmail.com> Date: Fri, 18 Oct 2013 05:26:34 +0200 Subject: [PATCH 8/8] clean TourActivities - remove redundant code --- .../src/main/java/basics/route/TourActivities.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/jsprit-core/src/main/java/basics/route/TourActivities.java b/jsprit-core/src/main/java/basics/route/TourActivities.java index 68116361..1625b683 100644 --- a/jsprit-core/src/main/java/basics/route/TourActivities.java +++ b/jsprit-core/src/main/java/basics/route/TourActivities.java @@ -145,12 +145,6 @@ public class TourActivities { activityRemoved = true; } } - else if(c instanceof ServiceActivity){ - if(job.equals(((ServiceActivity) c).getJob())){ - tourActivities.remove(c); - activityRemoved = true; - } - } } if(jobRemoved != activityRemoved) throw new IllegalStateException("job removed, but belonging activity not."); return activityRemoved; @@ -177,14 +171,10 @@ public class TourActivities { } private void addJob(TourActivity act) { - if(act instanceof JobActivity){ Job job = ((JobActivity) act).getJob(); jobs.add(job); } - else if(act instanceof ServiceActivity){ - jobs.add(((ServiceActivity) act).getJob()); - } } public int jobSize() {