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

use AbstractForwardVehicleRoutingTransportCosts

Browse source
This commit is contained in:
Stefan Schroeder 2013-12-16 15:46:09 +01:00
parent 0ac8b08a67
commit b21eebdc26
3 changed files with 6 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

14
jsprit-core/src/main/java/jsprit/core/util/CrowFlyCosts.java
View file

@ -19,7 +19,7 @@
*/ */
package jsprit.core.util; package jsprit.core.util;
import jsprit.core.problem.cost.VehicleRoutingTransportCosts; import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts;
import jsprit.core.problem.driver.Driver; import jsprit.core.problem.driver.Driver;
import jsprit.core.problem.vehicle.Vehicle; import jsprit.core.problem.vehicle.Vehicle;
@ -31,7 +31,7 @@ import org.apache.log4j.Logger;
* @author stefan schroeder * @author stefan schroeder
* *
*/ */
public class CrowFlyCosts implements VehicleRoutingTransportCosts { public class CrowFlyCosts extends AbstractForwardVehicleRoutingTransportCosts {
private static Logger logger = Logger.getLogger(CrowFlyCosts.class); private static Logger logger = Logger.getLogger(CrowFlyCosts.class);
@ -80,14 +80,4 @@ public class CrowFlyCosts implements VehicleRoutingTransportCosts {
return transportTime; return transportTime;
} }
@Override
public double getBackwardTransportCost(String fromId, String toId, double arrivalTime, Driver driver, Vehicle vehicle) {
return getTransportCost(fromId, toId, arrivalTime, null, null);
}
@Override
public double getBackwardTransportTime(String fromId, String toId, double arrivalTime, Driver driver, Vehicle vehicle) {
return getTransportTime(fromId, toId, arrivalTime, null, null);
}
} }

16
jsprit-core/src/main/java/jsprit/core/util/ManhattanCosts.java
View file

@ -18,7 +18,7 @@ package jsprit.core.util;
import jsprit.core.problem.cost.VehicleRoutingTransportCosts; import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts;
import jsprit.core.problem.driver.Driver; import jsprit.core.problem.driver.Driver;
import jsprit.core.problem.vehicle.Vehicle; import jsprit.core.problem.vehicle.Vehicle;
@ -28,7 +28,7 @@ import jsprit.core.problem.vehicle.Vehicle;
* *
*/ */
public class ManhattanCosts implements VehicleRoutingTransportCosts { public class ManhattanCosts extends AbstractForwardVehicleRoutingTransportCosts {
public double speed = 1; public double speed = 1;
@ -58,16 +58,4 @@ public class ManhattanCosts implements VehicleRoutingTransportCosts {
return distance; return distance;
} }
@Override
public double getBackwardTransportCost(String fromId, String toId,
double arrivalTime, Driver driver, Vehicle vehicle) {
return getTransportCost(fromId, toId, arrivalTime, null, null);
}
@Override
public double getBackwardTransportTime(String fromId, String toId,
double arrivalTime, Driver driver, Vehicle vehicle) {
return getTransportTime(fromId, toId, arrivalTime, null, null);
}
} }

18
jsprit-core/src/main/java/jsprit/core/util/VehicleRoutingTransportCostsMatrix.java
View file

@ -20,7 +20,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import jsprit.core.problem.VehicleRoutingProblem; import jsprit.core.problem.VehicleRoutingProblem;
import jsprit.core.problem.cost.VehicleRoutingTransportCosts; import jsprit.core.problem.cost.AbstractForwardVehicleRoutingTransportCosts;
import jsprit.core.problem.driver.Driver; import jsprit.core.problem.driver.Driver;
import jsprit.core.problem.vehicle.Vehicle; import jsprit.core.problem.vehicle.Vehicle;
import jsprit.core.problem.vehicle.VehicleTypeImpl.VehicleCostParams; import jsprit.core.problem.vehicle.VehicleTypeImpl.VehicleCostParams;
@ -38,7 +38,7 @@ import org.apache.log4j.Logger;
* @author schroeder * @author schroeder
* *
*/ */
public class VehicleRoutingTransportCostsMatrix implements VehicleRoutingTransportCosts { public class VehicleRoutingTransportCostsMatrix extends AbstractForwardVehicleRoutingTransportCosts {
static class RelationKey { static class RelationKey {
@ -238,12 +238,6 @@ public class VehicleRoutingTransportCostsMatrix implements VehicleRoutingTranspo
} }
} }
@Override
public double getBackwardTransportTime(String fromId, String toId, double arrivalTime, Driver driver, Vehicle vehicle) {
return getTransportTime(fromId, toId, arrivalTime, driver, vehicle);
}
@Override @Override
public double getTransportCost(String fromId, String toId, double departureTime, Driver driver, Vehicle vehicle) { public double getTransportCost(String fromId, String toId, double departureTime, Driver driver, Vehicle vehicle) {
if(vehicle == null) return getDistance(fromId, toId); if(vehicle == null) return getDistance(fromId, toId);
@ -251,12 +245,4 @@ public class VehicleRoutingTransportCostsMatrix implements VehicleRoutingTranspo
return costParams.perDistanceUnit*getDistance(fromId, toId) + costParams.perTimeUnit*getTime(fromId, toId); return costParams.perDistanceUnit*getDistance(fromId, toId) + costParams.perTimeUnit*getTime(fromId, toId);
} }
@Override
public double getBackwardTransportCost(String fromId, String toId, double arrivalTime, Driver driver, Vehicle vehicle) {
return getTransportCost(fromId, toId, arrivalTime, driver, vehicle);
}
} }