From e35603ed34d8ee21fe7e723c403fe156208a8d5b Mon Sep 17 00:00:00 2001 From: Stefan Schroeder <4sschroeder@gmail.com> Date: Fri, 16 Aug 2013 16:30:29 +0200 Subject: [PATCH] API CHANGED - insertionStarts (method para changed), jobInserted (method para changed) and vehicleRoute (new method) --- .../src/main/java/basics/algo/InsertionStartsListener.java | 3 ++- .../src/main/java/basics/algo/JobInsertedListener.java | 2 +- jsprit-core/src/main/java/basics/route/VehicleRoute.java | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jsprit-core/src/main/java/basics/algo/InsertionStartsListener.java b/jsprit-core/src/main/java/basics/algo/InsertionStartsListener.java index a62459cd..8f8ea757 100644 --- a/jsprit-core/src/main/java/basics/algo/InsertionStartsListener.java +++ b/jsprit-core/src/main/java/basics/algo/InsertionStartsListener.java @@ -22,10 +22,11 @@ package basics.algo; import java.util.Collection; +import basics.Job; import basics.route.VehicleRoute; public interface InsertionStartsListener extends InsertionListener { - public void informInsertionStarts(Collection vehicleRoutes, int nOfJobs2Recreate); + public void informInsertionStarts(Collection vehicleRoutes, Collection unassignedJobs); } diff --git a/jsprit-core/src/main/java/basics/algo/JobInsertedListener.java b/jsprit-core/src/main/java/basics/algo/JobInsertedListener.java index 5cce5484..510a9ded 100644 --- a/jsprit-core/src/main/java/basics/algo/JobInsertedListener.java +++ b/jsprit-core/src/main/java/basics/algo/JobInsertedListener.java @@ -30,5 +30,5 @@ import basics.route.VehicleRoute; public interface JobInsertedListener extends InsertionListener{ - public void informJobInserted(int nOfJobsStill2Recreate, Job job2insert, VehicleRoute insertedIn); + public void informJobInserted(Job job2insert, VehicleRoute inRoute); } diff --git a/jsprit-core/src/main/java/basics/route/VehicleRoute.java b/jsprit-core/src/main/java/basics/route/VehicleRoute.java index e7bf3814..95c8f3e0 100644 --- a/jsprit-core/src/main/java/basics/route/VehicleRoute.java +++ b/jsprit-core/src/main/java/basics/route/VehicleRoute.java @@ -158,6 +158,11 @@ public class VehicleRoute { start.setEndTime(vehicleDepTime); } + public double getDepartureTime(){ + if(start == null) throw new IllegalStateException("cannot get departureTime without having a vehicle on this route. use setVehicle(vehicle,departureTime) instead."); + return start.getEndTime(); + } + private void setStartAndEnd(Vehicle vehicle, double vehicleDepTime) { if(!(vehicle instanceof NoVehicle)){ if(start == null && end == null){