fix: evaluate prebooking pickup and dropoff logic independently (#3105)

matsim-org · Feb 9, 2024 · a23f78a · a23f78a
1 parent 599a837
commit a23f78a
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/prebooking/PrebookingStopActivity.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/prebooking/PrebookingStopActivity.java
@@ -68,7 +68,9 @@ public PrebookingStopActivity(PassengerHandler passengerHandler, DynAgent driver
 
 	@Override
 	protected boolean isLastStep(double now) {
-		return updatePickupRequests(now) && processDropoffRequests(now) && now >= endTime.get();
+		boolean pickupsReady = updatePickupRequests(now);
+		boolean dropoffsReady = updateDropoffRequests(now);
+		return pickupsReady && dropoffsReady && now >= endTime.get();
 	}
 
 	@Override
@@ -83,10 +85,10 @@ private void initDropoffRequests(double now) {
 			leaveTimes.put(request.getId(), leaveTime);
 		}
 
-		processDropoffRequests(now);
+		updateDropoffRequests(now);
 	}
 
-	private boolean processDropoffRequests(double now) {
+	private boolean updateDropoffRequests(double now) {
 		var iterator = leaveTimes.entrySet().iterator();
 
 		while (iterator.hasNext()) {