From 9d4e21081d90226969c4b5df9ebec676aa043863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20H=C3=B6rl?= Date: Sun, 12 Nov 2023 00:06:29 +0100 Subject: [PATCH] update handling of occupany analysis --- .../matsim/contrib/drt/analysis/DrtModeAnalysisModule.java | 2 +- .../dvrp/analysis/VehicleOccupancyProfileCalculator.java | 4 +--- 2 files changed, 2 insertions(+), 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 index c4fb3074375..e362e4d4935 100644 --- 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 passengerServingTaskTypes = ImmutableSet.of(DrtDriveTask.TYPE, DefaultDrtStopTask.TYPE, DrtStayTask.TYPE); + private ImmutableSet passengerServingTaskTypes = ImmutableSet.of(DrtDriveTask.TYPE, DefaultDrtStopTask.TYPE); private static final Comparator taskTypeComparator = Comparator.comparing(type -> { //we want the following order on the plot: STAY, RELOCATE, other diff --git a/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/analysis/VehicleOccupancyProfileCalculator.java b/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/analysis/VehicleOccupancyProfileCalculator.java index 06751bfbe99..16a8136492c 100644 --- a/contribs/dvrp/src/main/java/org/matsim/contrib/dvrp/analysis/VehicleOccupancyProfileCalculator.java +++ b/contribs/dvrp/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) :