From 151754c79c8655ca2b46bbda5a293072ce6e4da6 Mon Sep 17 00:00:00 2001 From: oblonski Date: Tue, 14 Jun 2016 19:53:19 +0200 Subject: [PATCH] extend interface TransportDistance - breaking change --- .../core/analysis/SolutionAnalyser.java | 6 +- .../core/problem/cost/TransportDistance.java | 3 +- .../jsprit/core/util/CrowFlyCosts.java | 2 +- .../jsprit/core/util/EuclideanCosts.java | 2 +- ...astVehicleRoutingTransportCostsMatrix.java | 2 +- .../jsprit/core/util/GreatCircleCosts.java | 2 +- .../jsprit/core/util/ManhattanCosts.java | 2 +- .../core/algorithm/CVRPwithMatrix_IT.java | 2 +- .../core/algorithm/CapacityConstraint_IT.java | 5 +- .../VariableDepartureAndWaitingTime_IT.java | 2 +- .../core/analysis/SolutionAnalyserTest.java | 314 +++++++++--------- ...iteVrpWithInitialSolutionForWriterTest.xml | 6 + .../test/resources/infiniteWriterV2Test.xml | 2 + .../examples/BuildAlgorithmFromScratch.java | 3 +- .../examples/MultipleTimeWindowExample2.java | 3 +- .../examples/PickupAndDeliveryExample.java | 3 +- .../examples/VRPWithBackhaulsExample2.java | 3 +- 17 files changed, 188 insertions(+), 174 deletions(-) diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java index b7b8d2c1..d83ce8a1 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyser.java @@ -340,7 +340,7 @@ public class SolutionAnalyser { } private double distance(TourActivity activity) { - return distanceCalculator.getDistance(prevAct.getLocation(), activity.getLocation()); + return distanceCalculator.getDistance(prevAct.getLocation(), activity.getLocation(),prevActDeparture, route.getVehicle()); } @Override @@ -381,7 +381,7 @@ public class SolutionAnalyser { @Override public void visit(TourActivity activity) { - double distance = distanceCalculator.getDistance(prevAct.getLocation(), activity.getLocation()); + double distance = distanceCalculator.getDistance(prevAct.getLocation(), activity.getLocation(), prevAct.getEndTime(), route.getVehicle()); sum_distance += distance; stateManager.putActivityState(activity, distance_id, sum_distance); prevAct = activity; @@ -389,7 +389,7 @@ public class SolutionAnalyser { @Override public void finish() { - double distance = distanceCalculator.getDistance(prevAct.getLocation(), route.getEnd().getLocation()); + double distance = distanceCalculator.getDistance(prevAct.getLocation(), route.getEnd().getLocation(),prevAct.getEndTime(), route.getVehicle()); sum_distance += distance; stateManager.putRouteState(route, distance_id, sum_distance); } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportDistance.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportDistance.java index b5c0857f..70003a05 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportDistance.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/problem/cost/TransportDistance.java @@ -1,12 +1,13 @@ package com.graphhopper.jsprit.core.problem.cost; import com.graphhopper.jsprit.core.problem.Location; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; /** * Created by schroeder on 23/12/14. */ public interface TransportDistance { - public double getDistance(Location from, Location to); + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle); } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CrowFlyCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CrowFlyCosts.java index 5bca9243..ea961169 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CrowFlyCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/CrowFlyCosts.java @@ -94,7 +94,7 @@ public class CrowFlyCosts extends AbstractForwardVehicleRoutingTransportCosts im } @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return calculateDistance(from, to); } } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanCosts.java index f58b364d..563ffaf2 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/EuclideanCosts.java @@ -84,7 +84,7 @@ public class EuclideanCosts extends AbstractForwardVehicleRoutingTransportCosts } @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return calculateDistance(from, to); } } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java index d5044437..a92f2238 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/FastVehicleRoutingTransportCostsMatrix.java @@ -155,7 +155,7 @@ public class FastVehicleRoutingTransportCostsMatrix extends AbstractForwardVehic } @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return getDistance(from.getIndex(), to.getIndex()); } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/GreatCircleCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/GreatCircleCosts.java index 216e3fbd..feeba94f 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/GreatCircleCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/GreatCircleCosts.java @@ -95,7 +95,7 @@ public class GreatCircleCosts extends AbstractForwardVehicleRoutingTransportCost } @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return calculateDistance(from, to); } } diff --git a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ManhattanCosts.java b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ManhattanCosts.java index 2827da1a..ae02a36a 100644 --- a/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ManhattanCosts.java +++ b/jsprit-core/src/main/java/com/graphhopper/jsprit/core/util/ManhattanCosts.java @@ -83,7 +83,7 @@ public class ManhattanCosts extends AbstractForwardVehicleRoutingTransportCosts } @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return calculateDistance(from, to); } } diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithMatrix_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithMatrix_IT.java index a880dc25..7182bb6c 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithMatrix_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CVRPwithMatrix_IT.java @@ -86,7 +86,7 @@ public class CVRPwithMatrix_IT { Collection solutions = vra.searchSolutions(); SolutionAnalyser sa = new SolutionAnalyser(vrp, Solutions.bestOf(solutions), new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CapacityConstraint_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CapacityConstraint_IT.java index ee78c361..876ef94a 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CapacityConstraint_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/CapacityConstraint_IT.java @@ -27,6 +27,7 @@ import com.graphhopper.jsprit.core.problem.cost.TransportDistance; import com.graphhopper.jsprit.core.problem.job.Delivery; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import com.graphhopper.jsprit.core.problem.vehicle.VehicleTypeImpl; import com.graphhopper.jsprit.core.reporting.SolutionPrinter; @@ -95,8 +96,8 @@ public class CapacityConstraint_IT { SolutionPrinter.print(vrp,solution, SolutionPrinter.Print.VERBOSE); SolutionAnalyser sa = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { - return new ManhattanCosts().getDistance(from,to); + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { + return new ManhattanCosts().getDistance(from,to, 0d, null); } }); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java index 6976ec2a..150e5808 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/algorithm/VariableDepartureAndWaitingTime_IT.java @@ -66,7 +66,7 @@ public class VariableDepartureAndWaitingTime_IT { public double getCosts(VehicleRoutingProblemSolution solution) { SolutionAnalyser sa = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); diff --git a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyserTest.java b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyserTest.java index 33416811..a6475a4f 100644 --- a/jsprit-core/src/test/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyserTest.java +++ b/jsprit-core/src/test/java/com/graphhopper/jsprit/core/analysis/SolutionAnalyserTest.java @@ -220,7 +220,7 @@ public class SolutionAnalyserTest { private void testTransportCosts(TransportCostsTestType type) { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location fromLocationId, Location toLocationId) { + public double getDistance(Location fromLocationId, Location toLocationId, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(fromLocationId, toLocationId, 0., null, null); } }); @@ -301,7 +301,7 @@ public class SolutionAnalyserTest { public void constructionShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -312,7 +312,7 @@ public class SolutionAnalyserTest { public void loadAtBeginningOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -324,7 +324,7 @@ public class SolutionAnalyserTest { public void loadAtBeginningOfRoute2ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -339,7 +339,7 @@ public class SolutionAnalyserTest { public void loadAtEnd_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -351,7 +351,7 @@ public class SolutionAnalyserTest { public void loadAtEnd_OfRoute2ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -366,7 +366,7 @@ public class SolutionAnalyserTest { public void loadAfterActivity_ofStartActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -378,7 +378,7 @@ public class SolutionAnalyserTest { public void loadAfterActivity_ofAct1ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -390,7 +390,7 @@ public class SolutionAnalyserTest { public void loadAfterActivity_ofAct2ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -402,7 +402,7 @@ public class SolutionAnalyserTest { public void loadAfterActivity_ofAct3ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -414,7 +414,7 @@ public class SolutionAnalyserTest { public void loadAfterActivity_ofAct4ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -426,7 +426,7 @@ public class SolutionAnalyserTest { public void loadAfterActivity_ofEndActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -438,7 +438,7 @@ public class SolutionAnalyserTest { public void loadBeforeActivity_ofStartActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -450,7 +450,7 @@ public class SolutionAnalyserTest { public void loadBeforeActivity_ofAct1ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -462,7 +462,7 @@ public class SolutionAnalyserTest { public void loadBeforeActivity_ofAct2ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -474,7 +474,7 @@ public class SolutionAnalyserTest { public void loadBeforeActivity_ofAct3ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -486,7 +486,7 @@ public class SolutionAnalyserTest { public void loadBeforeActivity_ofAct4ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -498,7 +498,7 @@ public class SolutionAnalyserTest { public void loadBeforeActivity_ofEndActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -510,7 +510,7 @@ public class SolutionAnalyserTest { public void maxLoad_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -522,7 +522,7 @@ public class SolutionAnalyserTest { public void pickupCount_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -534,7 +534,7 @@ public class SolutionAnalyserTest { public void pickupCountAtBeginning_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -547,7 +547,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -560,7 +560,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -572,7 +572,7 @@ public class SolutionAnalyserTest { public void pickupCount_onSolutionShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -583,7 +583,7 @@ public class SolutionAnalyserTest { public void pickupCountAtBeginning_onSolutionShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -595,7 +595,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -607,7 +607,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -618,7 +618,7 @@ public class SolutionAnalyserTest { public void pickupLoad_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -630,7 +630,7 @@ public class SolutionAnalyserTest { public void pickupLoadAtBeginning_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -643,7 +643,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -656,7 +656,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -668,7 +668,7 @@ public class SolutionAnalyserTest { public void pickupLoad_onSolutionShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -679,7 +679,7 @@ public class SolutionAnalyserTest { public void pickupLoadAtBeginning_onSolutionShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -691,7 +691,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -703,7 +703,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -714,7 +714,7 @@ public class SolutionAnalyserTest { public void deliveryCount_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -726,7 +726,7 @@ public class SolutionAnalyserTest { public void deliveryCountAtEnd_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -739,7 +739,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -752,7 +752,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -764,7 +764,7 @@ public class SolutionAnalyserTest { public void deliveryCount_onSolutionShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -775,7 +775,7 @@ public class SolutionAnalyserTest { public void deliveryCountAtEnd_onSolutionShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -787,7 +787,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -799,7 +799,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -810,7 +810,7 @@ public class SolutionAnalyserTest { public void deliveryLoad_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -822,7 +822,7 @@ public class SolutionAnalyserTest { public void deliveryLoadAtEnd_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -835,7 +835,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -848,7 +848,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -860,7 +860,7 @@ public class SolutionAnalyserTest { public void deliveryLoad_onSolutionShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -871,7 +871,7 @@ public class SolutionAnalyserTest { public void deliveryLoadAtEnd_onSolutionShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -883,7 +883,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -896,7 +896,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -907,7 +907,7 @@ public class SolutionAnalyserTest { public void operationTime_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -919,7 +919,7 @@ public class SolutionAnalyserTest { public void waitingTime_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -931,7 +931,7 @@ public class SolutionAnalyserTest { public void transportTime_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -943,7 +943,7 @@ public class SolutionAnalyserTest { public void serviceTime_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -955,7 +955,7 @@ public class SolutionAnalyserTest { public void distance_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -967,7 +967,7 @@ public class SolutionAnalyserTest { public void waitingTime_atStartActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -979,7 +979,7 @@ public class SolutionAnalyserTest { public void waitingTime_ofAct1ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -991,7 +991,7 @@ public class SolutionAnalyserTest { public void waitingTime_ofAct2ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1003,7 +1003,7 @@ public class SolutionAnalyserTest { public void waitingTime_ofAct3ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1015,7 +1015,7 @@ public class SolutionAnalyserTest { public void waitingTime_ofAct4ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1027,7 +1027,7 @@ public class SolutionAnalyserTest { public void waitingTime_ofEndActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1039,7 +1039,7 @@ public class SolutionAnalyserTest { public void distance_atStartActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1051,7 +1051,7 @@ public class SolutionAnalyserTest { public void distance_ofAct1ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1063,7 +1063,7 @@ public class SolutionAnalyserTest { public void distance_ofAct2ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1075,7 +1075,7 @@ public class SolutionAnalyserTest { public void distance_ofAct3ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1087,7 +1087,7 @@ public class SolutionAnalyserTest { public void distance_ofAct4ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1099,7 +1099,7 @@ public class SolutionAnalyserTest { public void distance_ofEndActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1112,7 +1112,7 @@ public class SolutionAnalyserTest { public void lateArrivalTimes_atStartActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1124,7 +1124,7 @@ public class SolutionAnalyserTest { public void lateArrivalTimes_ofAct1ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1136,7 +1136,7 @@ public class SolutionAnalyserTest { public void lateArrivalTimes_ofAct2ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1148,7 +1148,7 @@ public class SolutionAnalyserTest { public void lateArrivalTimes_ofAct3ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1160,7 +1160,7 @@ public class SolutionAnalyserTest { public void lateArrivalTimes_ofAct4ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1172,7 +1172,7 @@ public class SolutionAnalyserTest { public void lateArrivalTimes_ofEndActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1184,7 +1184,7 @@ public class SolutionAnalyserTest { public void lateArrTimes_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1196,7 +1196,7 @@ public class SolutionAnalyserTest { public void variableTransportCosts_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1208,7 +1208,7 @@ public class SolutionAnalyserTest { public void fixedCosts_OfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1220,7 +1220,7 @@ public class SolutionAnalyserTest { public void transportCosts_atStartActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1232,7 +1232,7 @@ public class SolutionAnalyserTest { public void transportCosts_ofAct1ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1244,7 +1244,7 @@ public class SolutionAnalyserTest { public void transportCosts_ofAct2ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1256,7 +1256,7 @@ public class SolutionAnalyserTest { public void transportCosts_ofAct3ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1268,7 +1268,7 @@ public class SolutionAnalyserTest { public void transportCosts_ofAct4ofRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1280,7 +1280,7 @@ public class SolutionAnalyserTest { public void transportCosts_ofEndActOfRoute1ShouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1292,7 +1292,7 @@ public class SolutionAnalyserTest { public void capacityViolationAtBeginning_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1307,7 +1307,7 @@ public class SolutionAnalyserTest { public void capacityViolationAtEnd_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1325,7 +1325,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1341,7 +1341,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1354,7 +1354,7 @@ public class SolutionAnalyserTest { public void capacityViolationAfterStart_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1373,7 +1373,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1389,7 +1389,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1405,7 +1405,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1421,7 +1421,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1437,7 +1437,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1453,7 +1453,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1469,7 +1469,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1485,7 +1485,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1501,7 +1501,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1517,7 +1517,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1533,7 +1533,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1546,7 +1546,7 @@ public class SolutionAnalyserTest { public void capacityViolationAfterAct1_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1562,7 +1562,7 @@ public class SolutionAnalyserTest { public void capacityViolationAfterAct2_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1578,7 +1578,7 @@ public class SolutionAnalyserTest { public void capacityViolationAfterAct3_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1594,7 +1594,7 @@ public class SolutionAnalyserTest { public void capacityViolationAfterAct4_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1610,7 +1610,7 @@ public class SolutionAnalyserTest { public void capacityViolationAfterEnd_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1626,7 +1626,7 @@ public class SolutionAnalyserTest { public void timeWindowViolation_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1642,7 +1642,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1658,7 +1658,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1674,7 +1674,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1690,7 +1690,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1706,7 +1706,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1722,7 +1722,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1738,7 +1738,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1754,7 +1754,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1770,7 +1770,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1786,7 +1786,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1802,7 +1802,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1818,7 +1818,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1834,7 +1834,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1851,7 +1851,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1867,7 +1867,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1883,7 +1883,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1899,7 +1899,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1915,7 +1915,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1931,7 +1931,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1947,7 +1947,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1963,7 +1963,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1979,7 +1979,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -1995,7 +1995,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2011,7 +2011,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2027,7 +2027,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2043,7 +2043,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2059,7 +2059,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2075,7 +2075,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2091,7 +2091,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2107,7 +2107,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2123,7 +2123,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2139,7 +2139,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2155,7 +2155,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2175,7 +2175,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2196,7 +2196,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2217,7 +2217,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2238,7 +2238,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2259,7 +2259,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2280,7 +2280,7 @@ public class SolutionAnalyserTest { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2293,7 +2293,7 @@ public class SolutionAnalyserTest { public void skillViolationOnRoute_shouldWorkWhenViolated() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2306,7 +2306,7 @@ public class SolutionAnalyserTest { public void skillViolationAtStart_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2319,7 +2319,7 @@ public class SolutionAnalyserTest { public void skillViolationAtAct1_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2332,7 +2332,7 @@ public class SolutionAnalyserTest { public void skillViolationAtAct2_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2345,7 +2345,7 @@ public class SolutionAnalyserTest { public void skillViolationAtAct3_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2358,7 +2358,7 @@ public class SolutionAnalyserTest { public void skillViolationAtAct4_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2371,7 +2371,7 @@ public class SolutionAnalyserTest { public void skillViolationAtEnd_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2385,7 +2385,7 @@ public class SolutionAnalyserTest { public void skillViolationOnRoute_shouldWorkWhenNotViolated() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2401,7 +2401,7 @@ public class SolutionAnalyserTest { public void skillViolationOnSolution_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2413,7 +2413,7 @@ public class SolutionAnalyserTest { public void backhaulViolationOnSolution_shouldWork() { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2426,7 +2426,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2439,7 +2439,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); @@ -2452,7 +2452,7 @@ public class SolutionAnalyserTest { buildAnotherScenarioWithOnlyOneVehicleAndWithoutAnyConstraintsBefore(); SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); diff --git a/jsprit-core/src/test/resources/finiteVrpWithInitialSolutionForWriterTest.xml b/jsprit-core/src/test/resources/finiteVrpWithInitialSolutionForWriterTest.xml index cdea9d61..a5ed56bf 100644 --- a/jsprit-core/src/test/resources/finiteVrpWithInitialSolutionForWriterTest.xml +++ b/jsprit-core/src/test/resources/finiteVrpWithInitialSolutionForWriterTest.xml @@ -101,6 +101,8 @@ 0.0 0.0 + 0.0 + 0.0 @@ -112,6 +114,8 @@ 0.0 0.0 + 0.0 + 0.0 @@ -133,6 +137,8 @@ 0.0 0.0 + 0.0 + 0.0 diff --git a/jsprit-core/src/test/resources/infiniteWriterV2Test.xml b/jsprit-core/src/test/resources/infiniteWriterV2Test.xml index 2d9058ab..c7b5a449 100644 --- a/jsprit-core/src/test/resources/infiniteWriterV2Test.xml +++ b/jsprit-core/src/test/resources/infiniteWriterV2Test.xml @@ -31,6 +31,8 @@ 0.0 1.0 + 0.0 + 0.0 diff --git a/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BuildAlgorithmFromScratch.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BuildAlgorithmFromScratch.java index 10ec6ae1..084e99f0 100644 --- a/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BuildAlgorithmFromScratch.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/BuildAlgorithmFromScratch.java @@ -43,6 +43,7 @@ import com.graphhopper.jsprit.core.problem.solution.SolutionCostCalculator; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.vehicle.FiniteFleetManagerFactory; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.problem.vehicle.VehicleFleetManager; import com.graphhopper.jsprit.core.reporting.SolutionPrinter; import com.graphhopper.jsprit.core.util.Solutions; @@ -206,7 +207,7 @@ public class BuildAlgorithmFromScratch { public double getCosts(VehicleRoutingProblemSolution solution) { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } }); diff --git a/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleTimeWindowExample2.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleTimeWindowExample2.java index 05f870f1..3ecf5b86 100644 --- a/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleTimeWindowExample2.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/MultipleTimeWindowExample2.java @@ -25,6 +25,7 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.cost.TransportDistance; import com.graphhopper.jsprit.core.problem.job.Service; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl; import com.graphhopper.jsprit.core.problem.vehicle.VehicleImpl.Builder; import com.graphhopper.jsprit.core.problem.vehicle.VehicleType; @@ -136,7 +137,7 @@ public class MultipleTimeWindowExample2 { SolutionAnalyser a = new SolutionAnalyser(problem, bestSolution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return problem.getTransportCosts().getTransportTime(from,to,0.,null,null); } }); diff --git a/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryExample.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryExample.java index a1fcbfa9..5c0287f1 100644 --- a/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryExample.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/PickupAndDeliveryExample.java @@ -28,6 +28,7 @@ import com.graphhopper.jsprit.core.problem.VehicleRoutingProblem; import com.graphhopper.jsprit.core.problem.cost.TransportDistance; import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.reporting.SolutionPrinter; import com.graphhopper.jsprit.util.Examples; @@ -101,7 +102,7 @@ public class PickupAndDeliveryExample { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); } diff --git a/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/VRPWithBackhaulsExample2.java b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/VRPWithBackhaulsExample2.java index 28bf71d4..413bfc2f 100644 --- a/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/VRPWithBackhaulsExample2.java +++ b/jsprit-examples/src/main/java/com/graphhopper/jsprit/examples/VRPWithBackhaulsExample2.java @@ -33,6 +33,7 @@ import com.graphhopper.jsprit.core.problem.io.VrpXMLReader; import com.graphhopper.jsprit.core.problem.solution.VehicleRoutingProblemSolution; import com.graphhopper.jsprit.core.problem.solution.route.VehicleRoute; import com.graphhopper.jsprit.core.problem.solution.route.activity.TourActivity; +import com.graphhopper.jsprit.core.problem.vehicle.Vehicle; import com.graphhopper.jsprit.core.reporting.SolutionPrinter; import com.graphhopper.jsprit.util.Examples; @@ -126,7 +127,7 @@ public class VRPWithBackhaulsExample2 { SolutionAnalyser analyser = new SolutionAnalyser(vrp, solution, new TransportDistance() { @Override - public double getDistance(Location from, Location to) { + public double getDistance(Location from, Location to, double departureTime, Vehicle vehicle) { return vrp.getTransportCosts().getTransportCost(from, to, 0., null, null); }