From 4f38ac34186555c604881669913f9a50ee9625c1 Mon Sep 17 00:00:00 2001 From: janekdererste Date: Wed, 18 Oct 2023 13:51:01 +0200 Subject: [PATCH] Switch default for usePersonIdForMissingVehicleId to false. We wanted to do this for a long time. --- .../core/config/groups/QSimConfigGroup.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/matsim/src/main/java/org/matsim/core/config/groups/QSimConfigGroup.java b/matsim/src/main/java/org/matsim/core/config/groups/QSimConfigGroup.java index 14c9504e785..42f0685ed20 100644 --- a/matsim/src/main/java/org/matsim/core/config/groups/QSimConfigGroup.java +++ b/matsim/src/main/java/org/matsim/core/config/groups/QSimConfigGroup.java @@ -87,7 +87,7 @@ public enum EndtimeInterpretation {minOfEndtimeAndMobsimFinished, onlyUseEndtime @Positive private double stuckTime = 10; private boolean removeStuckVehicles = false; - private boolean usePersonIdForMissingVehicleId = true; + private boolean usePersonIdForMissingVehicleId = false; @Positive private int numberOfThreads = 1; // private static final String CREATING_VEHICLES_FOR_ALL_NETWORK_MODES = "creatingVehiclesForAllNetworkModes"; @@ -240,18 +240,18 @@ public final Map getComments() { public enum NodeTransition { emptyBufferAfterBufferRandomDistribution_dontBlockNode, emptyBufferAfterBufferRandomDistribution_nodeBlockedWhenSingleOutlinkFull, - moveVehByVehRandomDistribution_dontBlockNode, - moveVehByVehRandomDistribution_nodeBlockedWhenSingleOutlinkFull, + moveVehByVehRandomDistribution_dontBlockNode, + moveVehByVehRandomDistribution_nodeBlockedWhenSingleOutlinkFull, moveVehByVehDeterministicPriorities_nodeBlockedWhenSingleOutlinkFull - /* note: moveVehByVehDeterministicPriorities is not implemented for the case when the node is not blocked + /* note: moveVehByVehDeterministicPriorities is not implemented for the case when the node is not blocked * as soon as a single outlink is full * theresa, jun'20 */ } private NodeTransition nodeTransitionLogic = NodeTransition.emptyBufferAfterBufferRandomDistribution_dontBlockNode; - + // --- - + public QSimConfigGroup() { super(GROUP_NAME); } @@ -641,16 +641,16 @@ public boolean setUsingTravelTimeCheckInTeleportation( boolean val ) { // yyyyyy this should better become a threshold number! kai, aug'16 return this.usingTravelTimeCheckInTeleportation = val ; } - + static final String PCU_THRESHOLD_FOR_FLOW_CAPACITY_EASING = // "Flow capacity easing is activated for vehicles of size equal or smaller than the specified threshold. " + "Introduced to minimise the chances of buses being severely delayed in downsampled scenarios"; - - + + public double getPcuThresholdForFlowCapacityEasing() { return pcuThresholdForFlowCapacityEasing; } - + /** * @param pcuThresholdForFlowCapacityEasing -- {@value #PCU_THRESHOLD_FOR_FLOW_CAPACITY_EASING} */ @@ -685,5 +685,5 @@ public void setInflowCapacitySetting(InflowCapacitySetting inflowCapacitySetting // // yyyy do we really need this switch? Quite in general, please try to avoid boolean switches. kai, may'18 // this.creatingVehiclesForAllNetworkModes = creatingVehiclesForAllNetworkModes; // } - + }