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

adapt to new TransportDistance interface

Browse source
This commit is contained in:
oblonski 2014-12-23 07:32:27 +01:00
parent e8175b11f9
commit 67db18b6df
1 changed files with 37 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

40
jsprit-core/src/main/java/jsprit/core/util/GreatCircleCosts.java
View file

@ -55,23 +55,34 @@ public class GreatCircleCosts extends AbstractForwardVehicleRoutingTransportCost
private DistanceUnit distanceUnit = DistanceUnit.Kilometer; private DistanceUnit distanceUnit = DistanceUnit.Kilometer;
@Deprecated
public GreatCircleCosts(Locations locations) { public GreatCircleCosts(Locations locations) {
super(); super();
this.locations = locations; this.locations = locations;
} }
public GreatCircleCosts() {
super();
}
@Deprecated
public GreatCircleCosts(Locations locations, DistanceUnit distanceUnit) { public GreatCircleCosts(Locations locations, DistanceUnit distanceUnit) {
super(); super();
this.locations = locations; this.locations = locations;
this.distanceUnit = distanceUnit; this.distanceUnit = distanceUnit;
} }
public GreatCircleCosts(DistanceUnit distanceUnit) {
super();
this.distanceUnit = distanceUnit;
}
@Override @Override
public double getTransportCost(Location from, Location to, double time,Driver driver, Vehicle vehicle) { public double getTransportCost(Location from, Location to, double time,Driver driver, Vehicle vehicle) {
double distance; double distance;
try { try {
distance = getDistance(from.getId(), to.getId()); distance = calculateDistance(from,to);
} catch (NullPointerException e) { } catch (NullPointerException e) {
throw new NullPointerException("cannot calculate euclidean distance. coordinates are missing. either add coordinates or use another transport-cost-calculator."); throw new NullPointerException("cannot calculate euclidean distance. coordinates are missing. either add coordinates or use another transport-cost-calculator.");
} }
@ -84,11 +95,34 @@ public class GreatCircleCosts extends AbstractForwardVehicleRoutingTransportCost
return costs; return costs;
} }
private double calculateDistance(Location fromLocation, Location toLocation) {
Coordinate from = null;
Coordinate to = null;
if(fromLocation.getCoordinate() != null & toLocation.getCoordinate() != null){
from = fromLocation.getCoordinate();
to = toLocation.getCoordinate();
}
else if(locations != null){
from = locations.getCoord(fromLocation.getId());
to = locations.getCoord(toLocation.getId());
}
if(from == null || to == null) throw new NullPointerException();
return GreatCircleDistanceCalculator.calculateDistance(from, to, distanceUnit) * detour;
}
@Override @Override
public double getTransportTime(Location from, Location to, double time, Driver driver, Vehicle vehicle) { public double getTransportTime(Location from, Location to, double time, Driver driver, Vehicle vehicle) {
return getDistance(from.getId(), to.getId()) / speed; return calculateDistance(from, to) / speed;
} }
/**
*
* @param fromId
* @param toId
* @return
* @deprecated use getDistance(Location from, Location to) instead
*/
@Deprecated
public double getDistance(String fromId, String toId) { public double getDistance(String fromId, String toId) {
Coordinate fromCoordinate = locations.getCoord(fromId); Coordinate fromCoordinate = locations.getCoord(fromId);
Coordinate toCoordinate = locations.getCoord(toId); Coordinate toCoordinate = locations.getCoord(toId);
@ -97,6 +131,6 @@ public class GreatCircleCosts extends AbstractForwardVehicleRoutingTransportCost
@Override @Override
public double getDistance(Location from, Location to) { public double getDistance(Location from, Location to) {
return getDistance(from.getId(),to.getId()); return calculateDistance(from, to);
} }
} }