mirror of
https://github.com/graphhopper/jsprit.git
synced 2020-01-24 07:45:05 +01:00
Merge pull request #57 from bringg/ruin_cluster_from_master
ruin cluster
This commit is contained in:
commit
c0f713c7ad
1 changed files with 7 additions and 2 deletions
|
|
@ -889,8 +889,13 @@ public class VehicleRoutingAlgorithms {
|
|||
ruin = getRadialRuin(vrp, routeStates, definedClasses, ruinKey, shareToRuin, jobDistance);
|
||||
} else if (ruin_name.equals("clusterRuin")) {
|
||||
String initialNumberJobsToRemoveString = moduleConfig.getString("ruin.initRemoveJobs");
|
||||
if (initialNumberJobsToRemoveString == null) throw new IllegalStateException("module.ruin.initRemoveJobs is missing.");
|
||||
int initialNumberJobsToRemove = Integer.valueOf(initialNumberJobsToRemoveString);
|
||||
String shareFactor = moduleConfig.getString("ruin.share");
|
||||
int initialNumberJobsToRemove;
|
||||
if (initialNumberJobsToRemoveString != null)
|
||||
initialNumberJobsToRemove = Integer.valueOf(initialNumberJobsToRemoveString);
|
||||
else if(shareFactor != null)
|
||||
initialNumberJobsToRemove = (int) (Double.valueOf(shareFactor) * vrp.getJobs().size());
|
||||
else throw new IllegalStateException("module.ruin.initRemoveJobs is missing.");
|
||||
ruin = getClusterRuin(vrp, routeStates, definedClasses, ruinKey, initialNumberJobsToRemove);
|
||||
} else throw new IllegalStateException("ruin[@name] " + ruin_name + " is not known. Use either randomRuin or radialRuin.");
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue