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

parameterize construction algo

Browse source
This commit is contained in:
oblonski 2015-03-12 20:44:32 +01:00
parent e215ea76d8
commit 1848f22fe3
1 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
jsprit-core/src/main/java/jsprit/core/algorithm/box/Jsprit.java
View file

@ -36,6 +36,22 @@ import java.util.concurrent.Executors;
*/ */
public class Jsprit { public class Jsprit {
public enum Construction {
BEST_INSERTION("best_insertion"), REGRET_INSERTION("regret_insertion");
String name;
Construction(String name){
this.name = name;
}
public String toString(){
return name;
}
}
public enum Strategy { public enum Strategy {
RADIAL_BEST("radial_best"), RADIAL_BEST("radial_best"),
@ -78,7 +94,8 @@ public class Jsprit {
INSERTION_NOISE_LEVEL("insertion.noise_level"), INSERTION_NOISE_LEVEL("insertion.noise_level"),
INSERTION_NOISE_PROB("insertion.noise_prob"), INSERTION_NOISE_PROB("insertion.noise_prob"),
RUIN_WORST_NOISE_LEVEL("worst.noise_level"), RUIN_WORST_NOISE_LEVEL("worst.noise_level"),
RUIN_WORST_NOISE_PROB("worst.noise_prob"); RUIN_WORST_NOISE_PROB("worst.noise_prob"),
CONSTRUCTION("construction");
String paraName; String paraName;
@ -160,6 +177,7 @@ public class Jsprit {
defaults.put(Parameter.RUIN_WORST_NOISE_LEVEL.toString(),String.valueOf(0.15)); defaults.put(Parameter.RUIN_WORST_NOISE_LEVEL.toString(),String.valueOf(0.15));
defaults.put(Parameter.RUIN_WORST_NOISE_PROB.toString(),String.valueOf(0.2)); defaults.put(Parameter.RUIN_WORST_NOISE_PROB.toString(),String.valueOf(0.2));
defaults.put(Parameter.VEHICLE_SWITCH.toString(),String.valueOf(true)); defaults.put(Parameter.VEHICLE_SWITCH.toString(),String.valueOf(true));
defaults.put(Parameter.CONSTRUCTION.toString(),Construction.REGRET_INSERTION.toString());
return defaults; return defaults;
} }
@ -419,8 +437,14 @@ public class Jsprit {
.withStrategy(worst_best, toDouble(getProperty(Strategy.WORST_BEST.toString()))) .withStrategy(worst_best, toDouble(getProperty(Strategy.WORST_BEST.toString())))
.withStrategy(worst_regret, toDouble(getProperty(Strategy.WORST_REGRET.toString()))) .withStrategy(worst_regret, toDouble(getProperty(Strategy.WORST_REGRET.toString())))
.withStrategy(clusters_regret,toDouble(getProperty(Strategy.CLUSTER_REGRET.toString()))) .withStrategy(clusters_regret,toDouble(getProperty(Strategy.CLUSTER_REGRET.toString())))
.withStrategy(clusters_best,toDouble(getProperty(Strategy.CLUSTER_BEST.toString()))) .withStrategy(clusters_best,toDouble(getProperty(Strategy.CLUSTER_BEST.toString())));
.constructInitialSolutionWith(regret, objectiveFunction); if (getProperty(Parameter.CONSTRUCTION.toString()).equals(Construction.BEST_INSERTION.toString())){
prettyBuilder.constructInitialSolutionWith(best, objectiveFunction);
}
else{
prettyBuilder.constructInitialSolutionWith(regret, objectiveFunction);
}
VehicleRoutingAlgorithm vra = prettyBuilder.build(); VehicleRoutingAlgorithm vra = prettyBuilder.build();
vra.addListener(schrimpfThreshold); vra.addListener(schrimpfThreshold);