trans/graphhopper-jsprit
1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
Code Issues Releases Wiki Activity

Merge pull request #456 from jmartin127/master

Browse source 
Preventing ArrayIndexOutOfBoundsException when optimizing neighborhoods.
This commit is contained in:
Stefan Schröder 2019-08-05 22:20:24 +02:00 • committed by GitHub
commit da0bff3ac9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsOptimized.java
View file

@ -95,6 +95,10 @@ class JobNeighborhoodsOptimized implements JobNeighborhoods {
@Override
public Iterator<Job> 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);
}

17
jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/ruin/JobNeighborhoodsOptimizedTest.java
View file

@ -21,8 +21,10 @@ 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;
@ -48,6 +50,7 @@ public class JobNeighborhoodsOptimizedTest {
Service s5;
Service s6;
Service s7;
Break b1;
@Before
public void doBefore() {
@ -60,6 +63,8 @@ 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();
@ -141,6 +146,16 @@ public class JobNeighborhoodsOptimizedTest {
assertEquals(2, services.size());
}
@Test
public void whenRequestingNeighborsForZeroIndexBreak_itShouldReturnEmptyIterator() {
JobNeighborhoodsOptimized jn = new JobNeighborhoodsOptimized(vrp,jobDistance,2);
jn.initialise();
Iterator<Job> iter = jn.getNearestNeighborsIterator(100, b1);
List<Service> services = new ArrayList<Service>();
while (iter.hasNext()) {
services.add((Service) iter.next());
}
assertEquals(0, services.size());
}
}