From 714bc9d4af27fe58be97c8074c39b71d8ebfd961 Mon Sep 17 00:00:00 2001 From: oblonski <4sschroeder@gmail.com> Date: Wed, 10 Dec 2014 11:31:44 +0100 Subject: [PATCH] improve greate circle costs --- .../src/main/java/jsprit/core/util/GreatCircleCosts.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jsprit-core/src/main/java/jsprit/core/util/GreatCircleCosts.java b/jsprit-core/src/main/java/jsprit/core/util/GreatCircleCosts.java index 046f387e..5f45bb92 100644 --- a/jsprit-core/src/main/java/jsprit/core/util/GreatCircleCosts.java +++ b/jsprit-core/src/main/java/jsprit/core/util/GreatCircleCosts.java @@ -69,7 +69,7 @@ public class GreatCircleCosts extends AbstractForwardVehicleRoutingTransportCost public double getTransportCost(String fromId, String toId, double time,Driver driver, Vehicle vehicle) { double distance; try { - distance = calculateDistance(fromId, toId); + distance = getDistance(fromId, toId); } catch (NullPointerException e) { throw new NullPointerException("cannot calculate euclidean distance. coordinates are missing. either add coordinates or use another transport-cost-calculator."); } @@ -84,10 +84,10 @@ public class GreatCircleCosts extends AbstractForwardVehicleRoutingTransportCost @Override public double getTransportTime(String fromId, String toId, double time, Driver driver, Vehicle vehicle) { - return calculateDistance(fromId, toId) / speed; + return getDistance(fromId, toId) / speed; } - private double calculateDistance(String fromId, String toId) { + public double getDistance(String fromId, String toId) { Coordinate fromCoordinate = locations.getCoord(fromId); Coordinate toCoordinate = locations.getCoord(toId); return GreatCircleDistanceCalculator.calculateDistance(fromCoordinate, toCoordinate, distanceUnit) * detour;