update handling of occupany analysis

matsim-org · Nov 11, 2023 · 9d4e210 · 9d4e210
1 parent d139575
commit 9d4e210
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtModeAnalysisModule.java b/contribs/drt/src/main/java/org/matsim/contrib/drt/analysis/DrtModeAnalysisModule.java
@@ -55,7 +55,7 @@
  */
 public class DrtModeAnalysisModule extends AbstractDvrpModeModule {
 	private final DrtConfigGroup drtCfg;
-	private ImmutableSet<Task.TaskType> passengerServingTaskTypes = ImmutableSet.of(DrtDriveTask.TYPE, DefaultDrtStopTask.TYPE, DrtStayTask.TYPE);
+	private ImmutableSet<Task.TaskType> passengerServingTaskTypes = ImmutableSet.of(DrtDriveTask.TYPE, DefaultDrtStopTask.TYPE);
 
 	private static final Comparator<Task.TaskType> taskTypeComparator = Comparator.comparing(type -> {
 		//we want the following order on the plot: STAY, RELOCATE, other

diff --git a/...vrp/src/main/java/org/matsim/contrib/dvrp/analysis/VehicleOccupancyProfileCalculator.java b/...vrp/src/main/java/org/matsim/contrib/dvrp/analysis/VehicleOccupancyProfileCalculator.java
@@ -166,9 +166,7 @@ private void increment(VehicleState state, double endTime) {
 		Verify.verify(state.occupancy >= 0);
 		Verify.verify(state.occupancy <= maxCapacity);
 
-		boolean servingPassengers = passengerServingTaskTypes.contains(state.taskType);
-		Verify.verify(servingPassengers || state.occupancy == 0,
-				"Vehicles not serving passengers must not be occupied");
+		boolean servingPassengers = passengerServingTaskTypes.contains(state.taskType) || state.occupancy > 0;
 
 		double[] profile = servingPassengers ?
 				vehicleOccupancyProfiles.get(state.occupancy) :