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

Merge branch 'routebuilder-break-location'

Browse source 
# Conflicts:
#	jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/solution/route/VehicleRoute.java
This commit is contained in:
oblonski 2017-04-26 15:39:27 +02:00
parent 0fb7469d1f
commit 2d9be8304a
No known key found for this signature in database
GPG key ID: 179DE487285680D1
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -122,10 +122,10 @@ public class Jsprit {
MAX_TRANSPORT_COSTS("max_transport_costs"), MAX_TRANSPORT_COSTS("max_transport_costs"),
CONSTRUCTION("construction"), CONSTRUCTION("construction"),
BREAK_SCHEDULING("break_scheduling"), BREAK_SCHEDULING("break_scheduling"),
STRING_KMIN("string_kmin"), STRING_K_MIN("string_kmin"),
STRING_KMAX("string_kmax"), STRING_K_MAX("string_kmax"),
STRING_LMIN("string_lmin"), STRING_L_MIN("string_lmin"),
STRING_LMAX("string_lmax"); STRING_L_MAX("string_lmax");
String paraName; String paraName;
@ -189,10 +189,10 @@ public class Jsprit {
defaults.put(Strategy.STRING_BEST.toString(), "0.0"); defaults.put(Strategy.STRING_BEST.toString(), "0.0");
defaults.put(Strategy.STRING_REGRET.toString(), "0.0"); defaults.put(Strategy.STRING_REGRET.toString(), "0.0");
defaults.put(Parameter.STRING_KMIN.toString(), "1"); defaults.put(Parameter.STRING_K_MIN.toString(), "1");
defaults.put(Parameter.STRING_KMAX.toString(), "6"); defaults.put(Parameter.STRING_K_MAX.toString(), "6");
defaults.put(Parameter.STRING_LMIN.toString(), "10"); defaults.put(Parameter.STRING_L_MIN.toString(), "10");
defaults.put(Parameter.STRING_LMAX.toString(), "30"); defaults.put(Parameter.STRING_L_MAX.toString(), "30");
defaults.put(Strategy.WORST_BEST.toString(), "0."); defaults.put(Strategy.WORST_BEST.toString(), "0.");
defaults.put(Strategy.WORST_REGRET.toString(), "1."); defaults.put(Strategy.WORST_REGRET.toString(), "1.");
@ -490,10 +490,10 @@ public class Jsprit {
random) random)
); );
int kMin = toInteger(properties.getProperty(Parameter.STRING_KMIN.toString())); int kMin = toInteger(properties.getProperty(Parameter.STRING_K_MIN.toString()));
int kMax = toInteger(properties.getProperty(Parameter.STRING_KMAX.toString())); int kMax = toInteger(properties.getProperty(Parameter.STRING_K_MAX.toString()));
int lMin = toInteger(properties.getProperty(Parameter.STRING_LMIN.toString())); int lMin = toInteger(properties.getProperty(Parameter.STRING_L_MIN.toString()));
int lMax = toInteger(properties.getProperty(Parameter.STRING_LMAX.toString())); int lMax = toInteger(properties.getProperty(Parameter.STRING_L_MAX.toString()));
final RuinString stringRuin = new RuinString(vrp, jobNeighborhoods); final RuinString stringRuin = new RuinString(vrp, jobNeighborhoods);
stringRuin.setNoRoutes(kMin, kMax); stringRuin.setNoRoutes(kMin, kMax);

4
jsprit-core/src/main/java/com/graphhopper/jsprit/core/algorithm/ruin/RuinString.java
View file

@ -31,13 +31,13 @@ import java.util.*;
/** /**
* RuinString is adopted from * RuinString is adopted from
* * <p>
* Technical report 7.11.2016 * Technical report 7.11.2016
* A Fresh Ruin & Recreate Implementation for the Capacitated Vehicle Routing Problem * A Fresh Ruin & Recreate Implementation for the Capacitated Vehicle Routing Problem
* Jan Christiaens, Greet Vanden Berghe * Jan Christiaens, Greet Vanden Berghe
* KU Leuven, Department of Computer Science, CODeS & iMinds-ITEC * KU Leuven, Department of Computer Science, CODeS & iMinds-ITEC
* Gebr. De Smetstraat 1, 9000 Gent, Belgium, jan.christiaens@cs.kuleuven.be, greet.vandenberghe@cs.kuleuven.be * Gebr. De Smetstraat 1, 9000 Gent, Belgium, jan.christiaens@cs.kuleuven.be, greet.vandenberghe@cs.kuleuven.be
* * <p>
* https://lirias.kuleuven.be/bitstream/123456789/556398/1/asb_rr_2016.pdf * https://lirias.kuleuven.be/bitstream/123456789/556398/1/asb_rr_2016.pdf
* *
* @author stefan * @author stefan