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

add option to set abs. initial threshold

Browse source
This commit is contained in:
oblonski 2017-05-11 16:42:48 +02:00
parent c1c140e683
commit 69537d109c
No known key found for this signature in database
GPG key ID: 179DE487285680D1
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/box/Jsprit.java
View file

@ -112,6 +112,7 @@ public class Jsprit {
WORST_MAX_SHARE("worst.max_share"), WORST_MAX_SHARE("worst.max_share"),
THRESHOLD_ALPHA("threshold.alpha"), THRESHOLD_ALPHA("threshold.alpha"),
THRESHOLD_INI("threshold.ini"), THRESHOLD_INI("threshold.ini"),
THRESHOLD_INI_ABS("threshold.ini_abs"),
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"),
@ -602,15 +603,19 @@ public class Jsprit {
IterationStartsListener schrimpfThreshold = null; IterationStartsListener schrimpfThreshold = null;
if(acceptor == null) { if(acceptor == null) {
final SchrimpfAcceptance schrimpfAcceptance = new SchrimpfAcceptance(1, toDouble(getProperty(Parameter.THRESHOLD_ALPHA.toString()))); final SchrimpfAcceptance schrimpfAcceptance = new SchrimpfAcceptance(1, toDouble(getProperty(Parameter.THRESHOLD_ALPHA.toString())));
schrimpfThreshold = new IterationStartsListener() { if (properties.containsKey(Parameter.THRESHOLD_INI_ABS.toString())) {
@Override schrimpfAcceptance.setInitialThreshold(Double.valueOf(properties.getProperty(Parameter.THRESHOLD_INI_ABS.toString())));
public void informIterationStarts(int i, VehicleRoutingProblem problem, Collection<VehicleRoutingProblemSolution> solutions) { } else {
if (i == 1) { schrimpfThreshold = new IterationStartsListener() {
double initialThreshold = Solutions.bestOf(solutions).getCost() * toDouble(getProperty(Parameter.THRESHOLD_INI.toString())); @Override
schrimpfAcceptance.setInitialThreshold(initialThreshold); public void informIterationStarts(int i, VehicleRoutingProblem problem, Collection<VehicleRoutingProblemSolution> solutions) {
if (i == 1) {
double initialThreshold = Solutions.bestOf(solutions).getCost() * toDouble(getProperty(Parameter.THRESHOLD_INI.toString()));
schrimpfAcceptance.setInitialThreshold(initialThreshold);
}
} }
} };
}; }
acceptor = schrimpfAcceptance; acceptor = schrimpfAcceptance;
} }