feat: canceling prebooked drt requests (#2930)

* drt cancel functionality * rename StuckPrebookingTest * rename StuckPrebookingTest * remove unnecessary condition * extend testing on complex unscheduler * transform if to switch * make thread safe * restructuring: process booking events directly, rejection separately * move rejection events to next time step
matsim-org · Nov 21, 2023 · 6988e84 · 6988e84
1 parent 18d5a95
commit 6988e84
Show file tree

Hide file tree

Showing 25 changed files with 2,085 additions and 76 deletions.
diff --git a/contribs/drt-extensions/pom.xml b/contribs/drt-extensions/pom.xml
@@ -48,6 +48,11 @@
 			<version>16.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+		</dependency>
 
 	</dependencies>
 </project>
diff --git a/...matsim/contrib/drt/extension/operations/eshifts/schedule/EDrtShiftChangeoverTaskImpl.java b/...matsim/contrib/drt/extension/operations/eshifts/schedule/EDrtShiftChangeoverTaskImpl.java
@@ -82,4 +82,14 @@ public void addDropoffRequest(AcceptedDrtRequest request) {
 	public void addPickupRequest(AcceptedDrtRequest request) {
 		delegate.addPickupRequest(request);
 	}
+
+	@Override
+	public void removePickupRequest(Id<Request> requestId) {
+		delegate.removePickupRequest(requestId);
+	}
+
+	@Override
+	public void removeDropoffRequest(Id<Request> requestId) {
+		delegate.removeDropoffRequest(requestId);
+	}
 }
diff --git a/.../java/org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftBreakTaskImpl.java b/.../java/org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftBreakTaskImpl.java
@@ -63,4 +63,14 @@ public void addDropoffRequest(AcceptedDrtRequest request) {
 	public void addPickupRequest(AcceptedDrtRequest request) {
 		delegate.addPickupRequest(request);
 	}
+
+	@Override
+	public void removePickupRequest(Id<Request> requestId) {
+		delegate.removePickupRequest(requestId);
+	}
+
+	@Override
+	public void removeDropoffRequest(Id<Request> requestId) {
+		delegate.removeDropoffRequest(requestId);
+	}
 }
diff --git a/.../org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftChangeoverTaskImpl.java b/.../org/matsim/contrib/drt/extension/operations/shifts/schedule/ShiftChangeoverTaskImpl.java
@@ -1,5 +1,9 @@
 package org.matsim.contrib.drt.extension.operations.shifts.schedule;
 
+import static org.matsim.contrib.drt.schedule.DrtTaskBaseType.STOP;
+
+import java.util.Map;
+
 import org.matsim.api.core.v01.Id;
 import org.matsim.api.core.v01.network.Link;
 import org.matsim.contrib.drt.extension.operations.operationFacilities.OperationFacility;
@@ -11,10 +15,6 @@
 import org.matsim.contrib.dvrp.optimizer.Request;
 import org.matsim.contrib.dvrp.schedule.DefaultStayTask;
 
-import java.util.Map;
-
-import static org.matsim.contrib.drt.schedule.DrtTaskBaseType.STOP;
-
 /**
  * A task representing stopping and waiting for a new shift.
  * @author nkuehnel / MOIA
@@ -64,5 +64,15 @@ public void addDropoffRequest(AcceptedDrtRequest request) {
 	public void addPickupRequest(AcceptedDrtRequest request) {
 		delegate.addPickupRequest(request);
 	}
+
+	@Override
+	public void removePickupRequest(Id<Request> requestId) {
+		delegate.removePickupRequest(requestId);
+	}
+
+	@Override
+	public void removeDropoffRequest(Id<Request> requestId) {
+		delegate.removeDropoffRequest(requestId);
+	}
 }
 
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtAnalysisControlerListener.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtAnalysisControlerListener.java
@@ -176,10 +176,11 @@ public void notifyIterationEnds(IterationEndsEvent event) {
 			.collect(toList());
 
 		collection2Text(drtEventSequenceCollector.getRejectedRequestSequences().values(), filename(event, "drt_rejections", ".csv"),
-				String.join(delimiter, "time", "personId", "requestId", "fromLinkId", "toLinkId", "fromX", "fromY", "toX", "toY"), seq -> {
+				String.join(delimiter, "time", "personId", "requestId", "fromLinkId", "toLinkId", "fromX", "fromY", "toX", "toY", "cause"), seq -> {
 					DrtRequestSubmittedEvent submission = seq.getSubmitted();
 					Coord fromCoord = network.getLinks().get(submission.getFromLinkId()).getToNode().getCoord();
 					Coord toCoord = network.getLinks().get(submission.getToLinkId()).getToNode().getCoord();
+					PassengerRequestRejectedEvent rejection = seq.getRejected().get();
 					return String.join(delimiter, submission.getTime() + "",//
 							submission.getPersonId() + "",//
 							submission.getRequestId() + "",//
@@ -188,7 +189,8 @@ public void notifyIterationEnds(IterationEndsEvent event) {
 							fromCoord.getX() + "",//
 							fromCoord.getY() + "",//
 							toCoord.getX() + "",//
-							toCoord.getY() + "");
+							toCoord.getY() + "",//
+							rejection.getCause());
 				});
 
 		double rejectionRate = (double)drtEventSequenceCollector.getRejectedRequestSequences().size()

diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/prebooking/PrebookingActionCreator.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/prebooking/PrebookingActionCreator.java
@@ -2,6 +2,7 @@
 
 import static org.matsim.contrib.drt.schedule.DrtTaskBaseType.getBaseTypeOrElseThrow;
 
+import org.matsim.contrib.drt.prebooking.abandon.AbandonVoter;
 import org.matsim.contrib.drt.schedule.DrtStopTask;
 import org.matsim.contrib.drt.schedule.DrtTaskBaseType;
 import org.matsim.contrib.drt.stops.PassengerStopDurationProvider;
@@ -27,12 +28,17 @@ public class PrebookingActionCreator implements VrpAgentLogic.DynActionCreator {
 	private final VrpAgentLogic.DynActionCreator delegate;
 	private final PassengerHandler passengerHandler;
 	private final PassengerStopDurationProvider stopDurationProvider;
+	private final PrebookingManager prebookingManager;
+	private final AbandonVoter abandonVoter;
 
 	public PrebookingActionCreator(PassengerHandler passengerHandler, VrpAgentLogic.DynActionCreator delegate,
-			PassengerStopDurationProvider stopDurationProvider) {
+			PassengerStopDurationProvider stopDurationProvider, PrebookingManager prebookingManager,
+			AbandonVoter abandonVoter) {
 		this.delegate = delegate;
 		this.passengerHandler = passengerHandler;
 		this.stopDurationProvider = stopDurationProvider;
+		this.prebookingManager = prebookingManager;
+		this.abandonVoter = abandonVoter;
 	}
 
 	@Override
@@ -42,7 +48,8 @@ public DynAction createAction(DynAgent dynAgent, DvrpVehicle vehicle, double now
 		if (getBaseTypeOrElseThrow(task).equals(DrtTaskBaseType.STOP)) {
 			DrtStopTask stopTask = (DrtStopTask) task;
 			return new PrebookingStopActivity(passengerHandler, dynAgent, stopTask, stopTask.getDropoffRequests(),
-					stopTask.getPickupRequests(), DrtActionCreator.DRT_STOP_NAME, () -> stopTask.getEndTime(), stopDurationProvider, vehicle);
+					stopTask.getPickupRequests(), DrtActionCreator.DRT_STOP_NAME, () -> stopTask.getEndTime(),
+					stopDurationProvider, vehicle, prebookingManager, abandonVoter);
 		}
 
 		return delegate.createAction(dynAgent, vehicle, now);