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

fixed bug #263

Browse source
This commit is contained in:
oblonski 2016-07-27 16:09:21 +02:00
parent 9e6ff24cab
commit 5b8ca8e965
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -70,8 +70,8 @@ class JobNeighborhoodsOptimized implements JobNeighborhoods {
this.vrp = vrp; this.vrp = vrp;
this.jobDistance = jobDistance; this.jobDistance = jobDistance;
this.capacity = capacity; this.capacity = capacity;
neighbors = new int[vrp.getJobs().size()][capacity]; neighbors = new int[vrp.getJobsInclusiveInitialJobsInRoutes().size()+1][capacity];
jobs = new Job[vrp.getJobs().size()+1]; jobs = new Job[vrp.getJobsInclusiveInitialJobsInRoutes().size()+1];
logger.debug("initialize {}", this); logger.debug("initialize {}", this);
} }
@ -97,10 +97,10 @@ class JobNeighborhoodsOptimized implements JobNeighborhoods {
logger.debug("pre-process distances between locations ..."); logger.debug("pre-process distances between locations ...");
StopWatch stopWatch = new StopWatch(); StopWatch stopWatch = new StopWatch();
stopWatch.start(); stopWatch.start();
for (Job job_i : vrp.getJobs().values()) { for (Job job_i : vrp.getJobsInclusiveInitialJobsInRoutes().values()) {
jobs[job_i.getIndex()] = job_i; jobs[job_i.getIndex()] = job_i;
List<ReferencedJob> jobList = new ArrayList<ReferencedJob>(vrp.getJobs().size()); List<ReferencedJob> jobList = new ArrayList<ReferencedJob>(vrp.getJobsInclusiveInitialJobsInRoutes().values().size());
for (Job job_j : vrp.getJobs().values()) { for (Job job_j : vrp.getJobsInclusiveInitialJobsInRoutes().values()) {
if (job_i == job_j) continue; if (job_i == job_j) continue;
double distance = jobDistance.getDistance(job_i, job_j); double distance = jobDistance.getDistance(job_i, job_j);
if (distance > maxDistance) maxDistance = distance; if (distance > maxDistance) maxDistance = distance;

7
jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/VehicleRoutingProblem.java
View file

@ -546,6 +546,7 @@ public class VehicleRoutingProblem {
*/ */
private final Map<String, Job> jobs; private final Map<String, Job> jobs;
private final Map<String, Job> allJobs;
/** /**
* Collection that contains available vehicles. * Collection that contains available vehicles.
*/ */
@ -593,6 +594,7 @@ public class VehicleRoutingProblem {
this.activityMap = builder.activityMap; this.activityMap = builder.activityMap;
this.nuActivities = builder.activityIndexCounter; this.nuActivities = builder.activityIndexCounter;
this.allLocations = builder.allLocations; this.allLocations = builder.allLocations;
this.allJobs = builder.tentativeJobs;
logger.info("setup problem: {}", this); logger.info("setup problem: {}", this);
} }
@ -623,6 +625,9 @@ public class VehicleRoutingProblem {
return Collections.unmodifiableMap(jobs); return Collections.unmodifiableMap(jobs);
} }
public Map<String, Job> getJobsInclusiveInitialJobsInRoutes(){
return Collections.unmodifiableMap(allJobs);
}
/** /**
* Returns a copy of initial vehicle routes. * Returns a copy of initial vehicle routes.
* *
@ -685,6 +690,8 @@ public class VehicleRoutingProblem {
return Collections.unmodifiableList(activityMap.get(job)); return Collections.unmodifiableList(activityMap.get(job));
} }
// public Map<Job,List<AbstractActivity>> getActivityMap() { return Collections.unmodifiableMap(activityMap); }
/** /**
* @return total number of activities * @return total number of activities
*/ */

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

@ -142,4 +142,6 @@ public class JobNeighborhoodsOptimizedTest {
assertEquals(2, services.size()); assertEquals(2, services.size());
} }
} }