Merge branch 'master' of https://github.com/jsprit/jsprit.git

CHANGELOG.md

@@ -1,5 +1,11 @@
 Change-log
 ==========
+**v1.3.1** @ 2014-06-14
+
+<em>jsprit-core</em>
+- 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)

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

jsprit-analysis/pom.xml

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

jsprit-core/pom.xml

@@ -3,7 +3,7 @@
   <parent>
   	<groupId>jsprit</groupId>
   	<artifactId>jsprit</artifactId>
-  	<version>1.3.1-SNAPSHOT</version>
+  	<version>1.3.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>jsprit-core</artifactId>

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;
 	}
 	
 	/**

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;

jsprit-examples/pom.xml

@@ -3,7 +3,7 @@
   <parent>
   	<groupId>jsprit</groupId>
   	<artifactId>jsprit</artifactId>
-  	<version>1.3.1-SNAPSHOT</version>
+  	<version>1.3.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   

jsprit-instances/pom.xml

@@ -3,7 +3,7 @@
   <parent>
   	<groupId>jsprit</groupId>
   	<artifactId>jsprit</artifactId>
-  	<version>1.3.1-SNAPSHOT</version>
+  	<version>1.3.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
  

pom.xml

@@ -4,7 +4,7 @@
   
   <groupId>jsprit</groupId>
   <artifactId>jsprit</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.2-SNAPSHOT</version>
   
   <packaging>pom</packaging>
   
@@ -76,7 +76,7 @@
     <directory>target</directory>
     <outputDirectory>target/classes</outputDirectory>
     <testOutputDirectory>target/test-classes</testOutputDirectory>
-    <finalName>${artifactId}-${version}</finalName>
+    <finalName>${project.artifactId}-${project.version}</finalName>
     <resources>
       <resource>
         <directory>src/main/resources</directory>
@@ -205,6 +205,7 @@
 		<plugin>
   			<groupId>org.apache.maven.plugins</groupId>
   			<artifactId>maven-source-plugin</artifactId>
+  			<version>2.2.1</version>
   			<executions>
     			<execution>
       				<id>attach-sources</id>
@@ -218,6 +219,7 @@
 		<plugin>
   			<groupId>org.apache.maven.plugins</groupId>
   			<artifactId>maven-javadoc-plugin</artifactId>
+  			<version>2.9.1</version>
   			<executions>
     			<execution>
       				<id>attach-javadocs</id>
@@ -231,7 +233,7 @@
 		<plugin>
         	<groupId>org.apache.maven.plugins</groupId>
         	<artifactId>maven-release-plugin</artifactId>
-        	<version>2.4.1</version>
+        	<version>2.5</version>
         	<configuration>
           		<tagNameFormat>v@{project.version}</tagNameFormat>
         	</configuration>