From cd6477ce146ce989f64020a86b37487c8fb8a69a Mon Sep 17 00:00:00 2001
From: oblonski <jsprit.vehicle.routing@gmail.com>
Date: Thu, 14 Dec 2017 16:10:17 +0100
Subject: [PATCH] add helper methods for skills

---
 .../com/graphhopper/jsprit/core/problem/job/Service.java | 9 ++++++---
 .../graphhopper/jsprit/core/problem/job/Shipment.java    | 9 ++++++---
 .../jsprit/core/problem/vehicle/VehicleImpl.java         | 8 ++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java
index 1f4f436e..99608c23 100644
--- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java
+++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Service.java
@@ -222,10 +222,13 @@ public class Service extends AbstractJob {
             return this;
         }
 
+        public Builder<T> addAllRequiredSkills(Collection<String> skills) {
+            skillBuilder.addAllSkills(skills);
+            return this;
+        }
+
         public Builder<T> addAllRequiredSkills(Skills skills){
-            for(String s : skills.values()){
-                skillBuilder.addSkill(s);
-            }
+            skillBuilder.addAllSkills(skills.values());
             return this;
         }
 
diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java
index 60085b3a..8d356a02 100644
--- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java
+++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/job/Shipment.java
@@ -261,10 +261,13 @@ public class Shipment extends AbstractJob {
             return this;
         }
 
+        public Builder addAllRequiredSkills(Collection<String> skills) {
+            skillBuilder.addAllSkills(skills);
+            return this;
+        }
+
         public Builder addAllRequiredSkills(Skills skills) {
-            for (String s : skills.values()) {
-                addRequiredSkill(s);
-            }
+            addAllRequiredSkills(skills.values());
             return this;
         }
 
diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java
index 3686d703..0731abf2 100644
--- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java
+++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/vehicle/VehicleImpl.java
@@ -24,6 +24,8 @@ import com.graphhopper.jsprit.core.problem.job.Break;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Collection;
+
 
 /**
  * Implementation of {@link Vehicle}.
@@ -234,6 +236,12 @@ public class VehicleImpl extends AbstractVehicle {
             return this;
         }
 
+        public Builder addAllSkills(Collection<String> skills) {
+            if (skills == null) throw new IllegalArgumentException("Skills of vehicle " + id + " must not be null");
+            skillBuilder.addAllSkills(skills);
+            return this;
+        }
+
         public Builder addSkill(String skill) {
             if (skill == null) throw new IllegalArgumentException("Skill of vehicle " + id + " must not be null");
             skillBuilder.addSkill(skill);