address lates comments

moia-oss · Nov 21, 2023 · 47da27e · 47da27e
1 parent 8ae0000
commit 47da27e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...ribs/drt/src/main/java/org/matsim/contrib/drt/optimizer/insertion/InsertionGenerator.java b/...ribs/drt/src/main/java/org/matsim/contrib/drt/optimizer/insertion/InsertionGenerator.java
@@ -154,7 +154,7 @@ public List<InsertionWithDetourData> generateInsertions(DrtRequest drtRequest, V
 		int stopCount = vEntry.stops.size();
 		List<InsertionWithDetourData> 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<InsertionWithDetourData> 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
@@ -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
@@ -47,5 +47,5 @@ default double getLatestStartTime() {
 
 	String getMode();
 
-	int getPartySize();
+	int getPassengerCount();
 }