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

make old RegretInsertion the default

Browse source
This commit is contained in:
oblonski 2015-10-19 13:35:43 +02:00
parent 149b657238
commit bce6f1a9f5
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -407,7 +407,7 @@ public class Jsprit {
final DefaultScorer scorer; final DefaultScorer scorer;
if (es != null) { if (es != null) {
RegretInsertionConcurrent regretInsertion = (RegretInsertionConcurrent) new InsertionBuilder(vrp, fm, stateManager, constraintManager) RegretInsertionConcurrentSlow regretInsertion = (RegretInsertionConcurrentSlow) new InsertionBuilder(vrp, fm, stateManager, constraintManager)
.setInsertionStrategy(InsertionBuilder.Strategy.REGRET) .setInsertionStrategy(InsertionBuilder.Strategy.REGRET)
.setConcurrentMode(es, noThreads) .setConcurrentMode(es, noThreads)
.considerFixedCosts(toDouble(getProperty(Parameter.FIXED_COST_PARAM.toString()))) .considerFixedCosts(toDouble(getProperty(Parameter.FIXED_COST_PARAM.toString())))
@ -418,7 +418,7 @@ public class Jsprit {
regretInsertion.setScoringFunction(scorer); regretInsertion.setScoringFunction(scorer);
regret = regretInsertion; regret = regretInsertion;
} else { } else {
RegretInsertion regretInsertion = (RegretInsertion) new InsertionBuilder(vrp, fm, stateManager, constraintManager) RegretInsertionSlow regretInsertion = (RegretInsertionSlow) new InsertionBuilder(vrp, fm, stateManager, constraintManager)
.setInsertionStrategy(InsertionBuilder.Strategy.REGRET) .setInsertionStrategy(InsertionBuilder.Strategy.REGRET)
.setAllowVehicleSwitch(toBoolean(getProperty(Parameter.VEHICLE_SWITCH.toString()))) .setAllowVehicleSwitch(toBoolean(getProperty(Parameter.VEHICLE_SWITCH.toString())))
.considerFixedCosts(toDouble(getProperty(Parameter.FIXED_COST_PARAM.toString()))) .considerFixedCosts(toDouble(getProperty(Parameter.FIXED_COST_PARAM.toString())))

8
jsprit-core/src/main/java/jsprit/core/algorithm/recreate/InsertionBuilder.java
View file

@ -166,13 +166,13 @@ public class InsertionBuilder {
} }
} else if (strategy.equals(Strategy.REGRET)) { } else if (strategy.equals(Strategy.REGRET)) {
if (executor == null) { if (executor == null) {
RegretInsertion regret = new RegretInsertion(costCalculator, vrp, fleetManager); RegretInsertionSlow regret = new RegretInsertionSlow(costCalculator, vrp);
regret.setSwitchAllowed(allowVehicleSwitch); // regret.setSwitchAllowed(allowVehicleSwitch);
insertion = regret; insertion = regret;
} else { } else {
RegretInsertionConcurrent regret = new RegretInsertionConcurrent(costCalculator, vrp, executor, fleetManager); RegretInsertionConcurrentSlow regret = new RegretInsertionConcurrentSlow(costCalculator, vrp, executor);
regret.setSwitchAllowed(allowVehicleSwitch); // regret.setSwitchAllowed(allowVehicleSwitch);
insertion = regret; insertion = regret;
} }
} else throw new IllegalStateException("you should never get here"); } else throw new IllegalStateException("you should never get here");