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 diff --git a/license.txt b/LICENSE.txt similarity index 100% rename from license.txt rename to LICENSE.txt diff --git a/README.md b/README.md index 6c6175f0..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 @@ -36,6 +35,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. diff --git a/jsprit-analysis/pom.xml b/jsprit-analysis/pom.xml index 1fc93d43..afb0be4e 100644 --- a/jsprit-analysis/pom.xml +++ b/jsprit-analysis/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4-SNAPSHOT + 0.0.5-SNAPSHOT 4.0.0 jsprit-analysis diff --git a/jsprit-core/pom.xml b/jsprit-core/pom.xml index 80a1cd52..a3ba09b5 100644 --- a/jsprit-core/pom.xml +++ b/jsprit-core/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4-SNAPSHOT + 0.0.5-SNAPSHOT 4.0.0 jsprit-core diff --git a/jsprit-core/src/main/java/basics/route/TourActivities.java b/jsprit-core/src/main/java/basics/route/TourActivities.java index f09d6ac0..a3f5cd57 100644 --- a/jsprit-core/src/main/java/basics/route/TourActivities.java +++ b/jsprit-core/src/main/java/basics/route/TourActivities.java @@ -151,12 +151,6 @@ public class TourActivities { activityRemoved = true; } } - else if(c instanceof ServiceActivity){ - if(job.equals(((ServiceActivity) c).getJob())){ - tourActivities.remove(c); - activityRemoved = true; - } - } } assert jobRemoved == activityRemoved : "job removed, but belonging activity not."; return activityRemoved; @@ -203,9 +197,6 @@ public class TourActivities { Job job = ((JobActivity) act).getJob(); jobs.add(job); } - else if(act instanceof ServiceActivity){ - jobs.add(((ServiceActivity) act).getJob()); - } } /** diff --git a/jsprit-examples/pom.xml b/jsprit-examples/pom.xml index bb5def55..357f6531 100644 --- a/jsprit-examples/pom.xml +++ b/jsprit-examples/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4-SNAPSHOT + 0.0.5-SNAPSHOT 4.0.0 diff --git a/jsprit-instances/pom.xml b/jsprit-instances/pom.xml index 3c0e1d73..44d5832d 100644 --- a/jsprit-instances/pom.xml +++ b/jsprit-instances/pom.xml @@ -22,7 +22,7 @@ jsprit jsprit - 0.0.4-SNAPSHOT + 0.0.5-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 7aae13de..3b3c5309 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ jsprit jsprit - 0.0.4-SNAPSHOT + 0.0.5-SNAPSHOT pom