From 7d2881f4c17347409dc6745aa07113226e4251fb Mon Sep 17 00:00:00 2001
From: oblonski <jsprit.vehicle.routing@gmail.com>
Date: Mon, 30 Jan 2017 20:02:34 +0100
Subject: [PATCH] allow more priority levels - up to 10

---
 .../com/graphhopper/jsprit/core/problem/job/Service.java  | 7 ++++---
 .../com/graphhopper/jsprit/core/problem/job/Shipment.java | 5 +++--
 .../graphhopper/jsprit/core/problem/job/ServiceTest.java  | 7 +++++++
 .../graphhopper/jsprit/core/problem/job/ShipmentTest.java | 8 ++++++++
 4 files changed, 22 insertions(+), 5 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 38a496b6..11be0994 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
@@ -212,15 +212,16 @@ public class Service extends AbstractJob {
         }
 
         /**
-         * Set priority to service. Only 1 = high priority, 2 = medium and 3 = low are allowed.
+         * Set priority to service. Only 1 (very high) to 10 (very low) are allowed.
          * <p>
-         * Default is 2 = medium.
+         * Default is 2.
          *
          * @param priority
          * @return builder
          */
         public Builder<T> setPriority(int priority) {
-            if(priority < 1 || priority > 3) throw new IllegalArgumentException("incorrect priority. only 1 = high, 2 = medium and 3 = low is allowed");
+            if (priority < 1 || priority > 10)
+                throw new IllegalArgumentException("incorrect priority. only priority values from 1 to 10 are allowed where 1 = high and 10 is low");
             this.priority = priority;
             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 3275e901..6b8bde5d 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
@@ -269,7 +269,7 @@ public class Shipment extends AbstractJob {
         }
 
         /**
-         * Set priority to shipment. Only 1 = high priority, 2 = medium and 3 = low are allowed.
+         * Set priority to shipment. Only 1 (high) to 10 (low) are allowed.
          * <p>
          * Default is 2 = medium.
          *
@@ -277,7 +277,8 @@ public class Shipment extends AbstractJob {
          * @return builder
          */
         public Builder setPriority(int priority) {
-            if(priority < 1 || priority > 3) throw new IllegalArgumentException("incorrect priority. only 1 = high, 2 = medium and 3 = low is allowed");
+            if (priority < 1 || priority > 10)
+                throw new IllegalArgumentException("incorrect priority. only 1 (very high) to 10 (very low) are allowed");
             this.priority = priority;
             return this;
         }
diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ServiceTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ServiceTest.java
index bec514e2..f1efce37 100644
--- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ServiceTest.java
+++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ServiceTest.java
@@ -250,6 +250,13 @@ public class ServiceTest {
         Assert.assertEquals(3, s.getPriority());
     }
 
+    @Test
+    public void whenSettingPriorities_itShouldBeSetCorrectly3() {
+        Service s = Service.Builder.newInstance("s").setLocation(Location.newInstance("loc"))
+            .setPriority(10).build();
+        Assert.assertEquals(10, s.getPriority());
+    }
+
     @Test
     public void whenNotSettingPriorities_defaultShouldBe2(){
         Service s = Service.Builder.newInstance("s").setLocation(Location.newInstance("loc"))
diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java
index 6c463d04..cbfa1f26 100644
--- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java
+++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/problem/job/ShipmentTest.java
@@ -401,6 +401,14 @@ public class ShipmentTest {
         Assert.assertEquals(3, s.getPriority());
     }
 
+    @Test
+    public void whenSettingPriorities_itShouldBeSetCorrectly3() {
+        Shipment s = Shipment.Builder.newInstance("s").setPickupLocation(Location.newInstance("loc"))
+            .setDeliveryLocation(Location.newInstance("loc"))
+            .setPriority(10).build();
+        Assert.assertEquals(10, s.getPriority());
+    }
+
     @Test
     public void whenNotSettingPriorities_defaultShouldBe2(){
         Shipment s = Shipment.Builder.newInstance("s").setPickupLocation(Location.newInstance("loc"))