Merge remote-tracking branch 'michalmac/dvrp' into michalmac_master

.gitignore

@@ -11,4 +11,5 @@
 
 # Eclipse
 .project
-.classpath
+.classpath
+/.settings/

jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/Skills.java

@@ -109,7 +109,7 @@ public class Skills {
      * @return true if skill is included, false otherwise
      */
     public boolean containsSkill(String skill) {
-        return skills.contains(skill.toLowerCase());
+        return skills.contains(skill.trim().toLowerCase());// trim to be consistent with addSkill()
     }
 
     @Override

jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/Coordinate.java

@@ -23,9 +23,9 @@ public class Coordinate {
         return new Coordinate(x, y);
     }
 
-    private double x;
+    private final double x;
 
-    private double y;
+    private final double y;
 
     public Coordinate(double x, double y) {
         super();

jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanCosts.java

@@ -60,11 +60,8 @@ public class EuclideanCosts extends AbstractForwardVehicleRoutingTransportCosts
     private double calculateDistance(Location fromLocation, Location toLocation) {
         Coordinate from = null;
         Coordinate to = null;
-        if (fromLocation.getCoordinate() != null & toLocation.getCoordinate() != null) {
+        from = fromLocation.getCoordinate();
-            from = fromLocation.getCoordinate();
+        to = toLocation.getCoordinate();
-            to = toLocation.getCoordinate();
-        }
-        if (from == null || to == null) throw new NullPointerException();
         return calculateDistance(from, to);
     }
 

jsprit-examples/.gitignore

@@ -13,3 +13,4 @@
 .project
 .classpath
 .settings
+/.factorypath