1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00
This commit is contained in:
oblonski 2014-05-09 12:30:25 +02:00
parent fa7ff47b97
commit 8422b840a6
2 changed files with 159 additions and 8 deletions

View file

@ -43,14 +43,7 @@ public class VehicleRoutingTransportCostsMatrix extends AbstractForwardVehicleRo
static class RelationKey {
static RelationKey newKey(String from, String to){
int fromInt = Integer.parseInt(from);
int toInt = Integer.parseInt(to);
if(fromInt < toInt){
return new RelationKey(from, to);
}
else {
return new RelationKey(to, from);
}
return new RelationKey(from, to);
}
final String from;
@ -148,6 +141,10 @@ public class VehicleRoutingTransportCostsMatrix extends AbstractForwardVehicleRo
log.warn("distance from " + from + " to " + to + " already exists. This overrides distance.");
}
distances.put(key, distance);
if(isSymmetric) {
RelationKey revKey = RelationKey.newKey(to, from);
if(distances.containsKey(revKey)) distances.put(revKey, distance);
}
return this;
}
@ -165,6 +162,10 @@ public class VehicleRoutingTransportCostsMatrix extends AbstractForwardVehicleRo
log.warn("transport-time from " + from + " to " + to + " already exists. This overrides distance.");
}
times.put(key, time);
if(isSymmetric) {
RelationKey revKey = RelationKey.newKey(to, from);
if(distances.containsKey(revKey)) distances.put(revKey, time);
}
return this;
}