Merge branch 'master' into PickupAndDelivery

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

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. 
 

jsprit-analysis/pom.xml

@@ -22,7 +22,7 @@
   <parent>
   	<groupId>jsprit</groupId>
   	<artifactId>jsprit</artifactId>
-  	<version>0.0.4-SNAPSHOT</version>
+  	<version>0.0.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jsprit-analysis</artifactId>

jsprit-core/pom.xml

@@ -22,7 +22,7 @@
   <parent>
   	<groupId>jsprit</groupId>
   	<artifactId>jsprit</artifactId>
-  	<version>0.0.4-SNAPSHOT</version>
+  	<version>0.0.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jsprit-core</artifactId>

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() {

jsprit-examples/pom.xml

@@ -22,7 +22,7 @@
   <parent>
   	<groupId>jsprit</groupId>
   	<artifactId>jsprit</artifactId>
-  	<version>0.0.4-SNAPSHOT</version>
+  	<version>0.0.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   

jsprit-instances/pom.xml

@@ -22,7 +22,7 @@
   <parent>
   	<groupId>jsprit</groupId>
   	<artifactId>jsprit</artifactId>
-  	<version>0.0.4-SNAPSHOT</version>
+  	<version>0.0.5-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
  

pom.xml

@@ -23,7 +23,7 @@
   
   <groupId>jsprit</groupId>
   <artifactId>jsprit</artifactId>
-  <version>0.0.4-SNAPSHOT</version>
+  <version>0.0.5-SNAPSHOT</version>
   
   <packaging>pom</packaging>