diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/optimizer/insertion/InsertionGenerator.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/optimizer/insertion/InsertionGenerator.java index 3e521bfd83c..60e27e4bc5a 100644 --- a/contribs/drt/src/main/java/org/matsim/contrib/drt/optimizer/insertion/InsertionGenerator.java +++ b/contribs/drt/src/main/java/org/matsim/contrib/drt/optimizer/insertion/InsertionGenerator.java @@ -154,7 +154,7 @@ public List generateInsertions(DrtRequest drtRequest, V int stopCount = vEntry.stops.size(); List insertions = new ArrayList<>(); - if (drtRequest.getPassengerIds().size() > vEntry.vehicle.getCapacity()) { + if (drtRequest.getPassengerCount() > vEntry.vehicle.getCapacity()) { //exit early return Collections.EMPTY_LIST; } @@ -165,7 +165,7 @@ public List generateInsertions(DrtRequest drtRequest, V Waypoint.Stop nextStop = nextStop(vEntry, i); // (1) only not fully loaded arcs - boolean allowed = occupancy + drtRequest.getPassengerIds().size() <= vEntry.vehicle.getCapacity(); + boolean allowed = occupancy + drtRequest.getPassengerCount() <= vEntry.vehicle.getCapacity(); // (2) check if the request wants to depart after the departure time of the next // stop. We can early on filter out the current insertion, because we will @@ -258,7 +258,7 @@ private void generateDropoffInsertions(DrtRequest request, VehicleEntry vEntry, // i -> pickup -> i+1 && j -> dropoff -> j+1 // check the capacity constraints if i < j (already validated for `i == j`) Waypoint.Stop currentStop = currentStop(vEntry, j); - if (currentStop.outgoingOccupancy + request.getPassengerIds().size() > vEntry.vehicle.getCapacity()) { + if (currentStop.outgoingOccupancy + request.getPassengerCount() > vEntry.vehicle.getCapacity()) { if (request.getToLink() == currentStop.task.getLink()) { //special case -- we can insert dropoff exactly at node j addInsertion(insertions, diff --git a/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/passenger/GroupPassengerEngine.java b/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/passenger/GroupPassengerEngine.java index f691c5ee13b..a5c2f9e9c84 100644 --- a/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/passenger/GroupPassengerEngine.java +++ b/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/passenger/GroupPassengerEngine.java @@ -142,7 +142,7 @@ private void handleDepartures(double now) { // must come before validateAndSubmitRequest (to come before rejection event) eventsManager.processEvent(new PassengerWaitingEvent(now, mode, request.getId(), group.stream().map(Identifiable::getId).toList())); - validateAndSubmitRequest(List.copyOf(group), request, mobsimTimer.getTimeOfDay()); + validateAndSubmitRequest(group, request, mobsimTimer.getTimeOfDay()); } currentDepartures.clear(); } diff --git a/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/passenger/PassengerRequest.java b/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/passenger/PassengerRequest.java index b35a98ea3f8..e6cbca39641 100644 --- a/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/passenger/PassengerRequest.java +++ b/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/passenger/PassengerRequest.java @@ -47,5 +47,5 @@ default double getLatestStartTime() { String getMode(); - int getPartySize(); + int getPassengerCount(); }