diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsOptimized.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsOptimized.java index 34e9ae33..58e7a4f0 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsOptimized.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsOptimized.java @@ -95,10 +95,6 @@ class JobNeighborhoodsOptimized implements JobNeighborhoods { @Override public Iterator getNearestNeighborsIterator(int nNeighbors, Job neighborTo) { - if (neighborTo.getIndex() == 0) { - return Collections.emptyIterator(); - } - int[] neighbors = this.neighbors[neighborTo.getIndex()-1]; return new ArrayIterator(nNeighbors,neighbors,jobs); } diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsOptimizedTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsOptimizedTest.java index db80d59a..82f471e9 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsOptimizedTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsOptimizedTest.java @@ -21,10 +21,8 @@ import com.graphhopper.jsprit.core.algorithm.ruin.distance.EuclideanServiceDista import com.graphhopper.jsprit.core.algorithm.ruin.distance.JobDistance; import com.graphhopper.jsprit.core.problem.Location; import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; -import com.graphhopper.jsprit.core.problem.job.Break; import com.graphhopper.jsprit.core.problem.job.Job; import com.graphhopper.jsprit.core.problem.job.Service; - import junit.framework.Assert; import org.junit.Before; import org.junit.Test; @@ -50,7 +48,6 @@ public class JobNeighborhoodsOptimizedTest { Service s5; Service s6; Service s7; - Break b1; @Before public void doBefore() { @@ -63,8 +60,6 @@ public class JobNeighborhoodsOptimizedTest { s5 = Service.Builder.newInstance("s5").addSizeDimension(0, 1).setLocation(Location.newInstance(0, 6)).build(); s6 = Service.Builder.newInstance("s6").addSizeDimension(0, 1).setLocation(Location.newInstance(0, 7)).build(); s7 = Service.Builder.newInstance("s7").addSizeDimension(0, 1).setLocation(Location.newInstance(0, 8)).build(); - - b1 = Break.Builder.newInstance("b1").build(); vrp = builder.addJob(target).addJob(s2).addJob(s3).addJob(s4).addJob(s5).addJob(s6).addJob(s7).build(); @@ -146,16 +141,6 @@ public class JobNeighborhoodsOptimizedTest { assertEquals(2, services.size()); } - @Test - public void whenRequestingNeighborsForZeroIndexBreak_itShouldReturnEmptyIterator() { - JobNeighborhoodsOptimized jn = new JobNeighborhoodsOptimized(vrp,jobDistance,2); - jn.initialise(); - Iterator iter = jn.getNearestNeighborsIterator(100, b1); - List services = new ArrayList(); - while (iter.hasNext()) { - services.add((Service) iter.next()); - } - assertEquals(0, services.size()); - } + }