From b62225133ba0050ac4a8bd05191312d445646c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludwig=20J=C3=A4ck?= Date: Tue, 16 Aug 2022 11:16:27 +0200 Subject: [PATCH 01/10] updated target version to 2.3 --- .../SimulationCommandHandlerTest.java | 4 +- .../scenarioelements/TargetController.java | 168 ++++++++++++------ .../control/simulation/Simulation.java | 7 +- .../jsontranformation/JsonNodeExplorer.java | 13 ++ .../json/TargetVersionV2_2.java | 2 + .../json/TargetVersionV2_3.java | 111 ++++++++++++ .../attributes/scenario/AttributesTarget.java | 153 +++++++++++----- .../src/org/vadere/state/scenario/Target.java | 32 ++-- .../state/util/StateJsonConverterTest.java | 4 +- .../src/org/vadere/util/version/Version.java | 1 + 10 files changed, 381 insertions(+), 114 deletions(-) create mode 100644 VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_3.java diff --git a/VadereManager/tests/org/vadere/manager/traci/commandHandler/SimulationCommandHandlerTest.java b/VadereManager/tests/org/vadere/manager/traci/commandHandler/SimulationCommandHandlerTest.java index 6fcb1579f..230477e3c 100644 --- a/VadereManager/tests/org/vadere/manager/traci/commandHandler/SimulationCommandHandlerTest.java +++ b/VadereManager/tests/org/vadere/manager/traci/commandHandler/SimulationCommandHandlerTest.java @@ -48,8 +48,8 @@ public class SimulationCommandHandlerTest extends CommandHandlerTest { int varID = var.id; TraCIDataType varType = var.type; String elementID = "-1"; - String retValWin = "7cbf8c42d1b4cfa035f613c30236227d51062db8"; - String retValLin = "24830db16e36cf11bc9bd0913be6f9ee42d8d0bb"; + String retValWin = "17faa2749e83689e891a38197216a55dd18eb03b"; + String retValLin = "de1d795f3b3b5143b4ce22826f513ba219434e64"; // response ok // String basePath = "testResources/testProject001/scenarios"; diff --git a/VadereSimulator/src/org/vadere/simulator/control/scenarioelements/TargetController.java b/VadereSimulator/src/org/vadere/simulator/control/scenarioelements/TargetController.java index f1c74c9e3..e6aaf8756 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/scenarioelements/TargetController.java +++ b/VadereSimulator/src/org/vadere/simulator/control/scenarioelements/TargetController.java @@ -1,5 +1,7 @@ package org.vadere.simulator.control.scenarioelements; +import org.apache.commons.math3.random.JDKRandomGenerator; +import org.vadere.state.attributes.scenario.AttributesTarget; import org.vadere.state.scenario.Agent; import org.vadere.state.scenario.Car; import org.vadere.state.scenario.DynamicElement; @@ -7,28 +9,34 @@ import org.vadere.state.scenario.Pedestrian; import org.vadere.state.scenario.Target; import org.vadere.state.scenario.TargetListener; import org.vadere.state.scenario.Topography; +import org.vadere.state.scenario.distribution.DistributionFactory; +import org.vadere.state.scenario.distribution.VadereDistribution; import org.vadere.state.types.TrafficLightPhase; import org.vadere.util.geometry.shapes.VPoint; import org.vadere.util.geometry.shapes.VShape; import org.vadere.util.logging.Logger; import java.awt.geom.Rectangle2D; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; public class TargetController extends ScenarioElementController { + + private final Target.WaitingBehaviour waitingBehaviour; private static final Logger log = Logger.getLogger(TargetController.class); + private VadereDistribution distribution = null; + private final AttributesTarget targetAttributes; + + private double phaseLength = 0; public final Target target; private Topography topography; - public TrafficLightPhase phase = TrafficLightPhase.GREEN; + public TrafficLightPhase phase; - public TargetController(Topography topography, Target target) { + public TargetController(Topography topography, Target target,Random random) { this.target = target; + this.targetAttributes = target.getAttributes(); this.topography = topography; if (this.target.isStartingWithRedLight()) { @@ -36,6 +44,23 @@ public class TargetController extends ScenarioElementController { } else { phase = TrafficLightPhase.GREEN; } + if (!targetAttributes.getWaitingBehaviour().equals(Target.WaitingBehaviour.NO_WAITING)) { + try { + distribution = DistributionFactory.create( + targetAttributes.getWaitingTimeDistribution(), + targetAttributes.getDistributionParameters(), + 0, + new JDKRandomGenerator(random.nextInt()) + ); + + } catch (Exception e) { + throw new IllegalArgumentException("Problem with scenario parameters for target: " + + "waitingTimeDistribution and/or distributionParameters. See causing Excepion herefafter.", e); + } + + this.phaseLength = this.distribution.getNextSpawnTime(0); + } + this.waitingBehaviour = target.getWaitingBehaviour(); } public void update(double simTimeInSec) { @@ -44,29 +69,41 @@ public class TargetController extends ScenarioElementController { } for (DynamicElement element : getPrefilteredDynamicElements()) { + final Agent agent = castCheckAgent(element); + final int agentID = agent.getId(); + if(agent == null) continue; - final Agent agent; - if (element instanceof Agent) { - agent = (Agent) element; - } else { - log.error("The given object is not a subtype of Agent."); - continue; - } + final boolean agentHasReachedThisTarget = + isNextTargetForAgent(agent) + && hasAgentReachedThisTarget(agent); - if (isNextTargetForAgent(agent) - && hasAgentReachedThisTarget(agent)) { + final boolean agentWaitingPeriodEnds = + target.getLeavingTimes().containsKey(agentID) && + target.getLeavingTimes().get(agentID) <= simTimeInSec; + if (agentHasReachedThisTarget){ notifyListenersTargetReached(agent); - - if (target.getWaitingTime() <= 0) { - checkRemove(agent); - } else { - waitingBehavior(agent, simTimeInSec); - } + } + if (agentHasReachedThisTarget && agentWaitingPeriodEnds){ + checkRemove(agent); + } + if (agentHasReachedThisTarget && !agentWaitingPeriodEnds){ + waitingBehavior(agent, simTimeInSec); } } } + private static Agent castCheckAgent(DynamicElement element) { + final Agent agent; + if (element instanceof Agent) { + agent = (Agent) element; + } else { + log.error("The given object is not a subtype of Agent."); + return null; + } + return agent; + } + private Collection getPrefilteredDynamicElements() { final double reachedDistance = target.getAttributes().getDeletionDistance(); @@ -82,33 +119,65 @@ public class TargetController extends ScenarioElementController { } private void waitingBehavior(final Agent agent, double simTimeInSec) { - final int agentId = agent.getId(); // individual waiting behaviour, as opposed to waiting at a traffic light - if (target.getAttributes().isIndividualWaiting()) { - final Map enteringTimes = target.getEnteringTimes(); - if (enteringTimes.containsKey(agentId)) { - if (simTimeInSec - enteringTimes.get(agentId) > target - .getWaitingTime()) { - enteringTimes.remove(agentId); - checkRemove(agent); - } - } else { - final int parallelWaiters = target.getParallelWaiters(); - if (parallelWaiters <= 0 || (parallelWaiters > 0 && - enteringTimes.size() < parallelWaiters)) { - enteringTimes.put(agentId, simTimeInSec); - } + switch (waitingBehaviour){ + case INDIVIDUAL: { + waitIndividually(agent, simTimeInSec); + break; } - } else { - // traffic light switching based on waiting time. Light starts green. - phase = getCurrentTrafficLightPhase(simTimeInSec); - - if (phase == TrafficLightPhase.GREEN) { + case TRAFFIC_LIGHT: { + waitTrafficLight(agent,simTimeInSec); + break; + } + case NO_WAITING:{ checkRemove(agent); + break; } } } + private void waitTrafficLight(Agent agent, double simTimeInSec) { + // traffic light switching based on waiting time. Light starts green. + phase = getCurrentTrafficLightPhase(simTimeInSec); + if (phase == TrafficLightPhase.GREEN) { + checkRemove(agent); + } + } + + private void waitIndividually(Agent agent, double simTimeInSec) { + final int agentId = agent.getId(); + final Map leavingTimes = target.getLeavingTimes(); + + final boolean agentIsWaiting = leavingTimes.containsKey(agentId); + if (agentIsWaiting) { + handleWaitingAgent(agent, simTimeInSec, leavingTimes); + } else { + handleArrivingAgent(agent, simTimeInSec, leavingTimes); + } + } + + private void handleArrivingAgent(Agent agent,double simTimeInSec, Map leavingTimes) { + final int agentId = agent.getId(); + final int waitingSpots = target.getParallelWaiters(); + + final boolean targetHasFreeWaitingSpots = waitingSpots <= 0 || (waitingSpots > 0 && + leavingTimes.size() < waitingSpots); + if (targetHasFreeWaitingSpots) { + // TODO: Refractor VadereDistributions method name + leavingTimes.put(agentId, this.distribution.getNextSpawnTime(simTimeInSec)); + } + } + + private void handleWaitingAgent(Agent agent, double simTimeInSec, Map leavingTimes) { + final int agentId = agent.getId(); + final boolean agentWaitingTimeIsOver = simTimeInSec > leavingTimes.get(agentId); + + if (agentWaitingTimeIsOver) { + leavingTimes.remove(agentId); + checkRemove(agent); + } + } + private List getObjectsInCircle(final Class clazz, final VPoint center, final double radius) { return topography.getSpatialMap(clazz).getObjects(center, radius); } @@ -123,27 +192,26 @@ public class TargetController extends ScenarioElementController { } private TrafficLightPhase getCurrentTrafficLightPhase(double simTimeInSec) { - double phaseSecond = simTimeInSec % (target.getWaitingTime() * 2 + target.getWaitingTimeYellowPhase() * 2); + double phaseSecond = simTimeInSec % (this.phaseLength * 2 + target.getWaitingTimeYellowPhase() * 2); if (target.isStartingWithRedLight()) { - if (phaseSecond < target.getWaitingTime()) + if (phaseSecond < this.phaseLength) return TrafficLightPhase.RED; - if (phaseSecond < target.getWaitingTime() + target.getWaitingTimeYellowPhase()) + if (phaseSecond < this.phaseLength + target.getWaitingTimeYellowPhase()) return TrafficLightPhase.YELLOW; - if (phaseSecond < target.getWaitingTime() * 2 + target.getWaitingTimeYellowPhase()) + if (phaseSecond < this.phaseLength * 2 + target.getWaitingTimeYellowPhase()) return TrafficLightPhase.GREEN; - return TrafficLightPhase.YELLOW; } else { - if (phaseSecond < target.getWaitingTime()) + if (phaseSecond < this.phaseLength) return TrafficLightPhase.GREEN; - if (phaseSecond < target.getWaitingTime() + target.getWaitingTimeYellowPhase()) + if (phaseSecond < this.phaseLength + target.getWaitingTimeYellowPhase()) return TrafficLightPhase.YELLOW; - if (phaseSecond < target.getWaitingTime() * 2 + target.getWaitingTimeYellowPhase()) + if (phaseSecond < this.phaseLength * 2 + target.getWaitingTimeYellowPhase()) return TrafficLightPhase.RED; - return TrafficLightPhase.YELLOW; } + return TrafficLightPhase.YELLOW; } private boolean isNextTargetForAgent(Agent agent) { diff --git a/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java b/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java index 83539391c..fe8e046b7 100644 --- a/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java +++ b/VadereSimulator/src/org/vadere/simulator/control/simulation/Simulation.java @@ -41,6 +41,7 @@ public class Simulation implements ControllerProvider{ private final Collection targetControllers; private final Collection targetChangerControllers; private final Collection absorbingAreaControllers; + private final Random random; private TeleporterController teleporterController; private TopographyController topographyController; private DynamicElementFactory dynamicElementFactory; @@ -129,7 +130,7 @@ public class Simulation implements ControllerProvider{ // "stimulusController" is final. Therefore, create object here and not in helper method. this.stimulusController = new StimulusController(scenarioStore); - + this.random = random; createControllers(domain, mainModel, random); // this code is to visualize the potential fields. It may be refactored later. @@ -157,7 +158,7 @@ public class Simulation implements ControllerProvider{ } for (Target target : topography.getTargets()) { - targetControllers.add(new TargetController(topography, target)); + targetControllers.add(new TargetController(topography, target,random)); } for (TargetChanger targetChanger : topography.getTargetChangers()) { @@ -428,7 +429,7 @@ public class Simulation implements ControllerProvider{ // new targets. this.targetControllers.clear(); for (Target target : this.topographyController.getTopography().getTargets()) { - targetControllers.add(new TargetController(this.topographyController.getTopography(), target)); + targetControllers.add(new TargetController(this.topographyController.getTopography(), target,random)); } for (SourceController sourceController : this.sourceControllers) { diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/JsonNodeExplorer.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/JsonNodeExplorer.java index b892757fc..676cf7d98 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/JsonNodeExplorer.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/JsonNodeExplorer.java @@ -85,6 +85,11 @@ public interface JsonNodeExplorer { parent.put(keyName, value); } + default void addStringField(JsonNode root, String keyName, String value){ + ObjectNode parent = (ObjectNode) root; + parent.put(keyName, value); + } + default JsonNode pathMustExist(JsonNode root, String path) throws MigrationException { JsonNode ret = path(root, path); if (ret.isMissingNode()) { @@ -125,6 +130,10 @@ public interface JsonNodeExplorer { return nodeNotEmptyAnd(node, n -> n.getNodeType() == JsonNodeType.NUMBER); } + default boolean nodeIsBoolean(JsonNode node){ + return nodeNotEmptyAnd(node, n -> n.getNodeType() == JsonNodeType.BOOLEAN); + } + default boolean nodeNotEmptyAnd(JsonNode node, Predicate predicate) { return !node.isMissingNode() && predicate.test(node); @@ -174,6 +183,10 @@ public interface JsonNodeExplorer { JsonNode tChanger = pathMustExist(node, "scenario/sources"); return new JsonFilterIterator(tChanger, n->true); } + default Iterator iteratorTargets(JsonNode node) throws MigrationException{ + JsonNode tChanger = pathMustExist(node, "scenario/topography/targets"); + return new JsonFilterIterator(tChanger, n->true); + } default Iterator iteratorMeasurementArea(JsonNode node, int id) throws MigrationException { JsonNode processors = pathMustExist(node, "scenario/topography/measurementAreas"); diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_2.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_2.java index c1a48799f..d994358bb 100644 --- a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_2.java +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_2.java @@ -34,6 +34,8 @@ public class TargetVersionV2_2 extends SimpleJsonTransformation { addPostHookLast(this::sort); } + + private JsonNode moveThreatWaitAreasToLocation(JsonNode node) { // generates one stimulusInfo for each stimulus diff --git a/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_3.java b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_3.java new file mode 100644 index 000000000..f8b8e02d4 --- /dev/null +++ b/VadereSimulator/src/org/vadere/simulator/projects/migration/jsontranformation/json/TargetVersionV2_3.java @@ -0,0 +1,111 @@ +package org.vadere.simulator.projects.migration.jsontranformation.json; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.vadere.annotation.factories.migrationassistant.MigrationTransformation; +import org.vadere.simulator.projects.migration.MigrationException; +import org.vadere.simulator.projects.migration.jsontranformation.SimpleJsonTransformation; +import org.vadere.state.scenario.Target; +import org.vadere.state.util.JacksonObjectMapper; +import org.vadere.util.version.Version; + +import java.util.Iterator; + +/** + * Old: + * { + * ... + * "waitingTime" : any_double + * } + * New: + * { + * "waitingTimeDistribution" : "constant" + * "distributionParameters" : { + * "updateFrequency" : any_double + * } + * } + * + * Old: + * { + * "individualWaiting" : true | false + * } + * + * New: + * { + * "waitingBehaviour": "INDIVIDUAL" | "TRAFFIC_LIGHT" | "NO_WAITING" + * } + */ +@MigrationTransformation(targetVersionLabel = "2.3") +public class TargetVersionV2_3 extends SimpleJsonTransformation { + + JacksonObjectMapper mapper = new JacksonObjectMapper(); + + public TargetVersionV2_3() { + super(Version.V2_3); + } + + @Override + protected void initDefaultHooks() { + addPostHookLast(this::replaceIndividualWaitingWithWaitingBehaviour); + addPostHookLast(this::replaceWaitingTimeWithDistribution); + addPostHookLast(this::sort); + } + + private JsonNode replaceWaitingTimeWithDistribution(JsonNode node) throws MigrationException { + if (!path(node, "scenario/topography/targets").isMissingNode()) { + Iterator iter = iteratorTargets(node); + while (iter.hasNext()) { + JsonNode target = iter.next(); + + if (path(target, "waitingTime").isMissingNode() && + !path(target, "waitingTimeDistribution").isMissingNode() && + !path(target, "distributionParameters").isMissingNode()) { + continue; + } + if (!path(target, "waitingTime").isMissingNode()) { + double waitingTime = target.get("waitingTime").asDouble(); + if (waitingTime == 0.0){ + addStringField(target,"waitingBehaviour", Target.WaitingBehaviour.NO_WAITING.toString()); + }else{ + ObjectNode objectNode = (ObjectNode) target; + objectNode.put("waitingTimeDistribution", "constant"); + ObjectNode param = mapper.createObjectNode(); + param.put("updateFrequency", waitingTime); + objectNode.put("distributionParameters", param); + } + remove(target, "waitingTime"); + } + } + } + return node; + } + + private JsonNode replaceIndividualWaitingWithWaitingBehaviour(JsonNode node) throws MigrationException { + + if (!path(node, "scenario/topography/targets").isMissingNode()) { + Iterator iter = iteratorTargets(node); + while (iter.hasNext()) { + JsonNode target = iter.next(); + + if (path(target, "individualWaiting").isMissingNode() && + path(target, "waitingBehaviour").isMissingNode()) { + ObjectNode objectNode = (ObjectNode) target; + objectNode.put("waitingBehaviour", Target.WaitingBehaviour.INDIVIDUAL.toString()); + } + if (!path(target, "individualWaiting").isMissingNode()) { + boolean individual = target.get("individualWaiting").asBoolean(); + remove(target, "individualWaiting"); + ObjectNode objectNode = (ObjectNode) target; + if (individual) { + objectNode.put("waitingBehaviour", Target.WaitingBehaviour.INDIVIDUAL.toString()); + } else { + objectNode.put("waitingBehaviour", Target.WaitingBehaviour.TRAFFIC_LIGHT.toString()); + } + } + + } + } + return node; + } +} diff --git a/VadereState/src/org/vadere/state/attributes/scenario/AttributesTarget.java b/VadereState/src/org/vadere/state/attributes/scenario/AttributesTarget.java index 966305a5b..d61bc8eec 100644 --- a/VadereState/src/org/vadere/state/attributes/scenario/AttributesTarget.java +++ b/VadereState/src/org/vadere/state/attributes/scenario/AttributesTarget.java @@ -2,61 +2,95 @@ package org.vadere.state.attributes.scenario; import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.databind.JsonNode; import org.vadere.state.attributes.AttributesEmbedShape; import org.vadere.state.scenario.Pedestrian; +import org.vadere.state.scenario.Target; import org.vadere.state.util.Views; +import org.vadere.state.scenario.distribution.parameter.*; import org.vadere.util.geometry.shapes.VShape; /** - * Attributes of a target area, used by TargetController in VadereSimulation. - * + * Attributes of a {@link Target}. + * @author Ludwig Jaeck */ public class AttributesTarget extends AttributesEmbedShape { - @JsonView(Views.CacheViewExclude.class) // ignore when determining if floor field cache is valid private int id = ID_NOT_SET; + + + /** Shape and position. */ + private VShape shape; + /** * True: elements are removed from the simulation after entering. * False: the target id is removed from the target id list, but the element remains. */ @JsonView(Views.CacheViewExclude.class) // ignore when determining if floor field cache is valid private boolean absorbing = true; - /** Shape and position. */ - private VShape shape; - /** - * Waiting time in seconds on this area. - * If "individualWaiting" is true, then each element waits the given time on this area before - * "absorbing" takes place. - * If it is false, then the element waits this exact time before switching in "no waiting" mode - * and back. This way, a traffic light can be simulated. - */ + @JsonView(Views.CacheViewExclude.class) // ignore when determining if floor field cache is valid - private double waitingTime = 0; + private double deletionDistance = 0.1; + + /** - * Waiting time on the target in the yellow phase (before red and green). - * This can be used to cycle traffic lights in red, green or yellow phase, so that (Y -> R -> Y - * -> G) cycles. - * Needed on crossings, otherwise cars bump into each other. + * Modes:
+ *
    + *
  • INDIVIDUAL
    • + *

    Agents have an individual waiting time at the target. The waiting by time is described by {@link AttributesTarget#waitingTimeDistribution}.

    + *
  • TRAFFIC_LIGHT
    • + *

    The target is a traffic light. Agents wait for the green phase.

    + *
  • NO_WAITING
    • + *

    Agents are switching target immediately of 'absorbing' is set to false else the get absorbed.

    + *
*/ - @JsonView(Views.CacheViewExclude.class) // ignore when determining if floor field cache is valid - private double waitingTimeYellowPhase = 0; + @JsonView(Views.CacheViewExclude.class) + private String waitingBehaviour; + /** * Number of elements that can wait or be absorbed at one time in parallel on this area. * If zero, an infinite amount can wait or be absorbed. */ @JsonView(Views.CacheViewExclude.class) // ignore when determining if floor field cache is valid private int parallelWaiters = 0; + + // TODO should be "reachedDistance"; agents do not necessarily get deleted/absorbed + /** - * True: each element on the target area is treated individually. - * False: the target waits for "waitingTime" and then enters "no waiting mode" for the same time - * (and then goes back to waiting mode). See "waitingTime". + * Distribution types:
+ *
    + *
  • "binomial" + *
  • "constant" + *
  • "empirical" + *
  • "linearInterpolation" + *
  • "mixed" + *
  • "negativeExponential" + *
  • "normal" + *
  • "poisson" + *
  • "singleSpawn" + *
  • "timeSeries" + *
*/ @JsonView(Views.CacheViewExclude.class) // ignore when determining if floor field cache is valid - private boolean individualWaiting = true; + private String waitingTimeDistribution; + + /** + * Distribution types:
+ *
    + *
  • "BinomialParameter" [{@link BinomialParameter}]
    • + *
  • "ConstantParameter" [{@link ConstantParameter}]
    • + *
  • "EmpiricalParameter" [{@link EmpiricalParameter}]
    • + *
  • "LinearInterpolationParameter" [{@link LinearInterpolationParameter}]
    • + *
  • "MixedParameter" [{@link MixedParameter}]
    • + *
  • "NegativeExponentialParameter" [{@link NegativeExponentialParameter}]
    • + *
  • "NormalParameter" [{@link NormalParameter}]
    • + *
  • "PoissonParameter" [{@link PoissonParameter}]
    • + *
  • "SingleSpawnParameter" [{@link SingleSpawnParameter}]
    • + *
  • "TimeSeriesParameter" [{@link TimeSeriesParameter}]
    • + *
+ */ + private JsonNode distributionParameters ; - // TODO should be "reachedDistance"; agents do not necessarily get deleted/absorbed - @JsonView(Views.CacheViewExclude.class) // ignore when determining if floor field cache is valid - private double deletionDistance = 0.1; /** * If set to false, starts with green phase (nonblocking), otherwise blocks the path (red @@ -65,6 +99,15 @@ public class AttributesTarget extends AttributesEmbedShape { @JsonView(Views.CacheViewExclude.class) // ignore when determining if floor field cache is valid private boolean startingWithRedLight = false; + /** + * Waiting time on the target in the yellow phase (before red and green). + * This can be used to cycle traffic lights in red, green or yellow phase, so that (Y -> R -> Y + * -> G) cycles. + * Needed on crossings, otherwise cars bump into each other. + */ + @JsonView(Views.CacheViewExclude.class) // ignore when determining if floor field cache is valid + private double waitingTimeYellowPhase = 0; + /** * If non-negative, determines the desired speed the particle (pedestrian, car) is assigned * after passing this target. @@ -73,6 +116,8 @@ public class AttributesTarget extends AttributesEmbedShape { @JsonView(Views.CacheViewExclude.class) // ignore when determining if floor field cache is valid private double nextSpeed = -1.0; + + public AttributesTarget() {} public AttributesTarget(final VShape shape) { @@ -89,20 +134,15 @@ public class AttributesTarget extends AttributesEmbedShape { this.shape = pedestrian.getShape(); this.absorbing = true; this.id = pedestrian.getIdAsTarget(); - this.waitingTime = 0; this.waitingTimeYellowPhase = 0; this.parallelWaiters = 0; - this.individualWaiting = true; + this.waitingBehaviour = Target.WaitingBehaviour.NO_WAITING.toString(); this.startingWithRedLight = false; this.nextSpeed = -1; } // Getters... - public boolean isIndividualWaiting() { - return individualWaiting; - } - public boolean isAbsorbing() { return absorbing; } @@ -121,10 +161,6 @@ public class AttributesTarget extends AttributesEmbedShape { return shape; } - public double getWaitingTime() { - return waitingTime; - } - public double getWaitingTimeYellowPhase() { return waitingTimeYellowPhase; } @@ -165,11 +201,6 @@ public class AttributesTarget extends AttributesEmbedShape { this.absorbing = absorbing; } - public void setWaitingTime(double waitingTime) { - checkSealed(); - this.waitingTime = waitingTime; - } - public void setWaitingTimeYellowPhase(double waitingTimeYellowPhase) { checkSealed(); this.waitingTimeYellowPhase = waitingTimeYellowPhase; @@ -180,11 +211,6 @@ public class AttributesTarget extends AttributesEmbedShape { this.parallelWaiters = parallelWaiters; } - public void setIndividualWaiting(boolean individualWaiting) { - checkSealed(); - this.individualWaiting = individualWaiting; - } - public void setDeletionDistance(double deletionDistance) { checkSealed(); this.deletionDistance = deletionDistance; @@ -199,4 +225,39 @@ public class AttributesTarget extends AttributesEmbedShape { checkSealed(); this.nextSpeed = nextSpeed; } + + public JsonNode getDistributionParameters() { + return distributionParameters; + } + + public void setDistributionParameters(JsonNode distributionParameters) { + checkSealed(); + this.distributionParameters = distributionParameters; + } + + public String getWaitingTimeDistribution() { + return waitingTimeDistribution; + } + + public void setWaitingTimeDistribution(String waitingTimeDistribution) { + checkSealed(); + this.waitingTimeDistribution = waitingTimeDistribution; + } + + public Target.WaitingBehaviour getWaitingBehaviour() { + if (waitingBehaviour.equals(Target.WaitingBehaviour.INDIVIDUAL.toString())) { + return Target.WaitingBehaviour.INDIVIDUAL; + } else if (waitingBehaviour.equals(Target.WaitingBehaviour.TRAFFIC_LIGHT.toString())) { + return Target.WaitingBehaviour.TRAFFIC_LIGHT; + } + else if (waitingBehaviour.equals(Target.WaitingBehaviour.NO_WAITING.toString())){ + return Target.WaitingBehaviour.NO_WAITING; + } + throw new IllegalArgumentException("expected a waiting mode in AttributesTarget"); + } + + public void setWaitingBehaviour(Target.WaitingBehaviour behaviour){ + checkSealed(); + this.waitingBehaviour = behaviour.toString(); + } } diff --git a/VadereState/src/org/vadere/state/scenario/Target.java b/VadereState/src/org/vadere/state/scenario/Target.java index 98442f059..96c08ec04 100644 --- a/VadereState/src/org/vadere/state/scenario/Target.java +++ b/VadereState/src/org/vadere/state/scenario/Target.java @@ -15,6 +15,7 @@ public class Target extends ScenarioElement implements Comparable { private AttributesTarget attributes; private final Map enteringTimes; + private final Map leavingTimes; /** * Collection of listeners - unordered because it's order is not predictable @@ -22,22 +23,28 @@ public class Target extends ScenarioElement implements Comparable { */ private final Collection targetListeners = new LinkedList<>(); + public enum WaitingBehaviour { + INDIVIDUAL, TRAFFIC_LIGHT, NO_WAITING + } public Target(AttributesTarget attributes) { - this(attributes, new HashMap<>()); + this(attributes, new HashMap<>(),new HashMap<>()); } public Target(AttributesTarget attributes, Map enteringTimes) { + this(attributes,enteringTimes,new HashMap<>()); + } + + public Target(AttributesTarget attributes, Map enteringTimes, Map leavingTimes) { this.attributes = attributes; this.enteringTimes = enteringTimes; + this.leavingTimes = leavingTimes; } + public boolean isAbsorbing() { return attributes.isAbsorbing(); } - public double getWaitingTime() { - return attributes.getWaitingTime(); - } public double getWaitingTimeYellowPhase() { return attributes.getWaitingTimeYellowPhase(); @@ -51,6 +58,10 @@ public class Target extends ScenarioElement implements Comparable { return attributes.isStartingWithRedLight(); } + public WaitingBehaviour getWaitingBehaviour(){ + return attributes.getWaitingBehaviour(); + } + public double getNextSpeed() { return attributes.getNextSpeed(); } @@ -59,6 +70,10 @@ public class Target extends ScenarioElement implements Comparable { return enteringTimes; } + public Map getLeavingTimes(){ + return leavingTimes; + } + @Override public int getId() { return attributes.getId(); @@ -100,13 +115,8 @@ public class Target extends ScenarioElement implements Comparable { } Target other = (Target) obj; if (attributes == null) { - if (other.attributes != null) { - return false; - } - } else if (!attributes.equals(other.attributes)) { - return false; - } - return true; + return other.attributes == null; + } else return attributes.equals(other.attributes); } @Override diff --git a/VadereState/tests/org/vadere/state/util/StateJsonConverterTest.java b/VadereState/tests/org/vadere/state/util/StateJsonConverterTest.java index 1c17fbf90..f33231295 100644 --- a/VadereState/tests/org/vadere/state/util/StateJsonConverterTest.java +++ b/VadereState/tests/org/vadere/state/util/StateJsonConverterTest.java @@ -132,10 +132,10 @@ public class StateJsonConverterTest { // changes must NOT change the floor field hash attrTarget.setId(33); attrTarget.setAbsorbing(false); - attrTarget.setWaitingTime(3); + attrTarget.setWaitingBehaviour(Target.WaitingBehaviour.TRAFFIC_LIGHT); attrTarget.setWaitingTimeYellowPhase(2); attrTarget.setParallelWaiters(1); - attrTarget.setIndividualWaiting(false); + attrTarget.setWaitingTimeDistribution("binomial"); attrTarget.setDeletionDistance(0.4); attrTarget.setStartingWithRedLight(true); attrTarget.setNextSpeed(1); diff --git a/VadereUtils/src/org/vadere/util/version/Version.java b/VadereUtils/src/org/vadere/util/version/Version.java index 2bcb1e467..420563cd9 100644 --- a/VadereUtils/src/org/vadere/util/version/Version.java +++ b/VadereUtils/src/org/vadere/util/version/Version.java @@ -51,6 +51,7 @@ public enum Version { V2_0(2,0), V2_1(2,1), V2_2(2,2), + V2_3(2,3), ; -- GitLab From f48ba2c9d425024f124a5cb86a845f087d9914f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludwig=20J=C3=A4ck?= Date: Sat, 20 Aug 2022 09:13:16 +0200 Subject: [PATCH 02/10] changed bounding box thickness to 1 --- ...orField-CounterflowCognitionModel.scenario | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario index 781892fc3..2e1e4a4fe 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario @@ -1,8 +1,7 @@ { "name" : "Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -122,10 +121,10 @@ "bounds" : { "x" : 0.0, "y" : 0.0, - "width" : 20.0, - "height" : 2.0 + "width" : 21.0, + "height" : 3.0 }, - "boundingBoxWidth" : 0.5, + "boundingBoxWidth" : 1.0, "bounded" : true, "referenceCoordinateSystem" : null }, @@ -136,36 +135,42 @@ "id" : 1, "absorbing" : true, "shape" : { - "x" : 18.5, - "y" : 0.5, + "x" : 19.0, + "y" : 1.0, "width" : 1.0, "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, "waitingTimeYellowPhase" : 0.0, "parallelWaiters" : 0, - "individualWaiting" : true, + "waitingBehaviour" : "individual", "deletionDistance" : 0.1, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 0.0 + } }, { "id" : 2, "absorbing" : true, "shape" : { - "x" : 0.5, - "y" : 0.5, + "x" : 1.0, + "y" : 1.0, "width" : 1.0, "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, "waitingTimeYellowPhase" : 0.0, "parallelWaiters" : 0, - "individualWaiting" : true, + "waitingBehaviour" : "individual", "deletionDistance" : 0.1, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 0.0 + } } ], "targetChangers" : [ ], "absorbingAreas" : [ ], @@ -174,8 +179,8 @@ "sources" : [ { "id" : 3, "shape" : { - "x" : 1.6, - "y" : 0.5, + "x" : 2.1, + "y" : 1.0, "width" : 1.0, "height" : 1.0, "type" : "RECTANGLE" @@ -198,8 +203,8 @@ }, { "id" : 4, "shape" : { - "x" : 17.4, - "y" : 0.5, + "x" : 17.9, + "y" : 1.0, "width" : 1.0, "height" : 1.0, "type" : "RECTANGLE" -- GitLab From ea65714d14c806e1fd0cafb946201dee38b0da56 Mon Sep 17 00:00:00 2001 From: Simon Rahn Date: Tue, 23 Aug 2022 15:14:55 +0200 Subject: [PATCH 03/10] [fix] Add log statement (for testing) --- .../run_vadere_console_with_all_scenario_files.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py b/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py index 8dee261c0..433d924bc 100644 --- a/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py +++ b/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py @@ -159,6 +159,7 @@ def run_scenario_files_with_vadere_console(scenario_files, vadere_console="Vader # run per scenario given the scenario path and output directory subprocess_args += ["scenario-run", "-f", scenario_file, "-o", output_dir] + print(subprocess_args) # Use timout feature, check return value and capture stdout/stderr to a PIPE (use completed_process.stdout # to get it). completed_process = subprocess.run(args=subprocess_args, -- GitLab From 82fd5c4435277e658f8438d0e852cc623e913e2b Mon Sep 17 00:00:00 2001 From: Simon Rahn Date: Tue, 23 Aug 2022 17:07:49 +0200 Subject: [PATCH 04/10] [wip] run only integration tests with optimization tests (only for debugging CI pipeline) --- .gitlab-ci.yml | 2 +- .../run_vadere_console_with_all_scenario_files.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c388ee9ac..6f837b935 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: # Stage Definitions stages: - - unit_test + # - unit_test - integration_test - seed_test - deploy diff --git a/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py b/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py index 433d924bc..46637cabe 100644 --- a/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py +++ b/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py @@ -260,7 +260,7 @@ if __name__ == "__main__": if args.scenario is None: - passed_and_failed_scenarios_model = run_all_model_tests() + # passed_and_failed_scenarios_model = run_all_model_tests() passed_and_failed_scenarios_optimization = run_all_optimization_tests() # Make a summery of all scenario files -- GitLab From 32e038491ee2e6d763a719288beb71d87311a480 Mon Sep 17 00:00:00 2001 From: Simon Rahn Date: Tue, 23 Aug 2022 17:28:43 +0200 Subject: [PATCH 05/10] [fix] undo commented CI jobs and logging statements --- .gitlab-ci.yml | 2 +- .../run_vadere_console_with_all_scenario_files.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6f837b935..c388ee9ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: # Stage Definitions stages: - # - unit_test + - unit_test - integration_test - seed_test - deploy diff --git a/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py b/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py index 46637cabe..8dee261c0 100644 --- a/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py +++ b/Tools/ContinuousIntegration/run_vadere_console_with_all_scenario_files.py @@ -159,7 +159,6 @@ def run_scenario_files_with_vadere_console(scenario_files, vadere_console="Vader # run per scenario given the scenario path and output directory subprocess_args += ["scenario-run", "-f", scenario_file, "-o", output_dir] - print(subprocess_args) # Use timout feature, check return value and capture stdout/stderr to a PIPE (use completed_process.stdout # to get it). completed_process = subprocess.run(args=subprocess_args, @@ -260,7 +259,7 @@ if __name__ == "__main__": if args.scenario is None: - # passed_and_failed_scenarios_model = run_all_model_tests() + passed_and_failed_scenarios_model = run_all_model_tests() passed_and_failed_scenarios_optimization = run_all_optimization_tests() # Make a summery of all scenario files -- GitLab From 0a61d73970150f7abe89e3d63eaf64efc139ddc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludwig=20J=C3=A4ck?= Date: Mon, 29 Aug 2022 14:01:20 +0200 Subject: [PATCH 06/10] migrated files to 2.3 --- .../examples/scenarios/bottleneckA.scenario | 17 +- .../examples/scenarios/bottleneckB.scenario | 17 +- .../bottleneckB_socialDistancing.scenario | 17 +- .../examples/scenarios/closeContact.scenario | 34 +- .../examples/scenarios/passageway.scenario | 30 +- .../examples/scenarios/queue.scenario | 19 +- ...hamner-2020-life_postvis_template.scenario | 4 +- .../hamner-2020-life_template.scenario | 4 +- .../scenarios/lu-2020-life.scenario | 154 +- .../miller-2020-life_template.scenario | 4 +- .../01-Kaiserslautern-Gross.scenario | 4 +- .../02-Kaiserslautern-Mittel.scenario | 4 +- .../03-Kaiserslautern-Klein.scenario | 4 +- .../scenarios/RichardWagnerStrasse.scenario | 69 +- .../RichardWagnerStrasseScaled.scenario | 69 +- ...treet-Pollichstrasse-Narrowed-GNM.scenario | 17 +- ...treet-Pollichstrasse-Narrowed-OSM.scenario | 17 +- ...et-Pollichstrasse-NotNarrowed-GNM.scenario | 17 +- ...et-Pollichstrasse-NotNarrowed-OSM.scenario | 17 +- ...chardWagnerStrasse-OSM-1200agents.scenario | 30 +- ...ichardWagnerStrasse-OSM-400agents.scenario | 30 +- ...ichardWagnerStrasse-OSM-800agents.scenario | 30 +- .../scenarios/hm_stairs.scenario | 56 +- .../scenarios/crossing.scenario | 30 +- .../chicken_floorfield_ok_GPU_event.scenario | 17 +- ...hicken_floorfield_ok_GPU_parallel.scenario | 17 +- .../scenarios/DenseCrowd.scenario | 186 +- .../DenseCrowd_withoutGroups.scenario | 186 +- ...rowd_withoutGroups_fineTargetGrid.scenario | 134 +- ...eCrowd_withoutGroups_largeTargets.scenario | 95 +- ...houtGroups_largeTargets_2_waiting.scenario | 95 +- ...seCrowd_withoutGroups_moreTargets.scenario | 173 +- ...thoutGroups_moreTargets_1_waiting.scenario | 173 +- ...thoutGroups_moreTargets_3_waiting.scenario | 173 +- ...thoutGroups_moreTargets_6_waiting.scenario | 173 +- ...arrowCorridor_3_targets_1_waiting.scenario | 56 +- ...arrowCorridor_3_targets_2_waiting.scenario | 43 +- ...rdinationTask_3_targets_2_waiting.scenario | 43 +- ...k_3_targets_2_waiting_with_runner.scenario | 43 +- .../scenarios/test.scenario | 17 +- .../MWE_groups_target_changer.scenario | 36 +- .../scenarios/bridge_coordinates_kai.scenario | 30 +- .../scenarios/s2ucre_dynamic_groups.scenario | 34 +- .../scenarios/s2ucre_dynamic_waiting.scenario | 259 +- ...ucre_dynamic_waiting_less_targets.scenario | 79 +- ...namic_waiting_less_targets_groups.scenario | 79 +- .../scenarios/s2ucre_static_groups.scenario | 34 +- .../scenarios/s2ucre_static_simple.scenario | 34 +- .../scenarios/s2ucre_static_waiting.scenario | 259 +- ...2ucre_static_waiting_less_targets.scenario | 79 +- ...tatic_waiting_less_targets_groups.scenario | 79 +- .../scenarios/bottleneck_2m.scenario | 17 +- ...imulation-GroupBehavior_no_groups.scenario | 17 +- .../group_OSM_1Source1Place_noGroup.scenario | 17 +- ...group_OSM_1Source2Places_noGroups.scenario | 17 +- .../scenarios/bus_station.scenario | 30 +- .../scenarios/BHM_Liddle_fixed_seed.scenario | 29 +- .../free_flow_measurement_areas.scenario | 172 +- ...measurement_areas_geraderWeglinks.scenario | 172 +- ..._flow_measurement_areas_no_groups.scenario | 159 +- .../free_flow_no_contractions.scenario | 172 +- ...free_flow_no_contractions_clone_1.scenario | 172 +- ...ree_flow_no_contractions_nomareas.scenario | 172 +- ...flow_no_contractions_test_voronoi.scenario | 172 +- .../Demos/roVer/scenarios/mf_base.scenario | 172 +- .../roVer/scenarios/mf_detailed.scenario | 16 +- .../roVer/scenarios/mf_underground.scenario | 120 +- .../roVer/scenarios/roVerTest001.scenario | 16 +- .../roVer/scenarios/roVerTest002.scenario | 68 +- .../route_choice_real_world.scenario | 94 +- .../route_choice_real_world_crownet.scenario | 94 +- ...ute_choice_real_world_crownet_pcm.scenario | 94 +- ...route_choice_real_world_masplaced.scenario | 172 +- .../route_choice_real_world_mayr.scenario | 81 +- ...e_choice_real_world_mayr_original.scenario | 81 +- .../route_choice_real_world_nomareas.scenario | 172 +- ...ice_real_world_nomareas_oldtopogr.scenario | 172 +- .../route_choice_real_world_original.scenario | 172 +- ...ce_real_world_pcm_tpgrphy_adapted.scenario | 94 +- ...eal_world_pcm_tpgrphy_adapted_cgm.scenario | 94 +- .../roVer/scenarios/scenario001.scenario | 16 +- .../roVer/scenarios/scenario002.scenario | 29 +- .../scenarios/separation_slow_fast.scenario | 16 +- .../spawn_agents_time_series.scenario | 16 +- .../roVer/scenarios/three_corridors.scenario | 55 +- .../scenarios/three_corridors_cgm.scenario | 55 +- .../scenarios/three_corridors_pcm.scenario | 55 +- .../scenarios/Liddle_osm_v4.scenario | 17 +- .../scenarios/counterflow.scenario | 30 +- .../scenarios/supermarket_basic.scenario | 3208 ++++++++++------- .../scenarios/groupBaseScenario.scenario | 21 +- ...group_OSM_CGM_density_flow_2group.scenario | 21 +- ...SM_CGM_density_flow_2group_sparse.scenario | 21 +- ...group_OSM_CGM_density_flow_3group.scenario | 21 +- ...SM_CGM_density_flow_3group_sparse.scenario | 21 +- ...group_OSM_CGM_density_flow_4group.scenario | 21 +- ...SM_CGM_density_flow_4group_sparse.scenario | 21 +- ...group_OSM_CGM_density_flow_5group.scenario | 21 +- ...SM_CGM_density_flow_5group_sparse.scenario | 21 +- .../scenarios/groupBaseScenario.scenario | 21 +- ...inStepSize_0_11_ignore_free_space.scenario | 17 +- .../osm_calibration_minStepSize_0_17.scenario | 17 +- .../osm_calibration_minStepSize_0_25.scenario | 17 +- .../osm_calibration_minStepSize_0_35.scenario | 17 +- ...sm_calibration_minStepSize_0_4625.scenario | 17 +- ...alibration_minStepSize_0_4625_p18.scenario | 17 +- ...calibration_minStepSize_0_4625_p4.scenario | 17 +- .../osm_calibration_sivers_2016b.scenario | 17 +- .../scenarios/C-050-180-180.scenario | 17 +- .../scenarios/C-050-180-180_GNM.scenario | 17 +- .../scenarios/C-050-180-180_Q.scenario | 17 +- .../scenarios/C-060-180-180.scenario | 17 +- .../scenarios/C-060-180-180_Q.scenario | 17 +- .../scenarios/C-070-180-180.scenario | 17 +- .../scenarios/C-070-180-180_Q.scenario | 17 +- .../scenarios/C-100-180-180.scenario | 17 +- .../scenarios/C-100-180-180_Q.scenario | 17 +- .../scenarios/C-145-180-180.scenario | 17 +- .../scenarios/C-145-180-180_Q.scenario | 17 +- .../scenarios/C-180-180-070.scenario | 17 +- .../scenarios/C-180-180-070_Q.scenario | 17 +- .../scenarios/C-180-180-070_UNIT.scenario | 17 +- .../scenarios/C-180-180-070_default.scenario | 17 +- .../scenarios/C-180-180-070_ramp.scenario | 17 +- .../scenarios/C-180-180-095.scenario | 17 +- .../scenarios/C-180-180-095_Q.scenario | 17 +- .../scenarios/C-180-180-120.scenario | 17 +- .../scenarios/C-180-180-120_Q.scenario | 17 +- .../scenarios/C-180-180-180.scenario | 17 +- .../scenarios/C-180-180-180_Q.scenario | 17 +- .../scenarios/T-240-050-240.scenario | 17 +- .../scenarios/T-240-050-240_BHM.scenario | 17 +- .../scenarios/T-240-050-240_OSM.scenario | 17 +- .../scenarios/T-240-060-240.scenario | 17 +- .../scenarios/T-240-060-240_BHM.scenario | 17 +- .../scenarios/T-240-060-240_OSM.scenario | 17 +- .../scenarios/T-240-080-240.scenario | 17 +- .../scenarios/T-240-080-240_BHM.scenario | 17 +- .../scenarios/T-240-080-240_OSM.scenario | 17 +- .../scenarios/T-240-100-240.scenario | 17 +- .../scenarios/T-240-100-240_BHM.scenario | 17 +- .../scenarios/T-240-100-240_OSM.scenario | 17 +- .../scenarios/T-240-120-240.scenario | 17 +- .../scenarios/T-240-120-240_BHM.scenario | 17 +- .../scenarios/T-240-120-240_OSM.scenario | 17 +- .../scenarios/T-240-150-240.scenario | 17 +- .../scenarios/T-240-150-240_BHM.scenario | 17 +- .../scenarios/T-240-150-240_OSM.scenario | 17 +- .../scenarios/T-240-240-240.scenario | 17 +- .../scenarios/T-240-240-240_BHM.scenario | 17 +- .../scenarios/T-240-240-240_OSM.scenario | 17 +- .../BHM-FloorFieldTest-Labyrinth.scenario | 17 +- .../BHM-FloorFieldTest-TwoObstacles.scenario | 17 +- ...orField-CounterflowCognitionModel.scenario | 33 +- ...ridor-BHM-Defaults-WithFloorField.scenario | 30 +- .../scenarios/Corridor-BHM-Defaults.scenario | 30 +- ...orField-CounterflowCognitionModel.scenario | 30 +- ...2006c-BHM-Defaults-WithFloorField.scenario | 30 +- .../TestCA/scenarios/basic_2_density.scenario | 17 +- .../TestCA/scenarios/bottleneck.scenario | 17 +- ...chicken_floorfield_displaced_fail.scenario | 17 +- .../scenarios/chicken_floorfield_ok.scenario | 17 +- ...orner_waiting_time_processor_test.scenario | 17 +- .../scenarios/multiple_sources.scenario | 30 +- .../TestCA/scenarios/narrow_passage.scenario | 17 +- .../TestCA/scenarios/regular_wall.scenario | 17 +- .../scenarios/rimea_01_pathway.scenario | 17 +- .../rimea_04_flow_osm1_050_h.scenario | 17 +- .../rimea_04_flow_osm1_075_h.scenario | 17 +- .../rimea_04_flow_osm1_100_h.scenario | 17 +- .../rimea_04_flow_osm1_125_h.scenario | 17 +- .../rimea_04_flow_osm1_470_h.scenario | 17 +- .../TestCA/scenarios/rimea_05_react.scenario | 17 +- .../TestCA/scenarios/rimea_06_corner.scenario | 17 +- .../TestCA/scenarios/rimea_07_speeds.scenario | 17 +- .../rimea_08_parameter_variation.scenario | 30 +- ...imea_08_parameter_variation_part1.scenario | 30 +- .../rimea_09_public_room_2_exits.scenario | 17 +- .../rimea_09_public_room_4_exits.scenario | 17 +- .../scenarios/rimea_10_pathfinding.scenario | 30 +- .../rimea_11_exit_selection.scenario | 17 +- .../scenarios/rimea_12_evacuation.scenario | 17 +- .../scenarios/rimea_14_select_route.scenario | 17 +- .../TestCA/scenarios/see_small_wall.scenario | 17 +- .../TestCA/scenarios/thick_wall.scenario | 17 +- .../TestCA/scenarios/thin_wall.scenario | 17 +- .../thin_wall_and_closer_source.scenario | 17 +- .../scenarios/basic_1_chicken_gnm1.scenario | 17 +- .../basic_1_chicken_gnm1_displaced.scenario | 17 +- .../scenarios/basic_1_chicken_gnm2.scenario | 17 +- .../scenarios/basic_2_density_gnm1.scenario | 17 +- .../scenarios/basic_3_1_wall_gnm1.scenario | 17 +- .../scenarios/basic_3_2_wall_gnm1.scenario | 17 +- .../scenarios/basic_3_3_wall_gnm1.scenario | 17 +- .../scenarios/basic_4_1_wall_gnm1.scenario | 17 +- .../scenarios/basic_4_2_wall_gnm1.scenario | 17 +- .../scenarios/rimea_01_pathway_gnm1.scenario | 17 +- .../rimea_04_flow_gnm1_025_h.scenario | 17 +- .../rimea_04_flow_gnm1_050_h.scenario | 17 +- .../rimea_04_flow_gnm1_075_h.scenario | 17 +- .../rimea_04_flow_gnm1_100_h.scenario | 17 +- .../rimea_04_flow_gnm1_125_h.scenario | 17 +- .../scenarios/rimea_05_react_gnm1.scenario | 17 +- .../scenarios/rimea_06_corner_gnm1.scenario | 17 +- .../scenarios/rimea_07_speeds_gnm1.scenario | 17 +- .../rimea_09_publicRoom_gnm1_2.scenario | 17 +- .../rimea_09_publicRoom_gnm1_4.scenario | 17 +- .../rimea_10_pathfinding_gnm1.scenario | 30 +- .../rimea_11_exitSelection_gnm1.scenario | 17 +- .../rimea_12_evacuation_gnm1.scenario | 17 +- .../scenarios/rimea_13_stairs_gnm1.scenario | 17 +- .../rimea_14_selectRoute_gnm1.scenario | 17 +- .../basic_2_density_discrete_ca.scenario | 17 +- .../scenarios/basic_2_density_pso.scenario | 17 +- .../chicken_floorfield_displaced_ok.scenario | 17 +- .../scenarios/chicken_floorfield_ok.scenario | 17 +- ...orner_waiting_time_processor_test.scenario | 17 +- .../narrow_passage_discrete_CA_fail.scenario | 17 +- .../narrow_passage_nelder_mead_ok.scenario | 17 +- .../scenarios/narrow_passage_pso_ok.scenario | 17 +- ...g_dynamic_floorfield_visual_check.scenario | 19 +- .../regular_wall_discrete_ok.scenario | 17 +- .../regular_wall_nelder_mead_ok.scenario | 17 +- .../scenarios/regular_wall_pso_ok.scenario | 17 +- ...a_01_pathway_discrete_brute_force.scenario | 17 +- .../rimea_01_pathway_discrete_ca.scenario | 17 +- .../rimea_04_flow_osm1_025_d.scenario | 17 +- .../rimea_04_flow_osm1_025_up.scenario | 17 +- .../rimea_04_flow_osm1_050_d.scenario | 17 +- .../rimea_04_flow_osm1_050_h.scenario | 17 +- .../rimea_04_flow_osm1_050_up.scenario | 17 +- .../rimea_04_flow_osm1_075_d.scenario | 17 +- .../rimea_04_flow_osm1_075_h.scenario | 17 +- .../rimea_04_flow_osm1_075_up.scenario | 17 +- .../rimea_04_flow_osm1_100_d.scenario | 17 +- .../rimea_04_flow_osm1_100_h.scenario | 17 +- .../rimea_04_flow_osm1_100_up.scenario | 17 +- .../rimea_04_flow_osm1_125_d.scenario | 17 +- .../rimea_04_flow_osm1_125_h.scenario | 17 +- .../rimea_04_flow_osm1_125_up.scenario | 17 +- .../rimea_04_flow_osm1_470_h.scenario | 17 +- .../rimea_04_flow_osm1_550_up.scenario | 17 +- .../TestOSM/scenarios/rimea_05_react.scenario | 17 +- .../scenarios/rimea_06_corner.scenario | 17 +- .../rimea_07_speeds_discrete_ca.scenario | 17 +- .../rimea_07_speeds_nelder_mead.scenario | 17 +- .../scenarios/rimea_07_speeds_pso.scenario | 17 +- .../rimea_08_parameter_variation.scenario | 30 +- ...9_public_room_2_exits_nelder_mead.scenario | 17 +- .../rimea_09_public_room_2_exits_pso.scenario | 17 +- ...9_public_room_4_exits_nelder_mead.scenario | 17 +- .../rimea_09_public_room_4_exits_pso.scenario | 17 +- .../scenarios/rimea_10_pathfinding.scenario | 30 +- ...mea_11_exit_selection_nelder_mead.scenario | 17 +- .../rimea_11_exit_selection_pso.scenario | 17 +- .../rimea_12_evacuation_nelder_mead.scenario | 17 +- .../rimea_12_evacuation_pso.scenario | 17 +- .../rimea_13_stairs_long_nelder_mead.scenario | 17 +- .../rimea_13_stairs_long_pso.scenario | 17 +- .../rimea_13_stairs_nelder_mead.scenario | 17 +- .../scenarios/rimea_13_stairs_pso.scenario | 17 +- ...rimea_14_select_route_nelder_mead.scenario | 17 +- .../rimea_14_select_route_pso.scenario | 17 +- .../see_small_wall_nelder_mead_ok.scenario | 17 +- .../see_small_wall_pso_fail.scenario | 17 +- .../scenarios/thick_wall_discrete_ok.scenario | 17 +- .../thick_wall_nelder_mead_ok.scenario | 17 +- .../scenarios/thick_wall_pso_ok.scenario | 17 +- ...closer_source_discrete_could_fail.scenario | 17 +- ..._and_closer_source_nelder_mead_ok.scenario | 17 +- ..._and_closer_source_pso_could_fail.scenario | 17 +- .../scenarios/thin_wall_discrete_ok.scenario | 17 +- .../thin_wall_nelder_mead_ok.scenario | 17 +- .../scenarios/thin_wall_pso_ok.scenario | 17 +- .../VadereSimulation-GroupBehavior.scenario | 20 +- .../group_OSM_1Source1Place.scenario | 20 +- .../group_OSM_1Source2Places.scenario | 20 +- .../group_OSM_2Sources1Place.scenario | 20 +- ..._2Sources1Place_2Group_and_3Group.scenario | 20 +- ...OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario | 59 +- ..._4Source4Place_v2_EVD_2G_3G_4G_5G.scenario | 59 +- ..._4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario | 59 +- .../group_OSM_CGM_classroom_1group.scenario | 20 +- .../group_OSM_CGM_classroom_2group.scenario | 20 +- .../group_OSM_CGM_classroom_3group.scenario | 20 +- .../group_OSM_CGM_classroom_4group.scenario | 20 +- .../group_OSM_CGM_labratory_15group.scenario | 20 +- .../group_OSM_CGM_labratory_1group.scenario | 20 +- .../group_OSM_CGM_labratory_25group.scenario | 20 +- .../group_OSM_CGM_labratory_2group.scenario | 20 +- .../group_OSM_CGM_labratory_4group.scenario | 20 +- .../group_OSM_change_target_stimulus.scenario | 46 +- .../group_OSM_long_corr_2Group.scenario | 20 +- .../group_OSM_long_corr_3Group.scenario | 20 +- .../group_OSM_long_corr_4Group.scenario | 20 +- .../group_OSM_target_changer.scenario | 33 +- .../basic_5_1_roadReachTarget_ovm1.scenario | 17 +- .../basic_5_2_roadReachTarget_ovm1.scenario | 32 +- .../scenarios/testtrafficlight.scenario | 32 +- ...ment-OSMEventDriven-PsychDisabled.scenario | 17 +- ...iment-OSMEventDriven-PsychEnabled.scenario | 17 +- ...sychEnabled-PersonalSpacedAdapted.scenario | 17 +- ...riment-OSMSequential-PsychEnabled.scenario | 17 +- ...ifiedExperiment-SFM-PsychDisabled.scenario | 32 +- ...iment-OSMEventDriven-PsychEnabled.scenario | 17 +- ...rFlow-OSMSequential-PsychDisabled.scenario | 30 +- ...erFlow-OSMSequential-PsychEnabled.scenario | 30 +- ...-PsychEnabled-SearchRadiusAdapted.scenario | 30 +- ...alFlow-OSMSequential-PsychEnabled.scenario | 17 +- ...cken-OSMEventDriven-PsychDisabled.scenario | 30 +- ...icken-OSMEventDriven-PsychEnabled.scenario | 30 +- ...tion-OSMEventDriven-PsychDisabled.scenario | 17 +- ...ction-OSMEventDriven-PsychEnabled.scenario | 17 +- ...15-ThreatShort-SelfCatThreatModel.scenario | 56 +- .../16-ThreatLong-SelfCatThreatModel.scenario | 56 +- ...tatingBehavior-SelfCatThreatModel.scenario | 56 +- ...hangeTargetScriptedCognitionModel.scenario | 56 +- ...-SocialDistancing-OSMEventSDriven.scenario | 17 +- ...ndation-SocialDistancing_clogging.scenario | 17 +- .../21-Ped-SocialDistancing_1.5m.scenario | 17 +- .../scenarios/21-Ped-normal_behavior.scenario | 17 +- .../scenarios/01-Wait-OSMSequential.scenario | 30 +- .../scenarios/02-Wait-OSMEventDriven.scenario | 30 +- .../03-WaitRecurring-OSMSequential.scenario | 30 +- .../04-WaitInArea-OSMSequential.scenario | 30 +- .../scenarios/05-WaitInArea-BHM.scenario | 30 +- .../06-Threat-OSMSequential-OneAgent.scenario | 30 +- ...reat-OSMSequential-MultipleAgents.scenario | 30 +- ...SMSequential-OneAgent-OneObstacle.scenario | 30 +- ...otChangeTargetIfProbabilityIsZero.scenario | 43 +- ...r-ChangesTargetIfProbabilityIsOne.scenario | 43 +- ...ChangesTargetIfProbabilityIsAHalf.scenario | 43 +- ...getChanger-SupportsListsOfTargets.scenario | 56 +- ...etChanger-CanCreateAListOfTargets.scenario | 56 +- ...getChanger-ChangesToDynamicTarget.scenario | 43 +- .../TestRSM/scenarios/Reynolds_test.scenario | 17 +- .../Reynolds_test_displaced.scenario | 17 +- .../scenarios/basic_1_chicken_sfm1.scenario | 17 +- .../basic_1_chicken_sfm1_displaced.scenario | 17 +- .../scenarios/basic_1_chicken_sfm2.scenario | 17 +- .../scenarios/basic_2_density_sfm1.scenario | 17 +- .../scenarios/basic_3_1_wall_sfm1.scenario | 17 +- .../scenarios/basic_3_2_wall_sfm1.scenario | 17 +- .../scenarios/basic_3_3_wall_sfm1.scenario | 17 +- .../scenarios/basic_4_1_wall_sfm1.scenario | 17 +- .../scenarios/basic_4_1_wall_sfm2.scenario | 17 +- .../scenarios/basic_4_2_wall_sfm1.scenario | 17 +- .../scenarios/basic_4_2_wall_sfm2.scenario | 17 +- .../scenarios/rimea_01_pathway_sfm1.scenario | 17 +- .../scenarios/rimea_01_pathway_sfm2.scenario | 17 +- .../rimea_04_flow_sfm1_025_h.scenario | 17 +- .../rimea_04_flow_sfm1_050_h.scenario | 17 +- .../rimea_04_flow_sfm1_075_h.scenario | 17 +- .../rimea_04_flow_sfm1_100_h.scenario | 17 +- .../rimea_04_flow_sfm1_125_h.scenario | 17 +- .../scenarios/rimea_05_react_sfm1.scenario | 17 +- .../scenarios/rimea_06_corner_sfm1.scenario | 17 +- .../scenarios/rimea_07_speeds_sfm1.scenario | 17 +- .../rimea_10_pathfinding_sfm1.scenario | 30 +- .../scenarios/stairs_diagonal_1_+1.scenario | 17 +- .../scenarios/stairs_diagonal_1_-1.scenario | 17 +- .../scenarios/stairs_diagonal_2_+1.scenario | 17 +- .../scenarios/stairs_diagonal_2_-1.scenario | 17 +- .../scenarios/stairs_diagonal_3_+1.scenario | 17 +- .../scenarios/stairs_diagonal_3_-1.scenario | 17 +- .../scenarios/stairs_diagonal_4_+1.scenario | 17 +- .../scenarios/stairs_diagonal_4_-1.scenario | 17 +- .../stairs_diagonal_both_1_2_+1.scenario | 30 +- .../stairs_diagonal_both_1_2_-1.scenario | 30 +- .../stairs_diagonal_both_3_4_+1.scenario | 30 +- .../stairs_diagonal_both_3_4_-1.scenario | 30 +- .../stairs_upward_direction_down_+1.scenario | 17 +- .../stairs_upward_direction_down_-1.scenario | 17 +- ...airs_upward_direction_to_right_+1.scenario | 17 +- ...airs_upward_direction_to_right_-1.scenario | 17 +- ...stairs_upward_direction_toleft_+1.scenario | 17 +- ...stairs_upward_direction_toleft_-1.scenario | 17 +- .../stairs_upward_direction_up_+1.scenario | 17 +- .../stairs_upward_direction_up_-1.scenario | 17 +- .../scenarios/counterflow.scenario | 30 +- .../scenarios/labyrinth.scenario | 17 +- ...mea_11_exit_selection_nelder_mead.scenario | 17 +- .../TestNelderMead/scenarios/s2ucre.scenario | 17 +- .../bottleneck_measurement_areas.scenario | 185 +- .../free_flow_measurement_areas.scenario | 185 +- ...navigation_random_pos_with_offset.scenario | 30 +- ...igation_random_pos_without_offset.scenario | 30 +- ...inates_kai_navigation_with_offset.scenario | 30 +- ...tes_kai_navigation_without_offset.scenario | 30 +- ...s_kai_unit_random_pos_with_offset.scenario | 30 +- ...ai_unit_random_pos_without_offset.scenario | 30 +- ..._coordinates_kai_unit_with_offset.scenario | 30 +- ...ordinates_kai_unit_without_offset.scenario | 30 +- ...navigation_random_pos_with_offset.scenario | 30 +- ...igation_random_pos_without_offset.scenario | 30 +- ...inates_kai_navigation_with_offset.scenario | 30 +- ...tes_kai_navigation_without_offset.scenario | 30 +- ...s_kai_unit_random_pos_with_offset.scenario | 30 +- ...ai_unit_random_pos_without_offset.scenario | 30 +- ..._coordinates_kai_unit_with_offset.scenario | 30 +- ...ordinates_kai_unit_without_offset.scenario | 30 +- .../scenarios/BHM_Liddle_fixed_seed.scenario | 29 +- .../scenarios/CA_basic_2_density.scenario | 16 +- .../scenarios/GNM_basic_1_chicken.scenario | 16 +- .../bridge_timeCost_NAVIGATION.scenario | 29 +- .../bridge_timeCost_OBSTACLES.scenario | 29 +- .../bridge_timeCost_QUEUEING.scenario | 29 +- .../scenarios/bridge_timeCost_UNIT.scenario | 29 +- .../scenarios/complex_NAVIGATION_001.scenario | 55 +- .../complex_NAVIGATION_groups_001.scenario | 68 +- .../scenarios/complex_UNIT_001.scenario | 55 +- .../complex_UNIT_groups_001.scenario | 68 +- Tools/SUQController/tutorial/example.scenario | 17 +- .../scenarios/bridge_coordinates_kai.scenario | 30 +- ...bridge_coordinates_kai_navigation.scenario | 30 +- ...dinates_kai_navigation_random_pos.scenario | 30 +- .../bridge_coordinates_kai_origin_0.scenario | 30 +- ...ordinates_kai_origin_0_navigation.scenario | 30 +- ...ai_origin_0_navigation_random_pos.scenario | 30 +- ...ordinates_kai_origin_0_random_pos.scenario | 30 +- ...bridge_coordinates_kai_random_pos.scenario | 30 +- .../testData/s2ucre/scenarios/empty.scenario | 17 +- .../scenarios/bridge_coordinates_kai.scenario | 30 +- ...bridge_coordinates_kai_navigation.scenario | 30 +- ...dinates_kai_navigation_random_pos.scenario | 30 +- .../bridge_coordinates_kai_origin_0.scenario | 30 +- ...ordinates_kai_origin_0_navigation.scenario | 30 +- ...ai_origin_0_navigation_random_pos.scenario | 30 +- ...ordinates_kai_origin_0_random_pos.scenario | 30 +- ...bridge_coordinates_kai_random_pos.scenario | 30 +- .../s2ucreInvalid/scenarios/empty.scenario | 17 +- .../testResources/test-scenario.scenario | 30 +- .../scenarios/mf_small_simple.scenario | 17 +- .../test005/scenarios/s004.scenario | 17 +- .../testProject001/scenarios/mf_001.scenario | 4 +- .../scenarios/mf_small.scenario | 30 +- .../scenarios/mf_small_simple.scenario | 17 +- .../scenarios/roVerTest001.scenario | 21 +- .../scenarios/scenario001.scenario | 17 +- .../scenarios/scenario002.scenario | 30 +- .../ScenarioCheckerTest.scenario | 147 +- .../Test1.scenario | 17 +- .../Test2.scenario | 4 +- .../scenarios/Test1.scenario | 17 +- .../scenarios/Test2.scenario | 4 +- .../VTestMultiRun/scenarios/Test1.scenario | 17 +- .../VTestMultiRun/scenarios/Test2.scenario | 4 +- .../data/basic_1_chicken_osm1.scenario | 17 +- .../testResources/data/cache/s001.scenario | 30 +- .../testResources/data/cache/s002.scenario | 30 +- .../testResources/data/cache/s003.scenario | 30 +- .../test_postvis.scenario | 17 +- .../output/testOutput2/test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../scenarios/test_postvis.scenario | 17 +- .../scenarios/warteschlange_ein_ziel.scenario | 19 +- .../output/testOutput2/test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../test_postvis.scenario | 17 +- .../scenarios/test_postvis.scenario | 17 +- .../scenarios/warteschlange_ein_ziel.scenario | 19 +- .../data/test-train-topography.json | 820 ++--- .../simulator/entrypoints/test.scenario | 17 +- 486 files changed, 10758 insertions(+), 8829 deletions(-) diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario index 51423b257..af67c8c0d 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario @@ -1,8 +1,8 @@ { "name" : "bottleneckA", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -222,7 +222,6 @@ "stairs" : [ ], "targets" : [ { "id" : 4, - "absorbing" : true, "shape" : { "x" : 18.6, "y" : 10.0, @@ -230,13 +229,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB.scenario index ae62b0da9..c98083144 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB.scenario @@ -1,8 +1,8 @@ { "name" : "bottleneckB", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -325,7 +325,6 @@ "stairs" : [ ], "targets" : [ { "id" : 4, - "absorbing" : true, "shape" : { "x" : 18.6, "y" : 10.0, @@ -333,13 +332,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB_socialDistancing.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB_socialDistancing.scenario index 4cafd4927..a116e2044 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB_socialDistancing.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckB_socialDistancing.scenario @@ -1,8 +1,8 @@ { "name" : "bottleneckB_socialDistancing", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -325,7 +325,6 @@ "stairs" : [ ], "targets" : [ { "id" : 4, - "absorbing" : true, "shape" : { "x" : 18.6, "y" : 10.0, @@ -333,13 +332,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/closeContact.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/closeContact.scenario index 8f3b62cee..b80d6276f 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/closeContact.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/closeContact.scenario @@ -1,8 +1,8 @@ { "name" : "closeContact", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -205,7 +205,6 @@ "stairs" : [ ], "targets" : [ { "id" : 17, - "absorbing" : true, "shape" : { "x" : 2.1, "y" : 2.4, @@ -213,16 +212,19 @@ "height" : 0.41, "type" : "RECTANGLE" }, - "waitingTime" : 1200.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 1200.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 18, - "absorbing" : true, "shape" : { "x" : 2.55, "y" : 2.4, @@ -230,13 +232,17 @@ "height" : 0.41, "type" : "RECTANGLE" }, - "waitingTime" : 600.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 600.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/passageway.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/passageway.scenario index ebb759df4..0198da323 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/passageway.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/passageway.scenario @@ -1,8 +1,8 @@ { "name" : "passageway", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -186,7 +186,6 @@ "stairs" : [ ], "targets" : [ { "id" : 3, - "absorbing" : true, "shape" : { "x" : 98.5, "y" : 0.5, @@ -194,16 +193,17 @@ "height" : 9.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : true, "shape" : { "x" : 1.0, "y" : 0.5, @@ -211,13 +211,15 @@ "height" : 9.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/queue.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/queue.scenario index a8b4e33e6..c12c763fb 100644 --- a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/queue.scenario +++ b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/queue.scenario @@ -1,8 +1,8 @@ { "name" : "queue", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -289,7 +289,6 @@ "stairs" : [ ], "targets" : [ { "id" : 3, - "absorbing" : true, "shape" : { "x" : 4.15, "y" : 6.45, @@ -297,13 +296,17 @@ "height" : 0.5, "type" : "RECTANGLE" }, - "waitingTime" : 120.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 120.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_postvis_template.scenario b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_postvis_template.scenario index 071461ba5..34efecb7d 100644 --- a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_postvis_template.scenario +++ b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_postvis_template.scenario @@ -1,8 +1,8 @@ { "name" : "hamner-2020-life_postvis_template", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", diff --git a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_template.scenario b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_template.scenario index a6f2c16d6..4e6cc6d8a 100644 --- a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_template.scenario +++ b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/hamner-2020-life_template.scenario @@ -1,8 +1,8 @@ { "name" : "hamner-2020-life_template", "description" : "Superspreading event during a choir rehearsal following hamner-2020-life;\n\nL. Hamner, P. Dubbel, I. Capron, A. Ross, A. Jordan,\nJ. Lee, J. Lynn, A. Ball, S. Narwal, S. Russell, et al.\nHigh SARS-CoV-2 attack rate following exposure at a\nchoir practice — skagit county, washington, march 2020.\nMMWR. Morbidity and Mortality Weekly Report, 69\n(19):606–610, 2020. doi:10.15585/mmwr.mm6919e6.", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], diff --git a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/lu-2020-life.scenario b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/lu-2020-life.scenario index 58ad2fc8b..187b62d0b 100644 --- a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/lu-2020-life.scenario +++ b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/lu-2020-life.scenario @@ -1,8 +1,8 @@ { "name" : "lu-2020-life", "description" : "Superspreading event in a restaurant following lu-2021-life;\n\nJ. Lu, J. Gu, K. Li, C. Xu, W. Su, Z. Lai, D. Zhou,\nC. Yu, B. Xu, and Z. Yang. COVID-19 outbreak associated\nwith air conditioning in restaurant, guangzhou,\nchina, 2020. Emerging Infectious Diseases, 26(7):1628–\n1631, 2020. doi:10.3201/eid2607.200764.", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -337,7 +337,6 @@ "stairs" : [ ], "targets" : [ { "id" : 7, - "absorbing" : true, "shape" : { "x" : 1.65, "y" : 11.8, @@ -345,16 +344,19 @@ "height" : 0.1, "type" : "RECTANGLE" }, - "waitingTime" : 4380.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4380.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : true, "shape" : { "x" : 0.95, "y" : 11.8, @@ -362,16 +364,19 @@ "height" : 0.1, "type" : "RECTANGLE" }, - "waitingTime" : 4380.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4380.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : true, "shape" : { "x" : 1.65, "y" : 10.6, @@ -379,16 +384,19 @@ "height" : 0.1, "type" : "RECTANGLE" }, - "waitingTime" : 4380.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4380.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : true, "shape" : { "x" : 4.05, "y" : 11.3, @@ -396,16 +404,19 @@ "height" : 0.1, "type" : "RECTANGLE" }, - "waitingTime" : 4500.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4500.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "x" : 2.7, "y" : 11.5, @@ -413,16 +424,19 @@ "height" : 0.1, "type" : "RECTANGLE" }, - "waitingTime" : 4500.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4500.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 3, - "absorbing" : true, "shape" : { "x" : 2.5, "y" : 11.1, @@ -430,16 +444,19 @@ "height" : 0.1, "type" : "RECTANGLE" }, - "waitingTime" : 4500.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4500.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : true, "shape" : { "x" : 2.6, "y" : 10.6, @@ -447,16 +464,19 @@ "height" : 0.1, "type" : "RECTANGLE" }, - "waitingTime" : 4500.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4500.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 3.95, "y" : 10.55, @@ -464,16 +484,19 @@ "height" : 0.1, "type" : "RECTANGLE" }, - "waitingTime" : 4500.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4500.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : true, "shape" : { "x" : 5.55, "y" : 11.7, @@ -481,16 +504,19 @@ "height" : 0.1, "type" : "RECTANGLE" }, - "waitingTime" : 3180.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 3180.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : true, "shape" : { "x" : 5.8, "y" : 10.3, @@ -498,13 +524,17 @@ "height" : 0.1, "type" : "RECTANGLE" }, - "waitingTime" : 3180.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 3180.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/miller-2020-life_template.scenario b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/miller-2020-life_template.scenario index c5067499a..0b68a6e43 100644 --- a/Scenarios/Demos/AirTransmissionModel/validation/scenarios/miller-2020-life_template.scenario +++ b/Scenarios/Demos/AirTransmissionModel/validation/scenarios/miller-2020-life_template.scenario @@ -1,8 +1,8 @@ { "name" : "miller-2020-life_template", "description" : "Superspreading event during a choir rehearsal following miller-2020-life;\n\nS. L. Miller, W. W. Nazaroff, J. L. Jimenez, A. Boerstra, G. Buonanno, S. J. Dancer, J. Kurnitski, L. C. Marr, L. Morawska, and C. Noakes. Transmission of SARSCoV-2 by inhalation of respiratory aerosol in the skagit valley chorale superspreading event. Indoor Air, 31(2): 314–323, 2020. doi:10.1111/ina.12751.", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", diff --git a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/01-Kaiserslautern-Gross.scenario b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/01-Kaiserslautern-Gross.scenario index e491efe1f..f1ab6b23f 100644 --- a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/01-Kaiserslautern-Gross.scenario +++ b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/01-Kaiserslautern-Gross.scenario @@ -1,8 +1,8 @@ { "name" : "01-Kaiserslautern-Gross", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", diff --git a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario index ee9b8e376..c0d8150ae 100644 --- a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario +++ b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/02-Kaiserslautern-Mittel.scenario @@ -1,8 +1,8 @@ { "name" : "02-Kaiserslautern-Mittel", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", diff --git a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario index de6986bd7..889c1ac45 100644 --- a/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario +++ b/Scenarios/Demos/Demonstration/Kaiserslautern/scenarios/03-Kaiserslautern-Klein.scenario @@ -1,8 +1,8 @@ { "name" : "03-Kaiserslautern-Klein", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", diff --git a/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasse.scenario b/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasse.scenario index 42356a012..5ab9e4864 100644 --- a/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasse.scenario +++ b/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasse.scenario @@ -1,8 +1,8 @@ { "name" : "RichardWagnerStrasse", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -1063,7 +1063,6 @@ "stairs" : [ ], "targets" : [ { "id" : 3, - "absorbing" : false, "shape" : { "x" : 69.4, "y" : 189.0, @@ -1071,16 +1070,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1097,16 +1097,17 @@ "y" : 170.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1126,16 +1127,17 @@ "y" : 18.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1152,16 +1154,17 @@ "y" : 144.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1178,13 +1181,15 @@ "y" : 211.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasseScaled.scenario b/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasseScaled.scenario index b1a3d44dc..06f449dc8 100644 --- a/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasseScaled.scenario +++ b/Scenarios/Demos/Demonstration/KaiserslauternSensitivityAnalysis/scenarios/RichardWagnerStrasseScaled.scenario @@ -1,8 +1,8 @@ { "name" : "RichardWagnerStrasseScaled", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -1063,7 +1063,6 @@ "stairs" : [ ], "targets" : [ { "id" : 3, - "absorbing" : false, "shape" : { "x" : 21.6875, "y" : 59.0625, @@ -1071,16 +1070,17 @@ "height" : 0.3125, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1097,16 +1097,17 @@ "y" : 53.25 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1126,16 +1127,17 @@ "y" : 5.71875 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1152,16 +1154,17 @@ "y" : 45.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1178,13 +1181,15 @@ "y" : 65.9375 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario index 2c0e36186..0d8b2f7ea 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-GNM.scenario @@ -1,8 +1,8 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-GNM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -879,7 +879,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -896,13 +895,15 @@ "y" : 118.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario index bfaad8f59..abd52ffc4 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-Narrowed-OSM.scenario @@ -1,8 +1,8 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-Narrowed-OSM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -879,7 +879,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -896,13 +895,15 @@ "y" : 118.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario index dbc0e20ed..518615ef0 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM.scenario @@ -1,8 +1,8 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-GNM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -807,7 +807,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -824,13 +823,15 @@ "y" : 118.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario index 1e9fe055c..9fe1ae638 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM.scenario @@ -1,8 +1,8 @@ { "name" : "01-NarrowedStreet-Pollichstrasse-NotNarrowed-OSM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -819,7 +819,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -836,13 +835,15 @@ "y" : 118.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario index 318dc2456..c31c6720d 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents.scenario @@ -1,8 +1,8 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-1200agents", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", @@ -2513,7 +2513,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 71.4, "y" : 189.7, @@ -2521,16 +2520,17 @@ "height" : 9.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -2550,13 +2550,15 @@ "y" : 13.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario index 8be0e14f6..7fff73777 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents.scenario @@ -1,8 +1,8 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-400agents", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -2513,7 +2513,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 71.4, "y" : 189.7, @@ -2521,16 +2520,17 @@ "height" : 9.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -2550,13 +2550,15 @@ "y" : 13.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario index 4771ae7c4..23d6a1d2a 100644 --- a/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario +++ b/Scenarios/Demos/Demonstration/OPMOPS-Project/NarrowedStreetAndVaryingPedestrianNumber/scenarios/02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents.scenario @@ -1,8 +1,8 @@ { "name" : "02-VaryingPedestrianNumber-RichardWagnerStrasse-OSM-800agents", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -2513,7 +2513,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 71.4, "y" : 189.7, @@ -2521,16 +2520,17 @@ "height" : 9.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -2550,13 +2550,15 @@ "y" : 13.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario b/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario index ce45382c4..18327ce32 100644 --- a/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario +++ b/Scenarios/Demos/HM_stairs_ModSem_2013_14/scenarios/hm_stairs.scenario @@ -1,8 +1,8 @@ { "name" : "hm_stairs", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -224,7 +224,6 @@ } ], "targets" : [ { "id" : 20, - "absorbing" : false, "shape" : { "x" : 5.0, "y" : 13.0, @@ -232,16 +231,17 @@ "height" : 0.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "x" : 5.0, "y" : 4.5, @@ -249,16 +249,17 @@ "height" : 0.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : true, "shape" : { "x" : 2.6, "y" : 18.4, @@ -266,16 +267,17 @@ "height" : 0.7, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "x" : 5.5, "y" : 0.5, @@ -283,13 +285,15 @@ "height" : 0.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/IntersectingPedStream/scenarios/crossing.scenario b/Scenarios/Demos/IntersectingPedStream/scenarios/crossing.scenario index fc6f2f3ae..5a1743c06 100644 --- a/Scenarios/Demos/IntersectingPedStream/scenarios/crossing.scenario +++ b/Scenarios/Demos/IntersectingPedStream/scenarios/crossing.scenario @@ -1,8 +1,8 @@ { "name" : "crossing", "description" : "", - "release" : "2.2", - "commithash" : "38d049d243f1057256f9e0eb5799e8cc1412b37a", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -179,7 +179,6 @@ "stairs" : [ ], "targets" : [ { "id" : 11, - "absorbing" : true, "shape" : { "x" : 8.0, "y" : 1.0, @@ -187,16 +186,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : true, "shape" : { "x" : 18.0, "y" : 8.0, @@ -204,13 +204,15 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario index 49a77f4bd..f2df520e7 100644 --- a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario +++ b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_event.scenario @@ -1,8 +1,8 @@ { "name" : "chicken_floorfield_ok_GPU_event", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -122,7 +122,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 10.0, "y" : 112.9, @@ -130,13 +129,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario index 4f63f6735..65a547d09 100644 --- a/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario +++ b/Scenarios/Demos/OSM-GPU/scenarios/chicken_floorfield_ok_GPU_parallel.scenario @@ -1,8 +1,8 @@ { "name" : "chicken_floorfield_ok_GPU_parallel", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -122,7 +122,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 10.0, "y" : 112.9, @@ -130,13 +129,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario index a50a2cf2b..f0c4599df 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -127,7 +127,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -135,16 +134,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 3, - "absorbing" : false, "shape" : { "x" : 0.9, "y" : 7.517444981213098, @@ -152,16 +152,17 @@ "height" : 0.08255501878690197, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : false, "shape" : { "x" : 2.0443337359098233, "y" : 5.4, @@ -169,16 +170,17 @@ "height" : 0.16769808254309027, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : false, "shape" : { "x" : 0.9, "y" : 5.4, @@ -186,16 +188,17 @@ "height" : 0.17352239518100987, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "x" : 2.0967525496511006, "y" : 7.576154052603328, @@ -203,16 +206,17 @@ "height" : 0.12384594739667243, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "x" : 1.5, "y" : 6.2, @@ -220,16 +224,17 @@ "height" : 0.1423316633864138, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "x" : 1.5, "y" : 7.634863123993559, @@ -237,16 +242,17 @@ "height" : 0.1651368760064411, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : false, "shape" : { "x" : 2.0548174986580783, "y" : 7.072933440687064, @@ -254,16 +260,17 @@ "height" : 0.1197478678356294, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "x" : 1.6, "y" : 7.0, @@ -271,16 +278,17 @@ "height" : 0.09949230631597761, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 13, - "absorbing" : false, "shape" : { "x" : 1.0, "y" : 7.1, @@ -288,16 +296,17 @@ "height" : 0.12180287171229232, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 14, - "absorbing" : false, "shape" : { "x" : 1.0, "y" : 6.7, @@ -305,16 +314,17 @@ "height" : 0.18399273871294763, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 1.7, "y" : 5.863526570048309, @@ -322,16 +332,17 @@ "height" : 0.33647342995169094, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 1.5725644122383253, "y" : 5.6, @@ -339,16 +350,17 @@ "height" : 0.10748158585316414, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "x" : 1.030903336911791, "y" : 5.957927029283712, @@ -356,13 +368,15 @@ "height" : 0.14207297071628755, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario index 2f6286a9f..18c2116b3 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -127,7 +127,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -135,16 +134,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 3, - "absorbing" : false, "shape" : { "x" : 0.9, "y" : 7.517444981213098, @@ -152,16 +152,17 @@ "height" : 0.08255501878690197, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : false, "shape" : { "x" : 2.0443337359098233, "y" : 5.4, @@ -169,16 +170,17 @@ "height" : 0.16769808254309027, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : false, "shape" : { "x" : 0.9, "y" : 5.4, @@ -186,16 +188,17 @@ "height" : 0.17352239518100987, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "x" : 2.0967525496511006, "y" : 7.576154052603328, @@ -203,16 +206,17 @@ "height" : 0.12384594739667243, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "x" : 1.5, "y" : 6.2, @@ -220,16 +224,17 @@ "height" : 0.1423316633864138, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "x" : 1.5, "y" : 7.634863123993559, @@ -237,16 +242,17 @@ "height" : 0.1651368760064411, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : false, "shape" : { "x" : 2.0548174986580783, "y" : 7.072933440687064, @@ -254,16 +260,17 @@ "height" : 0.1197478678356294, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "x" : 1.6, "y" : 7.0, @@ -271,16 +278,17 @@ "height" : 0.09949230631597761, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 13, - "absorbing" : false, "shape" : { "x" : 1.0, "y" : 7.1, @@ -288,16 +296,17 @@ "height" : 0.12180287171229232, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 14, - "absorbing" : false, "shape" : { "x" : 1.0, "y" : 6.7, @@ -305,16 +314,17 @@ "height" : 0.18399273871294763, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 1.7, "y" : 5.863526570048309, @@ -322,16 +332,17 @@ "height" : 0.33647342995169094, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 1.5725644122383253, "y" : 5.6, @@ -339,16 +350,17 @@ "height" : 0.10748158585316414, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "x" : 1.030903336911791, "y" : 5.957927029283712, @@ -356,13 +368,15 @@ "height" : 0.14207297071628755, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario index 9797f471a..3f18acf63 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_fineTargetGrid.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_fineTargetGrid", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -127,7 +127,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -135,16 +134,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : false, "shape" : { "x" : 0.505615724027277, "y" : 7.4999442884521095, @@ -152,16 +152,17 @@ "height" : 0.5011460071739968, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 3, - "absorbing" : false, "shape" : { "x" : 1.305615724027277, "y" : 7.49994428845211, @@ -169,16 +170,17 @@ "height" : 0.5011460071739968, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "x" : 2.005615724027277, "y" : 6.499944288452109, @@ -186,16 +188,17 @@ "height" : 0.5011460071739968, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : false, "shape" : { "x" : 0.505615724027277, "y" : 6.49994428845211, @@ -203,16 +206,17 @@ "height" : 0.5011460071739968, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "x" : 2.005615724027277, "y" : 5.499944288452109, @@ -220,16 +224,17 @@ "height" : 0.5011460071739968, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 1.305615724027277, "y" : 5.499944288452109, @@ -237,16 +242,17 @@ "height" : 0.5011460071739968, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 0.505615724027277, "y" : 5.4999442884521095, @@ -254,16 +260,17 @@ "height" : 0.5011460071739968, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "x" : 2.005615724027277, "y" : 7.4999442884521095, @@ -271,16 +278,17 @@ "height" : 0.5011460071739968, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "x" : 1.305615724027277, "y" : 6.499944288452109, @@ -288,13 +296,15 @@ "height" : 0.5011460071739968, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario index ba60f99f7..176c23a35 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_largeTargets", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -127,7 +127,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -135,16 +134,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 7.40072202166065, @@ -152,16 +152,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 3, - "absorbing" : false, "shape" : { "x" : 1.9494584837545128, "y" : 7.412755716004813, @@ -169,16 +170,17 @@ "height" : 0.5872442839951866, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "x" : 1.9253910950661854, "y" : 6.0, @@ -186,16 +188,17 @@ "height" : 0.7027677496991576, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 6.0, @@ -203,16 +206,17 @@ "height" : 0.6787003610108302, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 5.0, @@ -220,16 +224,17 @@ "height" : 0.5234657039711186, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 1.9855595667870038, "y" : 5.0, @@ -237,13 +242,15 @@ "height" : 0.5475330926594459, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario index ba2ed46e2..b62cb3e8f 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_largeTargets_2_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_largeTargets_2_waiting", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -127,7 +127,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -135,16 +134,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 3, - "absorbing" : false, "shape" : { "x" : 1.9494584837545128, "y" : 7.412755716004813, @@ -152,16 +152,17 @@ "height" : 0.5872442839951866, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 1.9855595667870038, "y" : 5.0, @@ -169,16 +170,17 @@ "height" : 0.5475330926594459, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 6.0, @@ -186,16 +188,17 @@ "height" : 0.6787003610108302, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 7.40072202166065, @@ -203,16 +206,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 5.0, @@ -220,16 +224,17 @@ "height" : 0.5234657039711186, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "x" : 1.9253910950661854, "y" : 6.0, @@ -237,13 +242,15 @@ "height" : 0.7027677496991576, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario index 795479e3f..c3a400c50 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -127,7 +127,6 @@ "stairs" : [ ], "targets" : [ { "id" : 6, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -135,16 +134,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 15, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 7.40072202166065, @@ -152,16 +152,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 16, - "absorbing" : false, "shape" : { "x" : 1.9494584837545128, "y" : 7.412755716004813, @@ -169,16 +170,17 @@ "height" : 0.5872442839951866, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 17, - "absorbing" : false, "shape" : { "x" : 1.9253910950661854, "y" : 6.587882628286499, @@ -186,16 +188,17 @@ "height" : 0.6148851214126587, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 18, - "absorbing" : false, "shape" : { "x" : 0.4804353801488554, "y" : 5.837004108904336, @@ -203,16 +206,17 @@ "height" : 0.6416962521064944, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 14, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 5.0, @@ -220,16 +224,17 @@ "height" : 0.5234657039711186, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 1.9855595667870038, "y" : 5.0, @@ -237,16 +242,17 @@ "height" : 0.5475330926594459, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 7.40072202166065, @@ -254,16 +260,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "x" : 1.2010884503721384, "y" : 6.60072202166065, @@ -271,16 +278,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 5.00072202166065, @@ -288,16 +296,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 13, - "absorbing" : false, "shape" : { "x" : 1.9, "y" : 5.80072202166065, @@ -305,16 +314,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 5.837, @@ -322,16 +332,17 @@ "height" : 0.6630000000000003, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 6.60072202166065, @@ -339,13 +350,15 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario index 84abe1e9e..2245be7b9 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_1_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_1_waiting", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -127,7 +127,6 @@ "stairs" : [ ], "targets" : [ { "id" : 6, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -135,16 +134,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 15, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 7.40072202166065, @@ -152,16 +152,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 16, - "absorbing" : false, "shape" : { "x" : 1.9494584837545128, "y" : 7.412755716004813, @@ -169,16 +170,17 @@ "height" : 0.5872442839951866, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 17, - "absorbing" : false, "shape" : { "x" : 1.9253910950661854, "y" : 6.587882628286499, @@ -186,16 +188,17 @@ "height" : 0.6148851214126587, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 18, - "absorbing" : false, "shape" : { "x" : 0.4804353801488554, "y" : 5.837004108904336, @@ -203,16 +206,17 @@ "height" : 0.6416962521064944, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 14, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 5.0, @@ -220,16 +224,17 @@ "height" : 0.5234657039711186, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 1.9855595667870038, "y" : 5.0, @@ -237,16 +242,17 @@ "height" : 0.5475330926594459, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 7.40072202166065, @@ -254,16 +260,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "x" : 1.2010884503721384, "y" : 6.60072202166065, @@ -271,16 +278,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "x" : 1.3237063778580025, "y" : 5.00072202166065, @@ -288,16 +296,17 @@ "height" : 0.45054151624548666, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 13, - "absorbing" : false, "shape" : { "x" : 1.9, "y" : 5.80072202166065, @@ -305,16 +314,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 5.837, @@ -322,16 +332,17 @@ "height" : 0.6630000000000003, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 6.60072202166065, @@ -339,13 +350,15 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario index 1161c5439..4210c866b 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_3_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_3_waiting", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -127,7 +127,6 @@ "stairs" : [ ], "targets" : [ { "id" : 6, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -135,16 +134,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 15, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 7.40072202166065, @@ -152,16 +152,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 16, - "absorbing" : false, "shape" : { "x" : 1.9494584837545128, "y" : 7.412755716004813, @@ -169,16 +170,17 @@ "height" : 0.5872442839951866, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 17, - "absorbing" : false, "shape" : { "x" : 1.9253910950661854, "y" : 6.587882628286499, @@ -186,16 +188,17 @@ "height" : 0.6148851214126587, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 18, - "absorbing" : false, "shape" : { "x" : 0.4804353801488554, "y" : 5.837004108904336, @@ -203,16 +206,17 @@ "height" : 0.6416962521064944, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 14, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 5.0, @@ -220,16 +224,17 @@ "height" : 0.5234657039711186, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 1.9855595667870038, "y" : 5.0, @@ -237,16 +242,17 @@ "height" : 0.5475330926594459, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 7.40072202166065, @@ -254,16 +260,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "x" : 1.2010884503721384, "y" : 6.60072202166065, @@ -271,16 +278,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 5.00072202166065, @@ -288,16 +296,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 13, - "absorbing" : false, "shape" : { "x" : 1.9, "y" : 5.80072202166065, @@ -305,16 +314,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 5.837, @@ -322,16 +332,17 @@ "height" : 0.6630000000000003, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 6.608695652173913, @@ -339,13 +350,15 @@ "height" : 0.5913043478260871, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario index a0488cfba..c5357bf8c 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/DenseCrowd_withoutGroups_moreTargets_6_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "DenseCrowd_withoutGroups_moreTargets_6_waiting", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -136,7 +136,6 @@ "stairs" : [ ], "targets" : [ { "id" : 6, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -144,16 +143,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 15, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 7.40072202166065, @@ -161,16 +161,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 16, - "absorbing" : false, "shape" : { "x" : 1.9494584837545128, "y" : 7.412755716004813, @@ -178,16 +179,17 @@ "height" : 0.5872442839951866, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 17, - "absorbing" : false, "shape" : { "x" : 1.9253910950661854, "y" : 6.587882628286499, @@ -195,16 +197,17 @@ "height" : 0.6148851214126587, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 18, - "absorbing" : false, "shape" : { "x" : 0.4804353801488554, "y" : 5.837004108904336, @@ -212,16 +215,17 @@ "height" : 0.6416962521064944, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 14, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 5.0, @@ -229,16 +233,17 @@ "height" : 0.5234657039711186, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 1.9855595667870038, "y" : 5.0, @@ -246,16 +251,17 @@ "height" : 0.5475330926594459, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 7.40072202166065, @@ -263,16 +269,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "x" : 1.2010884503721384, "y" : 6.60072202166065, @@ -280,16 +287,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 5.00072202166065, @@ -297,16 +305,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 13, - "absorbing" : false, "shape" : { "x" : 1.9, "y" : 5.80072202166065, @@ -314,16 +323,17 @@ "height" : 0.5992779783393498, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "x" : 1.2, "y" : 5.837, @@ -331,16 +341,17 @@ "height" : 0.6630000000000003, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : false, "shape" : { "x" : 0.5, "y" : 6.608695652173913, @@ -348,13 +359,15 @@ "height" : 0.5913043478260871, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario index 6f12c0822..fc7defce3 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_1_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "NarrowCorridor_3_targets_1_waiting", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -154,7 +154,6 @@ "stairs" : [ ], "targets" : [ { "id" : 6, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -162,16 +161,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 2.350868267912845, "y" : 7.0, @@ -179,16 +179,17 @@ "height" : 0.5380264741275571, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "x" : 0.5108303249097474, "y" : 1.8, @@ -196,16 +197,17 @@ "height" : 0.5380264741275571, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 1.2896191641121892, "y" : 7.373744306417365, @@ -213,13 +215,15 @@ "height" : 0.16428216771019244, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario index 610967cb2..6d6dde3c1 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/NarrowCorridor_3_targets_2_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "NarrowCorridor_3_targets_2_waiting", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -172,7 +172,6 @@ "stairs" : [ ], "targets" : [ { "id" : 6, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -180,16 +179,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 0.516916483934597, "y" : 6.796585996345321, @@ -197,16 +197,17 @@ "height" : 0.44144047778223605, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 1.789346590205663, "y" : 6.802389282583826, @@ -214,13 +215,15 @@ "height" : 0.43563719154373093, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario index 0d0b09e05..b8718c618 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "SimpleCoordinationTask_3_targets_2_waiting", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -136,7 +136,6 @@ "stairs" : [ ], "targets" : [ { "id" : 6, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 2.332116788321168, @@ -144,16 +143,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 0.516916483934597, "y" : 7.596585996345321, @@ -161,16 +161,17 @@ "height" : 0.44144047778223605, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 1.9919149221685455, "y" : 5.002389282583826, @@ -178,13 +179,15 @@ "height" : 0.43563719154373093, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario index 55c0f86c0..30648d4d7 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/SimpleCoordinationTask_3_targets_2_waiting_with_runner.scenario @@ -1,8 +1,8 @@ { "name" : "SimpleCoordinationTask_3_targets_2_waiting_with_runner", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -136,7 +136,6 @@ "stairs" : [ ], "targets" : [ { "id" : 6, - "absorbing" : false, "shape" : { "x" : 0.6690997566909975, "y" : 8.832116788321168, @@ -144,16 +143,17 @@ "height" : 0.5178832116788321, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "x" : 0.516916483934597, "y" : 7.596585996345321, @@ -161,16 +161,17 @@ "height" : 0.44144047778223605, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "x" : 1.9919149221685455, "y" : 5.002389282583826, @@ -178,13 +179,15 @@ "height" : 0.43563719154373093, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario b/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario index c8c87cdf9..cf79bcf09 100644 --- a/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario +++ b/Scenarios/Demos/ReinforcementLearning/scenarios/test.scenario @@ -1,8 +1,8 @@ { "name" : "test", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -161,7 +161,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 8.0, "y" : 8.0, @@ -169,13 +168,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario b/Scenarios/Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario index 420790d44..8d5668b90 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/MWE_groups_target_changer.scenario @@ -1,8 +1,8 @@ { "name" : "MWE_groups_target_changer", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -94,7 +94,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -147,7 +149,6 @@ "stairs" : [ ], "targets" : [ { "id" : 3, - "absorbing" : true, "shape" : { "x" : 7.4, "y" : 6.8, @@ -155,16 +156,17 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "x" : 7.4, "y" : 0.9, @@ -172,13 +174,17 @@ "height" : 2.1, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 5, diff --git a/Scenarios/Demos/S2UCRE/scenarios/bridge_coordinates_kai.scenario b/Scenarios/Demos/S2UCRE/scenarios/bridge_coordinates_kai.scenario index 22df2289e..9d866ffef 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/bridge_coordinates_kai.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/bridge_coordinates_kai.scenario @@ -1,8 +1,8 @@ { "name" : "bridge_coordinates_kai", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -192,7 +192,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -209,16 +208,17 @@ "y" : 20.200000000186265 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -235,13 +235,15 @@ "y" : 4.900000000372529 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_groups.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_groups.scenario index a25ddcaa7..f135fff3e 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_groups.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_groups.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_dynamic_groups", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -76,7 +76,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -323,7 +325,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -340,16 +341,17 @@ "y" : 20.1 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -366,13 +368,15 @@ "y" : 5.900000000372529 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting.scenario index 44ce2862b..b5959b7f1 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_dynamic_waiting", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -76,7 +76,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -323,7 +325,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -340,16 +341,17 @@ "y" : 20.1 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -366,16 +368,17 @@ "y" : 5.900000000372529 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 100, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -392,16 +395,19 @@ "y" : 5.8 } ] }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -418,16 +424,19 @@ "y" : 38.28645960401878 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -444,16 +453,19 @@ "y" : 36.3 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -470,16 +482,19 @@ "y" : 34.85863946661181 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -496,16 +511,19 @@ "y" : 31.1 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -522,16 +540,19 @@ "y" : 26.25 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -548,16 +569,19 @@ "y" : 24.432947295064636 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -574,16 +598,19 @@ "y" : 36.100006879285445 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -600,16 +627,19 @@ "y" : 32.152625383454954 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -626,16 +656,19 @@ "y" : 24.305218599968924 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -652,16 +685,19 @@ "y" : 26.0 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -678,16 +714,19 @@ "y" : 19.0 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -704,16 +743,19 @@ "y" : 20.287771540463076 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -730,16 +772,19 @@ "y" : 14.6 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -756,13 +801,17 @@ "y" : 16.561222177899726 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 8, diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets.scenario index a6e86cd36..0d3844519 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_dynamic_waiting_less_targets", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -76,7 +76,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -323,7 +325,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -340,16 +341,17 @@ "y" : 20.1 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -366,16 +368,17 @@ "y" : 5.900000000372529 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 100, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -392,16 +395,19 @@ "y" : 5.8 } ] }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -418,16 +424,19 @@ "y" : 40.73207802292548 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -444,13 +453,17 @@ "y" : 42.1 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 8, diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets_groups.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets_groups.scenario index ba5ffe878..6a7867a03 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets_groups.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_dynamic_waiting_less_targets_groups.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_dynamic_waiting_less_targets_groups", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -76,7 +76,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -323,7 +325,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -340,16 +341,17 @@ "y" : 20.1 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -366,16 +368,17 @@ "y" : 5.900000000372529 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 100, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -392,16 +395,19 @@ "y" : 5.8 } ] }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -418,16 +424,19 @@ "y" : 40.73207802292548 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -444,13 +453,17 @@ "y" : 42.1 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 8, diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario index 25e2a310a..2c3624dcd 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_groups.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_static_groups", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -76,7 +76,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -323,7 +325,6 @@ } ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -340,16 +341,17 @@ "y" : 20.1 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -366,13 +368,15 @@ "y" : 5.900000000372529 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_simple.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_simple.scenario index 8c5119906..02e204080 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_simple.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_simple.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_static_simple", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -76,7 +76,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -207,7 +209,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -224,16 +225,17 @@ "y" : 20.1 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -250,13 +252,15 @@ "y" : 5.900000000372529 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting.scenario index afbf5e081..d2cd580c2 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_static_waiting", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -76,7 +76,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -323,7 +325,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -340,16 +341,17 @@ "y" : 20.1 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -366,16 +368,17 @@ "y" : 5.900000000372529 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 100, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -392,16 +395,19 @@ "y" : 5.8 } ] }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -418,16 +424,19 @@ "y" : 38.28645960401878 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -444,16 +453,19 @@ "y" : 36.3 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -470,16 +482,19 @@ "y" : 34.85863946661181 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -496,16 +511,19 @@ "y" : 31.1 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -522,16 +540,19 @@ "y" : 26.25 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -548,16 +569,19 @@ "y" : 24.432947295064636 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 5, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -574,16 +598,19 @@ "y" : 36.100006879285445 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -600,16 +627,19 @@ "y" : 32.152625383454954 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -626,16 +656,19 @@ "y" : 24.305218599968924 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -652,16 +685,19 @@ "y" : 26.0 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -678,16 +714,19 @@ "y" : 19.0 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -704,16 +743,19 @@ "y" : 20.287771540463076 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -730,16 +772,19 @@ "y" : 14.6 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -756,13 +801,17 @@ "y" : 16.561222177899726 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 8, diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets.scenario index 0a8d30c83..31620a325 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_static_waiting_less_targets", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -76,7 +76,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -317,7 +319,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -334,16 +335,17 @@ "y" : 20.1 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -360,16 +362,17 @@ "y" : 5.900000000372529 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 100, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -386,16 +389,19 @@ "y" : 5.8 } ] }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -412,16 +418,19 @@ "y" : 40.73207802292548 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -438,13 +447,17 @@ "y" : 42.1 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 8, diff --git a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets_groups.scenario b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets_groups.scenario index 2a098190f..6557c554a 100644 --- a/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets_groups.scenario +++ b/Scenarios/Demos/S2UCRE/scenarios/s2ucre_static_waiting_less_targets_groups.scenario @@ -1,8 +1,8 @@ { "name" : "s2ucre_static_waiting_less_targets_groups", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -76,7 +76,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -323,7 +325,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -340,16 +341,17 @@ "y" : 20.1 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -366,16 +368,17 @@ "y" : 5.900000000372529 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 100, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -392,16 +395,19 @@ "y" : 5.8 } ] }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -418,16 +424,19 @@ "y" : 40.73207802292548 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 4, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -444,13 +453,17 @@ "y" : 42.1 } ] }, - "waitingTime" : 30.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 30.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 8, diff --git a/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario b/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario index f86422df5..c7fb366bb 100644 --- a/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario +++ b/Scenarios/Demos/SocialDistancing/SocialDistancingBottleneck/scenarios/bottleneck_2m.scenario @@ -1,8 +1,8 @@ { "name" : "bottleneck_2m", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -242,7 +242,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 1.0, "y" : 9.5, @@ -250,13 +249,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario index a92e7f046..f9ce5e2c3 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario @@ -1,8 +1,8 @@ { "name" : "VadereSimulation-GroupBehavior_no_groups", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -171,7 +171,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 41.1, "y" : 3.2, @@ -179,13 +178,15 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario index 090076549..a8a7ad50b 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_1Source1Place_noGroup", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -125,7 +125,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 28.0, "y" : 3.0, @@ -133,13 +132,15 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario index 9eee2da12..2a719d306 100644 --- a/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario +++ b/Scenarios/Demos/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_1Source2Places_noGroups", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -179,7 +179,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 28.0, "y" : 3.0, @@ -187,13 +186,15 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/bus_station/scenarios/bus_station.scenario b/Scenarios/Demos/bus_station/scenarios/bus_station.scenario index 15bc83b5f..cefbbcebc 100644 --- a/Scenarios/Demos/bus_station/scenarios/bus_station.scenario +++ b/Scenarios/Demos/bus_station/scenarios/bus_station.scenario @@ -1,8 +1,8 @@ { "name" : "bus_station", "description" : "Scenario used for TGF19 contribution", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile", @@ -267,7 +267,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 14.4, "y" : 0.5, @@ -275,16 +274,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : false, "shape" : { "x" : 15.2, "y" : 6.0, @@ -292,13 +292,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.5, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/BHM_Liddle_fixed_seed.scenario b/Scenarios/Demos/roVer/scenarios/BHM_Liddle_fixed_seed.scenario index ac06a056e..2adef53b4 100644 --- a/Scenarios/Demos/roVer/scenarios/BHM_Liddle_fixed_seed.scenario +++ b/Scenarios/Demos/roVer/scenarios/BHM_Liddle_fixed_seed.scenario @@ -1,7 +1,8 @@ { "name" : "BHM_Liddle_fixed_seed", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -176,7 +177,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 6.9, "y" : 6.8, @@ -184,16 +184,17 @@ "height" : 1.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 1.0, "y" : 6.8, @@ -201,13 +202,15 @@ "height" : 1.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas.scenario b/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas.scenario index 534b1a820..c2c6fe312 100644 --- a/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas.scenario +++ b/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas.scenario @@ -1,7 +1,8 @@ { "name" : "free_flow_measurement_areas", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -1125,7 +1126,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1142,16 +1142,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1168,16 +1169,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1194,16 +1196,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1220,16 +1223,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1246,16 +1250,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1272,16 +1277,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1298,16 +1304,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1324,16 +1331,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1350,16 +1358,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1376,16 +1385,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1402,16 +1412,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1428,16 +1439,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 692, - "absorbing" : true, "shape" : { "x" : 178.4, "y" : 306.5, @@ -1445,13 +1457,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas_geraderWeglinks.scenario b/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas_geraderWeglinks.scenario index 4b0b8edd1..8581e4674 100644 --- a/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas_geraderWeglinks.scenario +++ b/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas_geraderWeglinks.scenario @@ -1,7 +1,8 @@ { "name" : "free_flow_measurement_areas_geraderWeglinks", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -1050,7 +1051,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1067,16 +1067,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1093,16 +1094,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1119,16 +1121,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1145,16 +1148,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1171,16 +1175,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1197,16 +1202,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1223,16 +1229,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1249,16 +1256,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1275,16 +1283,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1301,16 +1310,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1327,16 +1337,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1353,16 +1364,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 692, - "absorbing" : true, "shape" : { "x" : 178.4, "y" : 306.5, @@ -1370,13 +1382,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas_no_groups.scenario b/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas_no_groups.scenario index be4cdd5be..ce203350a 100644 --- a/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas_no_groups.scenario +++ b/Scenarios/Demos/roVer/scenarios/free_flow_measurement_areas_no_groups.scenario @@ -1,7 +1,8 @@ { "name" : "free_flow_measurement_areas_no_groups", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -1036,7 +1037,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1053,16 +1053,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1079,16 +1080,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1105,16 +1107,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1131,16 +1134,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1157,16 +1161,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1183,16 +1188,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1209,16 +1215,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1235,16 +1242,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1261,16 +1269,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1287,16 +1296,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1313,16 +1323,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1339,13 +1350,15 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions.scenario b/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions.scenario index d899ddbbd..b1338ab0f 100644 --- a/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions.scenario +++ b/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions.scenario @@ -1,7 +1,8 @@ { "name" : "free_flow_no_contractions", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -986,7 +987,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1003,16 +1003,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1029,16 +1030,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1055,16 +1057,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1081,16 +1084,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1107,16 +1111,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1133,16 +1138,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1159,16 +1165,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1185,16 +1192,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1211,16 +1219,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1237,16 +1246,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1263,16 +1273,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1289,16 +1300,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 692, - "absorbing" : true, "shape" : { "x" : 178.4, "y" : 306.5, @@ -1306,13 +1318,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_clone_1.scenario b/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_clone_1.scenario index f643aab92..7a0aa6655 100644 --- a/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_clone_1.scenario +++ b/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_clone_1.scenario @@ -1,7 +1,8 @@ { "name" : "free_flow_no_contractions_clone_1", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -967,7 +968,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -984,16 +984,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1010,16 +1011,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1036,16 +1038,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1062,16 +1065,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1088,16 +1092,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1114,16 +1119,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1140,16 +1146,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1166,16 +1173,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1192,16 +1200,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1218,16 +1227,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1244,16 +1254,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 692, - "absorbing" : true, "shape" : { "x" : 178.4, "y" : 306.5, @@ -1261,16 +1272,17 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1287,13 +1299,15 @@ "y" : 265.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_nomareas.scenario b/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_nomareas.scenario index 781750d82..3d21e3666 100644 --- a/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_nomareas.scenario +++ b/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_nomareas.scenario @@ -1,7 +1,8 @@ { "name" : "free_flow_no_contractions_nomareas", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -730,7 +731,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -747,16 +747,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -773,16 +774,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -799,16 +801,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -825,16 +828,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -851,16 +855,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -877,16 +882,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -903,16 +909,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -929,16 +936,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -955,16 +963,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -981,16 +990,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1007,16 +1017,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1033,16 +1044,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 692, - "absorbing" : true, "shape" : { "x" : 178.4, "y" : 306.5, @@ -1050,13 +1062,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_test_voronoi.scenario b/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_test_voronoi.scenario index 36b170adb..533311115 100644 --- a/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_test_voronoi.scenario +++ b/Scenarios/Demos/roVer/scenarios/free_flow_no_contractions_test_voronoi.scenario @@ -1,7 +1,8 @@ { "name" : "free_flow_no_contractions_test_voronoi", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -923,7 +924,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -940,16 +940,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -966,16 +967,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -992,16 +994,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1018,16 +1021,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1044,16 +1048,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1070,16 +1075,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1096,16 +1102,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1122,16 +1129,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1148,16 +1156,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1174,16 +1183,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1200,16 +1210,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1226,16 +1237,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 692, - "absorbing" : true, "shape" : { "x" : 178.4, "y" : 306.5, @@ -1243,13 +1255,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/mf_base.scenario b/Scenarios/Demos/roVer/scenarios/mf_base.scenario index 14b95217d..c2843adcb 100644 --- a/Scenarios/Demos/roVer/scenarios/mf_base.scenario +++ b/Scenarios/Demos/roVer/scenarios/mf_base.scenario @@ -1,7 +1,8 @@ { "name" : "mf_base", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -2849,7 +2850,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2001, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -2866,16 +2866,17 @@ "y" : 161.73686695843935 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2002, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -2892,16 +2893,17 @@ "y" : 226.86239922512323 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2003, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -2918,16 +2920,17 @@ "y" : 123.17741612158716 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2004, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -2944,16 +2947,17 @@ "y" : 101.57735977787524 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2005, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -2970,16 +2974,17 @@ "y" : 133.86367024295032 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2006, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -2996,16 +3001,17 @@ "y" : 149.45250253006816 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2007, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -3022,16 +3028,17 @@ "y" : 224.40854908991605 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -3048,16 +3055,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -3074,16 +3082,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2010, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -3100,16 +3109,17 @@ "y" : 85.51089675165713 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2011, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -3126,16 +3136,17 @@ "y" : 18.90350992977619 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2012, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -3152,16 +3163,17 @@ "y" : 19.918710492551327 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2013, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -3178,13 +3190,15 @@ "y" : 261.1035760100931 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/mf_detailed.scenario b/Scenarios/Demos/roVer/scenarios/mf_detailed.scenario index 9b4766e6f..75644a8ac 100644 --- a/Scenarios/Demos/roVer/scenarios/mf_detailed.scenario +++ b/Scenarios/Demos/roVer/scenarios/mf_detailed.scenario @@ -1,7 +1,8 @@ { "name" : "mf_detailed", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -6500,7 +6501,6 @@ "stairs" : [ ], "targets" : [ { "id" : 33, - "absorbing" : true, "shape" : { "x" : 134.7, "y" : 149.7, @@ -6508,13 +6508,15 @@ "height" : 3.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/mf_underground.scenario b/Scenarios/Demos/roVer/scenarios/mf_underground.scenario index c4612a7fa..dbb30fc92 100644 --- a/Scenarios/Demos/roVer/scenarios/mf_underground.scenario +++ b/Scenarios/Demos/roVer/scenarios/mf_underground.scenario @@ -1,7 +1,8 @@ { "name" : "mf_underground", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -701,7 +702,6 @@ "stairs" : [ ], "targets" : [ { "id" : 10, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -721,16 +721,17 @@ "y" : 57.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -747,16 +748,17 @@ "y" : 16.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -773,16 +775,17 @@ "y" : 12.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 13, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -802,16 +805,17 @@ "y" : 14.9 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 14, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -831,16 +835,17 @@ "y" : 39.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 15, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -857,16 +862,17 @@ "y" : 44.9 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 16, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -886,16 +892,17 @@ "y" : 36.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 17, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -915,16 +922,17 @@ "y" : 122.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 18, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -941,13 +949,15 @@ "y" : 117.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/roVerTest001.scenario b/Scenarios/Demos/roVer/scenarios/roVerTest001.scenario index 19e6403b9..883ac4f78 100644 --- a/Scenarios/Demos/roVer/scenarios/roVerTest001.scenario +++ b/Scenarios/Demos/roVer/scenarios/roVerTest001.scenario @@ -1,7 +1,8 @@ { "name" : "roVerTest001", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -220,7 +221,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "x" : 212.4, "y" : 227.1, @@ -228,13 +228,15 @@ "height" : 21.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/roVerTest002.scenario b/Scenarios/Demos/roVer/scenarios/roVerTest002.scenario index 3e07301c5..222f9c37a 100644 --- a/Scenarios/Demos/roVer/scenarios/roVerTest002.scenario +++ b/Scenarios/Demos/roVer/scenarios/roVerTest002.scenario @@ -1,7 +1,8 @@ { "name" : "roVerTest002", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -169,7 +170,6 @@ "stairs" : [ ], "targets" : [ { "id" : 6, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 202.2, @@ -177,16 +177,17 @@ "height" : 17.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : true, "shape" : { "x" : 223.2, "y" : 227.2, @@ -194,16 +195,17 @@ "height" : 12.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : true, "shape" : { "x" : 209.8, "y" : 16.7, @@ -211,16 +213,17 @@ "height" : 11.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9, - "absorbing" : false, "shape" : { "x" : 44.6, "y" : 44.2, @@ -228,16 +231,17 @@ "height" : 15.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 10, - "absorbing" : false, "shape" : { "x" : 133.3, "y" : 140.2, @@ -245,13 +249,15 @@ "height" : 18.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world.scenario index 582ff3b2d..f7bd36568 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -824,7 +825,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1000, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -841,16 +841,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -867,16 +868,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -893,16 +895,17 @@ "y" : 281.9 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -919,16 +922,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 500, - "absorbing" : true, "shape" : { "x" : 186.8, "y" : 182.5, @@ -936,16 +940,17 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -953,16 +958,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 999, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -970,13 +976,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 20, diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_crownet.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_crownet.scenario index 91bf01027..eb7afce15 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_crownet.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_crownet.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world_crownet", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -892,7 +893,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1000, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -909,16 +909,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -935,16 +936,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -961,16 +963,17 @@ "y" : 281.9 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -987,16 +990,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 500, - "absorbing" : true, "shape" : { "x" : 186.8, "y" : 182.5, @@ -1004,16 +1008,17 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -1021,16 +1026,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 999, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -1038,13 +1044,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 20, diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_crownet_pcm.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_crownet_pcm.scenario index b166b3ec3..e76ff11e8 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_crownet_pcm.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_crownet_pcm.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world_crownet_pcm", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -904,7 +905,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1000, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -921,16 +921,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -947,16 +948,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -973,16 +975,17 @@ "y" : 281.9 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -999,16 +1002,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 500, - "absorbing" : true, "shape" : { "x" : 186.8, "y" : 182.5, @@ -1016,16 +1020,17 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -1033,16 +1038,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 999, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -1050,13 +1056,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 20, diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_masplaced.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_masplaced.scenario index f18ed6617..14bcf4997 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_masplaced.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_masplaced.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world_masplaced", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -978,7 +979,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -995,16 +995,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1021,16 +1022,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1047,16 +1049,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1073,16 +1076,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1099,16 +1103,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1125,16 +1130,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1151,16 +1157,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1177,16 +1184,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1203,16 +1211,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1229,16 +1238,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1255,16 +1265,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 692, - "absorbing" : true, "shape" : { "x" : 178.4, "y" : 306.5, @@ -1272,16 +1283,17 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "x" : 177.4, "y" : 265.6, @@ -1289,13 +1301,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_mayr.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_mayr.scenario index 70646b05d..e8dc6d7ef 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_mayr.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_mayr.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world_mayr", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -717,7 +718,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1000, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -734,16 +734,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -760,16 +761,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -786,16 +788,17 @@ "y" : 281.9 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -812,16 +815,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 500, - "absorbing" : true, "shape" : { "x" : 186.8, "y" : 182.5, @@ -829,16 +833,17 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -846,13 +851,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 20, diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_mayr_original.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_mayr_original.scenario index 789c5734e..f2b7e30d7 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_mayr_original.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_mayr_original.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world_mayr_original", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -717,7 +718,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1000, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -734,16 +734,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -760,16 +761,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 12, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -786,16 +788,17 @@ "y" : 281.9 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -812,16 +815,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 500, - "absorbing" : true, "shape" : { "x" : 186.8, "y" : 182.5, @@ -829,16 +833,17 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -846,13 +851,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 20, diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_nomareas.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_nomareas.scenario index 6d535541c..2f833d91c 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_nomareas.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_nomareas.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world_nomareas", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -913,7 +914,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -930,16 +930,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -956,16 +957,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -982,16 +984,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1008,16 +1011,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1034,16 +1038,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1060,16 +1065,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1086,16 +1092,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1112,16 +1119,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1138,16 +1146,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1164,16 +1173,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1190,16 +1200,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 692, - "absorbing" : true, "shape" : { "x" : 178.4, "y" : 306.5, @@ -1207,16 +1218,17 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "x" : 177.4, "y" : 265.6, @@ -1224,13 +1236,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_nomareas_oldtopogr.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_nomareas_oldtopogr.scenario index a13e7dcb5..1a35477b5 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_nomareas_oldtopogr.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_nomareas_oldtopogr.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world_nomareas_oldtopogr", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -907,7 +908,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -924,16 +924,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -950,16 +951,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -976,16 +978,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1002,16 +1005,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1028,16 +1032,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1054,16 +1059,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1080,16 +1086,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1106,16 +1113,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1132,16 +1140,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1158,16 +1167,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1184,16 +1194,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1210,16 +1221,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 692, - "absorbing" : true, "shape" : { "x" : 178.4, "y" : 306.5, @@ -1227,13 +1239,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_original.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_original.scenario index 05a2bc0a3..d2a02e341 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_original.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_original.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world_original", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -1031,7 +1032,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2008, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1048,16 +1048,17 @@ "y" : 360.95191854797304 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2009, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1074,16 +1075,17 @@ "y" : 173.48516997043043 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1100,16 +1102,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1126,16 +1129,17 @@ "y" : 220.55 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1152,16 +1156,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 41, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1178,16 +1183,17 @@ "y" : 265.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1204,16 +1210,17 @@ "y" : 286.5 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 51, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1230,16 +1237,17 @@ "y" : 279.3 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1256,16 +1264,17 @@ "y" : 271.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1282,16 +1291,17 @@ "y" : 244.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1308,16 +1318,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1334,16 +1345,17 @@ "y" : 147.4 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8654, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1360,13 +1372,15 @@ "y" : 257.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 7, diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_pcm_tpgrphy_adapted.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_pcm_tpgrphy_adapted.scenario index 376e0ff5c..8e5cd4dd9 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_pcm_tpgrphy_adapted.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_pcm_tpgrphy_adapted.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world_pcm_tpgrphy_adapted", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -943,7 +944,6 @@ "stairs" : [ ], "targets" : [ { "id" : 12, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -960,16 +960,17 @@ "y" : 281.9 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -986,16 +987,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 500, - "absorbing" : true, "shape" : { "x" : 186.8, "y" : 182.5, @@ -1003,16 +1005,17 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -1020,16 +1023,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 999, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -1037,16 +1041,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1000, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1063,16 +1068,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "x" : 178.5, "y" : 265.6, @@ -1080,13 +1086,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 1, diff --git a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_pcm_tpgrphy_adapted_cgm.scenario b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_pcm_tpgrphy_adapted_cgm.scenario index 292a7ab4b..28dab8a5d 100644 --- a/Scenarios/Demos/roVer/scenarios/route_choice_real_world_pcm_tpgrphy_adapted_cgm.scenario +++ b/Scenarios/Demos/roVer/scenarios/route_choice_real_world_pcm_tpgrphy_adapted_cgm.scenario @@ -1,7 +1,8 @@ { "name" : "route_choice_real_world_pcm_tpgrphy_adapted_cgm", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -1145,7 +1146,6 @@ "stairs" : [ ], "targets" : [ { "id" : 12, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1162,16 +1162,17 @@ "y" : 281.9 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : false, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1188,16 +1189,17 @@ "y" : 220.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 500, - "absorbing" : true, "shape" : { "x" : 186.8, "y" : 182.5, @@ -1205,16 +1207,17 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 11, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -1222,16 +1225,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 999, - "absorbing" : true, "shape" : { "x" : 190.8, "y" : 162.0, @@ -1239,16 +1243,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1000, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -1265,16 +1270,17 @@ "y" : 219.6 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : false, "shape" : { "x" : 178.5, "y" : 265.6, @@ -1282,13 +1288,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 1, diff --git a/Scenarios/Demos/roVer/scenarios/scenario001.scenario b/Scenarios/Demos/roVer/scenarios/scenario001.scenario index b1e71f3ee..46504d63c 100644 --- a/Scenarios/Demos/roVer/scenarios/scenario001.scenario +++ b/Scenarios/Demos/roVer/scenarios/scenario001.scenario @@ -1,7 +1,8 @@ { "name" : "scenario001", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -167,7 +168,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "x" : 6.6, "y" : 0.8, @@ -175,13 +175,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/scenario002.scenario b/Scenarios/Demos/roVer/scenarios/scenario002.scenario index 75bc8ee1a..90b00bcaf 100644 --- a/Scenarios/Demos/roVer/scenarios/scenario002.scenario +++ b/Scenarios/Demos/roVer/scenarios/scenario002.scenario @@ -1,7 +1,8 @@ { "name" : "scenario002", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -220,7 +221,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "x" : 7.542857142857143, "y" : 0.7, @@ -228,16 +228,17 @@ "height" : 1.0142857142857136, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 3, - "absorbing" : true, "shape" : { "x" : 0.742857142857142, "y" : 0.7, @@ -245,13 +246,15 @@ "height" : 1.0142857142857136, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/separation_slow_fast.scenario b/Scenarios/Demos/roVer/scenarios/separation_slow_fast.scenario index 7029f2e2e..d6887d443 100644 --- a/Scenarios/Demos/roVer/scenarios/separation_slow_fast.scenario +++ b/Scenarios/Demos/roVer/scenarios/separation_slow_fast.scenario @@ -1,7 +1,8 @@ { "name" : "separation_slow_fast", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -151,7 +152,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 92.0, "y" : 55.0, @@ -159,13 +159,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/spawn_agents_time_series.scenario b/Scenarios/Demos/roVer/scenarios/spawn_agents_time_series.scenario index bcc3552f4..c4a1c5fcd 100644 --- a/Scenarios/Demos/roVer/scenarios/spawn_agents_time_series.scenario +++ b/Scenarios/Demos/roVer/scenarios/spawn_agents_time_series.scenario @@ -1,7 +1,8 @@ { "name" : "spawn_agents_time_series", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -151,7 +152,6 @@ "stairs" : [ ], "targets" : [ { "id" : 11, - "absorbing" : true, "shape" : { "x" : 8.0, "y" : 8.0, @@ -159,13 +159,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/three_corridors.scenario b/Scenarios/Demos/roVer/scenarios/three_corridors.scenario index 4a656249e..ef7b70b78 100644 --- a/Scenarios/Demos/roVer/scenarios/three_corridors.scenario +++ b/Scenarios/Demos/roVer/scenarios/three_corridors.scenario @@ -1,7 +1,8 @@ { "name" : "three_corridors", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -470,7 +471,6 @@ "stairs" : [ ], "targets" : [ { "id" : 11, - "absorbing" : true, "shape" : { "x" : 4.0, "y" : 50.0, @@ -478,16 +478,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : true, "shape" : { "x" : 11.5, "y" : 109.0, @@ -495,16 +496,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : true, "shape" : { "x" : 19.0, "y" : 141.0, @@ -512,16 +514,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "x" : 4.0, "y" : 50.0, @@ -529,13 +532,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/three_corridors_cgm.scenario b/Scenarios/Demos/roVer/scenarios/three_corridors_cgm.scenario index 8b0c0a860..10c41dd38 100644 --- a/Scenarios/Demos/roVer/scenarios/three_corridors_cgm.scenario +++ b/Scenarios/Demos/roVer/scenarios/three_corridors_cgm.scenario @@ -1,7 +1,8 @@ { "name" : "three_corridors_cgm", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -478,7 +479,6 @@ "stairs" : [ ], "targets" : [ { "id" : 11, - "absorbing" : true, "shape" : { "x" : 4.0, "y" : 50.0, @@ -486,16 +486,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : true, "shape" : { "x" : 11.5, "y" : 109.0, @@ -503,16 +504,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : true, "shape" : { "x" : 19.0, "y" : 141.0, @@ -520,16 +522,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "x" : 4.0, "y" : 50.0, @@ -537,13 +540,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/roVer/scenarios/three_corridors_pcm.scenario b/Scenarios/Demos/roVer/scenarios/three_corridors_pcm.scenario index 376aaafe8..4786d5e76 100644 --- a/Scenarios/Demos/roVer/scenarios/three_corridors_pcm.scenario +++ b/Scenarios/Demos/roVer/scenarios/three_corridors_pcm.scenario @@ -1,7 +1,8 @@ { "name" : "three_corridors_pcm", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -466,7 +467,6 @@ "stairs" : [ ], "targets" : [ { "id" : 11, - "absorbing" : true, "shape" : { "x" : 4.0, "y" : 50.0, @@ -474,16 +474,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : true, "shape" : { "x" : 11.5, "y" : 109.0, @@ -491,16 +492,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : true, "shape" : { "x" : 19.0, "y" : 141.0, @@ -508,16 +510,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : true, "shape" : { "x" : 4.0, "y" : 50.0, @@ -525,13 +528,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario b/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario index 681553abb..10765c9ae 100644 --- a/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario +++ b/Scenarios/Demos/supermarket/scenarios/Liddle_osm_v4.scenario @@ -1,8 +1,8 @@ { "name" : "Liddle_osm_v4", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -193,7 +193,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 1.0, "y" : 6.8, @@ -201,13 +200,15 @@ "height" : 1.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/supermarket/scenarios/counterflow.scenario b/Scenarios/Demos/supermarket/scenarios/counterflow.scenario index a0755ebd7..3ea5fb212 100644 --- a/Scenarios/Demos/supermarket/scenarios/counterflow.scenario +++ b/Scenarios/Demos/supermarket/scenarios/counterflow.scenario @@ -1,8 +1,8 @@ { "name" : "counterflow", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -175,7 +175,6 @@ "stairs" : [ ], "targets" : [ { "id" : 3, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -183,16 +182,17 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 38.0, "y" : 0.5, @@ -200,13 +200,15 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario b/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario index fb4210d63..6c6201a74 100644 --- a/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario +++ b/Scenarios/Demos/supermarket/scenarios/supermarket_basic.scenario @@ -1,8 +1,8 @@ { "name" : "supermarket_basic", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -783,7 +783,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1000, - "absorbing" : true, "shape" : { "x" : 17.5, "y" : 0.5, @@ -791,16 +790,17 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 100, - "absorbing" : false, "shape" : { "x" : 26.5, "y" : 9.0, @@ -808,16 +808,19 @@ "height" : 1.489826513082832, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 28.41669388585928, "y" : 11.2, @@ -825,16 +828,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 104, - "absorbing" : false, "shape" : { "x" : 30.5, "y" : 8.9, @@ -842,16 +848,19 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 101, - "absorbing" : false, "shape" : { "x" : 25.95379979928805, "y" : 5.0, @@ -859,16 +868,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 2.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 2.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 27.971641791044775, "y" : 7.53358208955224, @@ -876,16 +888,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 105, - "absorbing" : false, "shape" : { "x" : 32.0, "y" : 5.0, @@ -893,16 +908,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 2.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 2.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 106, - "absorbing" : false, "shape" : { "x" : 34.84248205900175, "y" : 11.2, @@ -910,16 +928,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 107, - "absorbing" : false, "shape" : { "x" : 34.39477611940298, "y" : 7.33358208955224, @@ -927,16 +948,19 @@ "height" : 1.3672689453061455, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 108, - "absorbing" : false, "shape" : { "x" : 37.22375361364307, "y" : 9.0, @@ -944,16 +968,19 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 109, - "absorbing" : false, "shape" : { "x" : 38.0, "y" : 5.0, @@ -961,16 +988,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 2.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 2.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 111, - "absorbing" : false, "shape" : { "x" : 41.2044776119403, "y" : 7.526865671641792, @@ -978,16 +1008,19 @@ "height" : 1.2473905238919745, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 110, - "absorbing" : false, "shape" : { "x" : 41.4, "y" : 11.2, @@ -995,16 +1028,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 98, - "absorbing" : false, "shape" : { "x" : 21.0, "y" : 9.45, @@ -1012,16 +1048,17 @@ "height" : 0.6695980553662082, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 99, - "absorbing" : false, "shape" : { "x" : 22.4, "y" : 6.830401944633793, @@ -1029,16 +1066,17 @@ "height" : 0.6695980553662082, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 114, - "absorbing" : false, "shape" : { "x" : 45.0, "y" : 5.0, @@ -1046,16 +1084,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 2.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 2.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 112, - "absorbing" : false, "shape" : { "x" : 45.0, "y" : 9.6, @@ -1063,16 +1104,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 115, - "absorbing" : false, "shape" : { "x" : 48.2, "y" : 8.0, @@ -1080,16 +1124,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 3.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 3.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 113, - "absorbing" : false, "shape" : { "x" : 45.0, "y" : 7.131947929887311, @@ -1097,16 +1144,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 300, - "absorbing" : false, "shape" : { "x" : 22.0, "y" : 12.434812035808449, @@ -1114,16 +1164,17 @@ "height" : 0.8626795768379729, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 301, - "absorbing" : false, "shape" : { "x" : 46.0, "y" : 23.5, @@ -1131,16 +1182,17 @@ "height" : 1.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 302, - "absorbing" : false, "shape" : { "x" : 32.5, "y" : 19.8, @@ -1148,16 +1200,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 303, - "absorbing" : true, "shape" : { "x" : 28.7, "y" : 29.6, @@ -1165,16 +1218,17 @@ "height" : 1.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 304, - "absorbing" : false, "shape" : { "x" : 12.1, "y" : 26.0, @@ -1182,16 +1236,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 305, - "absorbing" : false, "shape" : { "x" : 2.0, "y" : 17.5, @@ -1199,16 +1254,17 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 303, - "absorbing" : false, "shape" : { "x" : 19.0, "y" : 23.2, @@ -1216,16 +1272,17 @@ "height" : 1.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 800, - "absorbing" : false, "shape" : { "x" : 14.5, "y" : 14.7, @@ -1233,16 +1290,17 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 47.7, "y" : 21.8, @@ -1250,16 +1308,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 201, - "absorbing" : false, "shape" : { "x" : 40.1, "y" : 15.71667661776413, @@ -1267,16 +1328,17 @@ "height" : 1.7833233822358707, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 400, - "absorbing" : false, "shape" : { "x" : 41.5, "y" : 26.3, @@ -1284,16 +1346,19 @@ "height" : 0.6999999999999993, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 402, - "absorbing" : false, "shape" : { "x" : 40.7, "y" : 22.438777525022587, @@ -1301,16 +1366,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 404, - "absorbing" : false, "shape" : { "x" : 38.5, "y" : 22.438777525022587, @@ -1318,16 +1386,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 406, - "absorbing" : false, "shape" : { "x" : 34.5, "y" : 22.438777525022587, @@ -1335,16 +1406,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 408, - "absorbing" : false, "shape" : { "x" : 32.2, "y" : 22.438777525022587, @@ -1352,16 +1426,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 410, - "absorbing" : false, "shape" : { "x" : 29.4, "y" : 22.438777525022587, @@ -1369,16 +1446,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 412, - "absorbing" : false, "shape" : { "x" : 25.8, "y" : 22.338777525022586, @@ -1386,16 +1466,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 414, - "absorbing" : false, "shape" : { "x" : 24.1, "y" : 22.438777525022587, @@ -1403,16 +1486,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 602, - "absorbing" : false, "shape" : { "x" : 35.5, "y" : 30.7, @@ -1420,16 +1506,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 601, - "absorbing" : false, "shape" : { "x" : 31.5, "y" : 26.7, @@ -1437,16 +1526,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 603, - "absorbing" : false, "shape" : { "x" : 31.5, "y" : 29.5, @@ -1454,16 +1546,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 604, - "absorbing" : false, "shape" : { "x" : 26.4, "y" : 29.638777525022586, @@ -1471,16 +1566,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 415, - "absorbing" : false, "shape" : { "x" : 23.0, "y" : 16.33877752502259, @@ -1488,16 +1586,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 413, - "absorbing" : false, "shape" : { "x" : 25.7, "y" : 16.23877752502259, @@ -1505,16 +1606,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 411, - "absorbing" : false, "shape" : { "x" : 29.4, "y" : 16.53877752502259, @@ -1522,16 +1626,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 34.5, "y" : 16.638777525022586, @@ -1539,16 +1646,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 409, - "absorbing" : false, "shape" : { "x" : 32.3, "y" : 16.538777525022585, @@ -1556,16 +1666,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 405, - "absorbing" : false, "shape" : { "x" : 37.3, "y" : 16.33877752502259, @@ -1573,16 +1686,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, - "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, + "startingWithRedLight" : false, + "waitingTimeYellowPhase" : 0.0 }, { "id" : 505, - "absorbing" : false, "shape" : { "x" : 38.9, "y" : 13.438777525022587, @@ -1590,16 +1706,19 @@ "height" : 0.9152862336388026, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 509, - "absorbing" : false, "shape" : { "x" : 33.07441602575831, "y" : 13.438777525022585, @@ -1607,16 +1726,19 @@ "height" : 0.8779296773288863, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 513, - "absorbing" : false, "shape" : { "x" : 27.27441602575831, "y" : 13.438777525022585, @@ -1624,16 +1746,19 @@ "height" : 0.8779296773288863, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 900, - "absorbing" : true, "shape" : { "x" : 19.5, "y" : 19.5, @@ -1641,16 +1766,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 19, - "absorbing" : true, "shape" : { "x" : 19.7, "y" : 19.9, @@ -1658,16 +1784,17 @@ "height" : 0.2, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 15.585432050690358, "y" : 22.0, @@ -1675,16 +1802,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 902, - "absorbing" : false, "shape" : { "x" : 15.0, "y" : 17.1, @@ -1692,16 +1822,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 903, - "absorbing" : false, "shape" : { "x" : 11.5, "y" : 19.0, @@ -1709,16 +1842,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 905, - "absorbing" : false, "shape" : { "x" : 8.954451751855698, "y" : 22.0, @@ -1726,16 +1862,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 906, - "absorbing" : false, "shape" : { "x" : 8.5, "y" : 13.0, @@ -1743,16 +1882,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 908, - "absorbing" : false, "shape" : { "x" : 5.5, "y" : 19.0, @@ -1760,16 +1902,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 907, - "absorbing" : false, "shape" : { "x" : 5.899525018268529, "y" : 14.9, @@ -1777,16 +1922,19 @@ "height" : 2.3000000000000007, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 909, - "absorbing" : false, "shape" : { "x" : 2.0, "y" : 23.0, @@ -1794,16 +1942,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 910, - "absorbing" : false, "shape" : { "x" : 2.0, "y" : 11.5, @@ -1811,16 +1962,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 911, - "absorbing" : false, "shape" : { "x" : 4.0, "y" : 10.0, @@ -1828,16 +1982,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 904, - "absorbing" : false, "shape" : { "x" : 5.9, "y" : 26.0, @@ -1845,16 +2002,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1101, - "absorbing" : false, "shape" : { "x" : 50.0, "y" : 22.4, @@ -1862,16 +2022,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1100, - "absorbing" : false, "shape" : { "x" : 50.0, "y" : 17.0, @@ -1879,16 +2042,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 811, - "absorbing" : false, "shape" : { "x" : 11.0, "y" : 7.0, @@ -1896,16 +2062,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 812, - "absorbing" : false, "shape" : { "x" : 13.0, "y" : 7.0, @@ -1913,16 +2082,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 813, - "absorbing" : false, "shape" : { "x" : 15.0, "y" : 7.0, @@ -1930,16 +2102,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 814, - "absorbing" : false, "shape" : { "x" : 17.0, "y" : 7.0, @@ -1947,16 +2122,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 815, - "absorbing" : false, "shape" : { "x" : 19.0, "y" : 7.0, @@ -1964,16 +2142,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 805, - "absorbing" : false, "shape" : { "x" : 19.0, "y" : 9.0, @@ -1981,16 +2162,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 804, - "absorbing" : false, "shape" : { "x" : 17.0, "y" : 9.0, @@ -1998,16 +2182,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 803, - "absorbing" : false, "shape" : { "x" : 15.0, "y" : 9.0, @@ -2015,16 +2202,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 802, - "absorbing" : false, "shape" : { "x" : 13.0, "y" : 9.0, @@ -2032,16 +2222,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 801, - "absorbing" : false, "shape" : { "x" : 11.0, "y" : 9.0, @@ -2049,16 +2242,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 60.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 1, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 1, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 60.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 9999, - "absorbing" : true, "shape" : { "x" : 23.5, "y" : 25.5, @@ -2066,16 +2262,17 @@ "height" : 0.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 101, - "absorbing" : false, "shape" : { "x" : 29.05379979928805, "y" : 5.0, @@ -2083,16 +2280,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 2.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 2.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 101, - "absorbing" : false, "shape" : { "x" : 34.95379979928805, "y" : 5.0, @@ -2100,16 +2300,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 2.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 2.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 101, - "absorbing" : false, "shape" : { "x" : 41.25379979928805, "y" : 5.0, @@ -2117,16 +2320,19 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 2.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 2.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 104, - "absorbing" : false, "shape" : { "x" : 30.5, "y" : 7.4, @@ -2134,16 +2340,19 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 104, - "absorbing" : false, "shape" : { "x" : 26.6, "y" : 7.4, @@ -2151,16 +2360,19 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 104, - "absorbing" : false, "shape" : { "x" : 24.5, "y" : 7.4, @@ -2168,16 +2380,19 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 104, - "absorbing" : false, "shape" : { "x" : 24.5, "y" : 8.9, @@ -2185,16 +2400,19 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 27.971641791044775, "y" : 8.93358208955224, @@ -2202,16 +2420,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 35.87164179104477, "y" : 7.43358208955224, @@ -2219,16 +2440,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 32.27164179104477, "y" : 7.43358208955224, @@ -2236,16 +2460,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 32.37164179104477, "y" : 8.93358208955224, @@ -2253,16 +2480,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 34.37164179104477, "y" : 9.03358208955224, @@ -2270,16 +2500,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 36.17164179104478, "y" : 9.03358208955224, @@ -2287,16 +2520,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 39.37164179104477, "y" : 9.03358208955224, @@ -2304,16 +2540,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 39.471641791044775, "y" : 7.43358208955224, @@ -2321,16 +2560,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 41.17164179104478, "y" : 9.13358208955224, @@ -2338,16 +2580,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 42.77164179104477, "y" : 9.13358208955224, @@ -2355,16 +2600,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 42.77164179104477, "y" : 7.73358208955224, @@ -2372,16 +2620,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 37.37164179104478, "y" : 7.53358208955224, @@ -2389,16 +2640,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 44.571641791044776, "y" : 8.03358208955224, @@ -2406,16 +2660,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 103, - "absorbing" : false, "shape" : { "x" : 45.971641791044775, "y" : 8.03358208955224, @@ -2423,16 +2680,19 @@ "height" : 1.296355235298165, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 25.41669388585928, "y" : 11.2, @@ -2440,16 +2700,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 27.01669388585928, "y" : 11.2, @@ -2457,16 +2720,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 29.91669388585928, "y" : 11.2, @@ -2474,16 +2740,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 31.41669388585928, "y" : 11.2, @@ -2491,16 +2760,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 33.21669388585928, "y" : 11.2, @@ -2508,16 +2780,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 37.81669388585928, "y" : 11.3, @@ -2525,16 +2800,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 36.31669388585928, "y" : 11.2, @@ -2542,16 +2820,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 39.31669388585928, "y" : 11.3, @@ -2559,16 +2840,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 43.11669388585928, "y" : 11.2, @@ -2576,16 +2860,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 44.61669388585928, "y" : 11.3, @@ -2593,16 +2880,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 102, - "absorbing" : false, "shape" : { "x" : 20.21669388585928, "y" : 5.7, @@ -2610,16 +2900,19 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 115, - "absorbing" : false, "shape" : { "x" : 48.2, "y" : 5.4, @@ -2627,16 +2920,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 3.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 3.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 115, - "absorbing" : false, "shape" : { "x" : 48.2, "y" : 10.4, @@ -2644,16 +2940,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 3.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 3.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 115, - "absorbing" : false, "shape" : { "x" : 48.2, "y" : 13.0, @@ -2661,16 +2960,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 3.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 3.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 115, - "absorbing" : false, "shape" : { "x" : 48.3, "y" : 14.5, @@ -2678,16 +2980,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 3.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 3.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 45.5, "y" : 16.0, @@ -2695,16 +3000,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 45.4, "y" : 17.3, @@ -2712,16 +3020,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 46.7, "y" : 17.3, @@ -2729,16 +3040,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 46.8, "y" : 16.1, @@ -2746,16 +3060,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 45.7, "y" : 21.7, @@ -2763,16 +3080,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 43.3, "y" : 22.9, @@ -2780,16 +3100,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 43.4, "y" : 21.2, @@ -2797,16 +3120,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 43.6, "y" : 19.0, @@ -2814,16 +3140,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 43.4, "y" : 17.0, @@ -2831,16 +3160,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 43.1, "y" : 15.4, @@ -2848,16 +3180,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 42.1, "y" : 22.9, @@ -2865,16 +3200,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 42.0, "y" : 20.9, @@ -2882,16 +3220,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 42.3, "y" : 19.0, @@ -2899,16 +3240,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 42.1, "y" : 17.4, @@ -2916,16 +3260,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 42.2, "y" : 15.5, @@ -2933,16 +3280,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 40.4, "y" : 20.6, @@ -2950,16 +3300,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 40.3, "y" : 18.8, @@ -2967,16 +3320,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 38.6, "y" : 20.7, @@ -2984,16 +3340,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 38.7, "y" : 19.0, @@ -3001,16 +3360,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 38.9, "y" : 16.8, @@ -3018,16 +3380,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 37.2, "y" : 23.2, @@ -3035,16 +3400,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 37.2, "y" : 20.1, @@ -3052,16 +3420,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 37.2, "y" : 18.6, @@ -3069,16 +3440,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 36.0, "y" : 23.1, @@ -3086,16 +3460,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 35.9, "y" : 21.6, @@ -3103,16 +3480,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 35.9, "y" : 18.8, @@ -3120,16 +3500,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 36.0, "y" : 16.1, @@ -3137,16 +3520,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 35.9, "y" : 20.2, @@ -3154,16 +3540,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 46.3, "y" : 19.6, @@ -3171,16 +3560,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 46.2, "y" : 19.6, @@ -3188,16 +3580,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 202, - "absorbing" : false, "shape" : { "x" : 46.2, "y" : 19.6, @@ -3205,16 +3600,19 @@ "height" : 1.1000000000000014, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 34.4, "y" : 18.638777525022586, @@ -3222,16 +3620,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 34.4, "y" : 20.538777525022585, @@ -3239,16 +3640,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 32.4, "y" : 18.438777525022587, @@ -3256,16 +3660,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 32.4, "y" : 20.638777525022586, @@ -3273,16 +3680,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 31.0, "y" : 16.438777525022587, @@ -3290,16 +3700,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 31.0, "y" : 18.638777525022586, @@ -3307,16 +3720,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 31.0, "y" : 20.838777525022586, @@ -3324,16 +3740,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 31.1, "y" : 22.538777525022585, @@ -3341,16 +3760,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 29.4, "y" : 20.538777525022585, @@ -3358,16 +3780,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 29.4, "y" : 18.538777525022585, @@ -3375,16 +3800,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 28.3, "y" : 16.138777525022586, @@ -3392,16 +3820,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 28.5, "y" : 18.338777525022586, @@ -3409,16 +3840,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 25.7, "y" : 18.238777525022584, @@ -3426,16 +3860,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 28.3, "y" : 20.538777525022585, @@ -3443,16 +3880,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 28.3, "y" : 22.538777525022585, @@ -3460,16 +3900,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 27.2, "y" : 16.138777525022586, @@ -3477,16 +3920,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 27.3, "y" : 18.338777525022586, @@ -3494,16 +3940,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 27.3, "y" : 20.638777525022586, @@ -3511,16 +3960,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 27.3, "y" : 22.538777525022585, @@ -3528,16 +3980,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 25.9, "y" : 20.338777525022586, @@ -3545,16 +4000,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 24.7, "y" : 16.238777525022584, @@ -3562,16 +4020,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 24.6, "y" : 18.138777525022586, @@ -3579,16 +4040,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 24.4, "y" : 19.938777525022587, @@ -3596,16 +4060,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 23.0, "y" : 18.338777525022586, @@ -3613,16 +4080,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 22.8, "y" : 20.338777525022586, @@ -3630,16 +4100,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 23.2, "y" : 22.53877752502259, @@ -3647,16 +4120,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 407, - "absorbing" : false, "shape" : { "x" : 22.0, "y" : 16.038777525022585, @@ -3664,16 +4140,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 413, - "absorbing" : false, "shape" : { "x" : 21.9, "y" : 22.33877752502259, @@ -3681,16 +4160,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 413, - "absorbing" : false, "shape" : { "x" : 20.2, "y" : 21.13877752502259, @@ -3698,16 +4180,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, - "deletionDistance" : 0.1, + "absorbing" : false, + "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 413, - "absorbing" : false, "shape" : { "x" : 20.3, "y" : 16.93877752502259, @@ -3715,16 +4200,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 413, - "absorbing" : false, "shape" : { "x" : 19.4, "y" : 15.93877752502259, @@ -3732,16 +4220,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 413, - "absorbing" : false, "shape" : { "x" : 18.5, "y" : 17.03877752502259, @@ -3749,16 +4240,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 413, - "absorbing" : false, "shape" : { "x" : 18.4, "y" : 21.03877752502259, @@ -3766,16 +4260,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 413, - "absorbing" : false, "shape" : { "x" : 22.0, "y" : 17.93877752502259, @@ -3783,16 +4280,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 413, - "absorbing" : false, "shape" : { "x" : 21.9, "y" : 20.03877752502259, @@ -3800,16 +4300,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 13.085432050690358, "y" : 16.6, @@ -3817,16 +4320,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 12.985432050690358, "y" : 19.3, @@ -3834,16 +4340,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 12.985432050690358, "y" : 21.9, @@ -3851,16 +4360,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 14.485432050690358, "y" : 21.8, @@ -3868,16 +4380,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 15.785432050690357, "y" : 16.7, @@ -3885,16 +4400,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 15.685432050690357, "y" : 19.2, @@ -3902,16 +4420,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 16.88543205069036, "y" : 16.5, @@ -3919,16 +4440,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 16.88543205069036, "y" : 19.4, @@ -3936,16 +4460,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 16.88543205069036, "y" : 22.0, @@ -3953,16 +4480,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 6.285432050690357, "y" : 21.3, @@ -3970,16 +4500,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 3.185432050690357, "y" : 13.5, @@ -3987,16 +4520,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 3.185432050690357, "y" : 18.0, @@ -4004,16 +4540,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 5.085432050690358, "y" : 13.3, @@ -4021,16 +4560,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 5.285432050690358, "y" : 16.1, @@ -4038,16 +4580,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 6.285432050690358, "y" : 17.5, @@ -4055,16 +4600,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 9.28543205069036, "y" : 15.1, @@ -4072,16 +4620,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 11.18543205069036, "y" : 15.0, @@ -4089,16 +4640,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 11.385432050690357, "y" : 21.9, @@ -4106,16 +4660,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 9.285432050690359, "y" : 18.6, @@ -4123,16 +4680,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 8.08543205069036, "y" : 17.3, @@ -4140,16 +4700,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 8.085432050690358, "y" : 21.4, @@ -4157,16 +4720,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 5.285432050690357, "y" : 21.7, @@ -4174,16 +4740,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 901, - "absorbing" : false, "shape" : { "x" : 3.185432050690359, "y" : 21.8, @@ -4191,16 +4760,19 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 604, - "absorbing" : false, "shape" : { "x" : 26.3, "y" : 27.038777525022585, @@ -4208,16 +4780,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 604, - "absorbing" : false, "shape" : { "x" : 30.9, "y" : 30.738777525022584, @@ -4225,16 +4800,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 604, - "absorbing" : false, "shape" : { "x" : 32.9, "y" : 30.638777525022586, @@ -4242,16 +4820,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 604, - "absorbing" : false, "shape" : { "x" : 37.2, "y" : 27.238777525022584, @@ -4259,16 +4840,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 604, - "absorbing" : false, "shape" : { "x" : 37.1, "y" : 28.938777525022584, @@ -4276,16 +4860,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 604, - "absorbing" : false, "shape" : { "x" : 28.9, "y" : 27.138777525022586, @@ -4293,16 +4880,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 604, - "absorbing" : false, "shape" : { "x" : 35.0, "y" : 27.938777525022587, @@ -4310,16 +4900,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 604, - "absorbing" : false, "shape" : { "x" : 30.9, "y" : 27.53877752502259, @@ -4327,16 +4920,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 604, - "absorbing" : false, "shape" : { "x" : 32.9, "y" : 27.538777525022585, @@ -4344,16 +4940,19 @@ "height" : 1.961222474977415, "type" : "RECTANGLE" }, - "waitingTime" : 4.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 4.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 304, - "absorbing" : false, "shape" : { "x" : 15.9, "y" : 26.0, @@ -4361,16 +4960,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 304, - "absorbing" : false, "shape" : { "x" : 19.7, "y" : 26.1, @@ -4378,16 +4978,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 304, - "absorbing" : false, "shape" : { "x" : 23.1, "y" : 26.1, @@ -4395,16 +4996,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 304, - "absorbing" : false, "shape" : { "x" : 2.6, "y" : 26.0, @@ -4412,16 +5014,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 304, - "absorbing" : false, "shape" : { "x" : 9.0, "y" : 26.1, @@ -4429,16 +5032,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 999, - "absorbing" : true, "shape" : { "x" : 7.2, "y" : 3.7, @@ -4446,13 +5050,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 40.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 40.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario index 5644f0fc0..b7a3bb1f0 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/groupBaseScenario.scenario @@ -1,8 +1,8 @@ { "name" : "groupBaseScenario.scenario", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -265,7 +265,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -345,7 +347,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 88.0, "y" : 1.0, @@ -353,13 +354,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario index 01bd97406..7e08176e2 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_2group", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -183,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -200,13 +201,15 @@ "y" : 8.05 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario index dc569f317..a0e6e5286 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_2group_sparse.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_2group_sparse", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -183,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -200,13 +201,15 @@ "y" : 8.05 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario index b9606850c..78179c581 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_3group", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -183,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -200,13 +201,15 @@ "y" : 8.05 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario index d1931b56e..e7b68d0ea 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_3group_sparse.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_3group_sparse", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -183,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -200,13 +201,15 @@ "y" : 8.05 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario index 61a7358d6..86b8dd43d 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_4group", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -183,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -200,13 +201,15 @@ "y" : 8.05 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario index 807294dfc..b99f32a6b 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_4group_sparse.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_4group_sparse", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -183,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -200,13 +201,15 @@ "y" : 8.05 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario index c757741be..6b1b039d2 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_5group", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -100,7 +100,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -183,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -200,13 +201,15 @@ "y" : 8.05 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario index 5f239054f..7d4c87cf0 100644 --- a/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario +++ b/Scenarios/ModelCalibration/TestOSMGroup_calibration/scenarios/group_OSM_CGM_density_flow_5group_sparse.scenario @@ -1,8 +1,8 @@ { "name" : "group_OSM_CGM_density_flow_5group_sparse.scenario", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -104,7 +104,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -187,7 +189,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -204,13 +205,15 @@ "y" : 8.05 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario index 068df86f7..06c8fa247 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/groupBaseScenario.scenario @@ -1,8 +1,8 @@ { "name" : "g2_osm_calibration_minStepSize_0_11", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -209,7 +209,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -289,7 +291,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 88.0, "y" : 1.0, @@ -297,13 +298,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario index 105f9bc61..5bbbfbd0e 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_11_ignore_free_space.scenario @@ -1,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_11_ignore_free_space", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -239,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 43.0, "y" : 1.0, @@ -247,13 +246,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario index dad4a0f18..f7912dac4 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_17.scenario @@ -1,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_17", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -239,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 43.0, "y" : 1.0, @@ -247,13 +246,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario index f66a36c9f..0f453f143 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_25.scenario @@ -1,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_25", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -239,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 43.0, "y" : 1.0, @@ -247,13 +246,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario index e3d0942a0..e725bf84a 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_35.scenario @@ -1,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_35", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -239,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 43.0, "y" : 1.0, @@ -247,13 +246,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario index de6abb00d..b9f49ca82 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625.scenario @@ -1,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_4625", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -239,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 43.0, "y" : 1.0, @@ -247,13 +246,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario index 37b0b34a8..5125e7864 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p18.scenario @@ -1,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_4625_p18", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -239,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 43.0, "y" : 1.0, @@ -247,13 +246,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario index d1a0edfad..e3f0f8fdc 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_minStepSize_0_4625_p4.scenario @@ -1,8 +1,8 @@ { "name" : "osm_calibration_minStepSize_0_4625_p4", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -239,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 43.0, "y" : 1.0, @@ -247,13 +246,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario index 6359903e3..4c2df91cd 100644 --- a/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario +++ b/Scenarios/ModelCalibration/TestOSM_calibration/scenarios/osm_calibration_sivers_2016b.scenario @@ -1,8 +1,8 @@ { "name" : "osm_calibration_sivers_2016b", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -239,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 43.0, "y" : 1.0, @@ -247,13 +246,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario index 6725984a9..3d8c76e8a 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario @@ -1,8 +1,8 @@ { "name" : "C-050-180-180", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario index 794b90505..b1251c20b 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario @@ -1,8 +1,8 @@ { "name" : "C-050-180-180_GNM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -325,7 +325,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -333,13 +332,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario index 75d73ed28..e2c30a09e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario @@ -1,8 +1,8 @@ { "name" : "C-050-180-180_Q", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario index ae47fa750..8f7976a9d 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario @@ -1,8 +1,8 @@ { "name" : "C-060-180-180", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario index cec3d65be..602773e1c 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario @@ -1,8 +1,8 @@ { "name" : "C-060-180-180_Q", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario index ee033e1a5..c0a7c7ee7 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario @@ -1,8 +1,8 @@ { "name" : "C-070-180-180", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario index 181543898..8ea9dfaaa 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario @@ -1,8 +1,8 @@ { "name" : "C-070-180-180_Q", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario index 897af49fa..8a8263a80 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario @@ -1,8 +1,8 @@ { "name" : "C-100-180-180", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario index 0ebb804db..e50f45feb 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario @@ -1,8 +1,8 @@ { "name" : "C-100-180-180_Q", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario index 49ac3cd8e..b68528693 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario @@ -1,8 +1,8 @@ { "name" : "C-145-180-180", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario index ab0bfa284..d225696ec 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario @@ -1,8 +1,8 @@ { "name" : "C-145-180-180_Q", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 29.0, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario index 2be0ed820..016b375b9 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-070", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -377,7 +377,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -385,13 +384,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario index d47f8ee2f..ee3b0160b 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-070_Q", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -377,7 +377,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -385,13 +384,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario index 369e145fc..1a85bfe7f 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-070_UNIT", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -359,7 +359,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -367,13 +366,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario index 5f422bf60..b93a1f509 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-070_default", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -377,7 +377,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -385,13 +384,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario index 3b5905196..8823915a7 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-070_ramp", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -389,7 +389,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -397,13 +396,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario index 164d164fd..37186b2e3 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-095", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -359,7 +359,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -367,13 +366,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario index ff8fa3b61..3d622288f 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-095_Q", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -359,7 +359,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -367,13 +366,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario index f07514c3f..f2ddf6fc7 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-120", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -359,7 +359,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -367,13 +366,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario index 57d0143c0..490fa70b1 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-120_Q", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -359,7 +359,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -367,13 +366,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario index db798349a..8a0c32e88 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-180", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario index 0fb91cddb..c15f7a9cd 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario @@ -1,8 +1,8 @@ { "name" : "C-180-180-180_Q", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -341,7 +341,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 31.9, "y" : 8.4, @@ -349,13 +348,15 @@ "height" : 4.9, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario index 92970b102..68877a90e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-050-240", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -456,7 +456,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -464,13 +463,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario index 99d5dcb65..d54b58765 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-050-240_BHM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -469,7 +469,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -477,13 +476,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario index ac44363bc..7f4c21bd3 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-050-240_OSM_", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -460,7 +460,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -468,13 +467,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario index 5f8de4c21..c57b857b5 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-060-240", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -456,7 +456,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -464,13 +463,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario index f4fc02ad1..9ec1a4f9a 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-060-240_BHM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -469,7 +469,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -477,13 +476,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario index d809dbae2..676b45de5 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-060-240_OSM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -463,7 +463,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -471,13 +470,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario index 13c017efc..edcc6a68f 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-080-240", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -456,7 +456,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -464,13 +463,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario index 4376988c0..a52f2c32b 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-080-240_BHM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -469,7 +469,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -477,13 +476,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario index f3aa010d4..d6794a6ab 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-080-240_OSM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -463,7 +463,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -471,13 +470,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario index 8a0aac880..36e9c30d7 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-100-240", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -456,7 +456,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -464,13 +463,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario index deeb58af4..38a52b12e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-100-240_BHM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -469,7 +469,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -477,13 +476,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario index fbc7be0fc..ecff2443e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-100-240_OSM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -463,7 +463,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -471,13 +470,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario index b34da945b..6e5986c7e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-120-240", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -442,7 +442,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -450,13 +449,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario index 1c14d029c..e62c2da4d 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-120-240_BHM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -451,7 +451,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -459,13 +458,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario index 0e84c35de..63ec9053e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-120-240_OSM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -445,7 +445,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -453,13 +452,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario index c9ee29add..ae6679366 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-150-240", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -438,7 +438,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -446,13 +445,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario index 1182ddfe5..ce857bc1e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-150-240_BHM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -451,7 +451,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -459,13 +458,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario index 5ee7b7077..e9994480a 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-150-240_OSM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -445,7 +445,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -453,13 +452,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario index aecd26265..d52296817 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-240-240", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -438,7 +438,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -446,13 +445,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario index 880c651c5..8fe14cd1e 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-240-240_BHM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -451,7 +451,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -459,13 +458,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario index e1c5f7355..ee6e8ce87 100644 --- a/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario +++ b/Scenarios/ModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario @@ -1,8 +1,8 @@ { "name" : "T-240-240-240_OSM", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -445,7 +445,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.3, "y" : 9.2, @@ -453,13 +452,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-Labyrinth.scenario b/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-Labyrinth.scenario index aeb481773..06a80ac73 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-Labyrinth.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-Labyrinth.scenario @@ -1,8 +1,8 @@ { "name" : "BHM-FloorFieldTest-Labyrinth", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -221,7 +221,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 14.7, "y" : 19.8, @@ -229,13 +228,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-TwoObstacles.scenario b/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-TwoObstacles.scenario index 334bcd13c..d966d95ea 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-TwoObstacles.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/BHM-FloorFieldTest-TwoObstacles.scenario @@ -1,8 +1,8 @@ { "name" : "BHM-FloorFieldTest-TwoObstacles", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -167,7 +167,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 67.0, "y" : 107.0, @@ -175,13 +174,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario index 2e1e4a4fe..3b3d84828 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario @@ -2,6 +2,7 @@ "name" : "Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel", "description" : "", "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -133,7 +134,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 19.0, "y" : 1.0, @@ -141,19 +141,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "waitingBehaviour" : "individual", + "absorbing" : true, "deletionDistance" : 0.1, - "startingWithRedLight" : false, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, "nextSpeed" : -1.0, - "waitingTimeDistribution" : "constant", - "distributionParameters" : { - "updateFrequency" : 0.0 - } + "waitingTimeDistribution" : null, + "distributionParameters" : null, + "startingWithRedLight" : false, + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 1.0, "y" : 1.0, @@ -161,16 +159,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "waitingBehaviour" : "individual", + "absorbing" : true, "deletionDistance" : 0.1, - "startingWithRedLight" : false, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, "nextSpeed" : -1.0, - "waitingTimeDistribution" : "constant", - "distributionParameters" : { - "updateFrequency" : 0.0 - } + "waitingTimeDistribution" : null, + "distributionParameters" : null, + "startingWithRedLight" : false, + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField.scenario b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField.scenario index 153b4b5c4..55296d79d 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField.scenario @@ -1,8 +1,8 @@ { "name" : "Corridor-BHM-Defaults-WithFloorField", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -134,7 +134,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 18.5, "y" : 0.5, @@ -142,16 +141,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -159,13 +159,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults.scenario b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults.scenario index 7c2e4d4be..66506a019 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults.scenario @@ -1,8 +1,8 @@ { "name" : "Corridor-BHM-Defaults", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -113,7 +113,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 18.5, "y" : 0.5, @@ -121,16 +120,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -138,13 +138,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario b/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario index 3df4fb216..232ff60b3 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel.scenario @@ -1,8 +1,8 @@ { "name" : "CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -134,7 +134,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 32.5, "y" : 0.5, @@ -142,16 +141,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -159,13 +159,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField.scenario b/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField.scenario index 0fe33e6fe..1d4246eec 100644 --- a/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField.scenario +++ b/Scenarios/ModelTests/TestBHM/scenarios/CorridorKretz2006c-BHM-Defaults-WithFloorField.scenario @@ -1,8 +1,8 @@ { "name" : "CorridorKretz2006c-BHM-Defaults-WithFloorField", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -134,7 +134,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 32.5, "y" : 0.5, @@ -142,16 +141,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -159,13 +159,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario b/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario index 543e60848..b9717cdd7 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/basic_2_density.scenario @@ -1,8 +1,8 @@ { "name" : "basic_2_density", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -197,7 +197,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 34.8, "y" : 5.2, @@ -205,13 +204,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario b/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario index 67ee31dd7..f9d165db4 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/bottleneck.scenario @@ -1,8 +1,8 @@ { "name" : "bottleneck", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -184,7 +184,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.4, "y" : 7.6, @@ -192,13 +191,15 @@ "height" : 4.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario index 79e7f409c..e3c036ead 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_displaced_fail.scenario @@ -1,8 +1,8 @@ { "name" : "chicken_floorfield_displaced_fail", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -190,7 +190,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 25.0, "y" : 40.8, @@ -198,13 +197,15 @@ "height" : 5.2, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario index b0bc5e2e0..f2d1c81fe 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/chicken_floorfield_ok.scenario @@ -1,8 +1,8 @@ { "name" : "chicken_floorfield_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -200,7 +200,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 10.0, "y" : 51.2, @@ -208,13 +207,15 @@ "height" : 5.2, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario b/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario index 03f00e165..51a5f058b 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/corner_waiting_time_processor_test.scenario @@ -1,8 +1,8 @@ { "name" : "corner_waiting_time_processor_test", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -191,7 +191,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 11.2, "y" : 14.8, @@ -199,13 +198,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario b/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario index ecd013c37..3fd2647f0 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/multiple_sources.scenario @@ -1,8 +1,8 @@ { "name" : "multiple_sources", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -163,7 +163,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 12.0, @@ -171,16 +170,17 @@ "height" : 5.2, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 16.4, "y" : 4.4, @@ -188,13 +188,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario b/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario index cd8927316..3a400a24f 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/narrow_passage.scenario @@ -1,8 +1,8 @@ { "name" : "narrow_passage", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -149,7 +149,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 7.6, "y" : 2.0, @@ -157,13 +156,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario index 6b3480b88..ed3f3e598 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/regular_wall.scenario @@ -1,8 +1,8 @@ { "name" : "regular_wall", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -165,7 +165,6 @@ "stairs" : [ ], "targets" : [ { "id" : 8, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.4, @@ -173,13 +172,15 @@ "height" : 5.2, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario index 16bdb9e6c..417cf6a93 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_01_pathway.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_01_pathway", "description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 42.6, "y" : 0.6, @@ -193,13 +192,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario index a9ce56671..be6e6b53c 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_050_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_050_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -258,7 +258,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 32.8, "y" : 0.8, @@ -266,13 +265,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario index f9ee89005..13dadfb62 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_075_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_075_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -254,7 +254,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 32.8, "y" : 0.8, @@ -262,13 +261,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario index e31f28df9..f63a8f1fa 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_100_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_100_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -254,7 +254,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 32.8, "y" : 0.8, @@ -262,13 +261,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario index 05e162c09..0971d92a2 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_125_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_125_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -254,7 +254,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 32.8, "y" : 0.8, @@ -262,13 +261,15 @@ "height" : 2.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario index 5435a555b..64a966be7 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_04_flow_osm1_470_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_470_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -254,7 +254,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 42.8, "y" : 0.8, @@ -262,13 +261,15 @@ "height" : 3.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario index 1962f6400..8dc8ded60 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_05_react.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_05_react", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -140,7 +140,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 12.0, "y" : 2.0, @@ -148,13 +147,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario index 4209b5cf1..646893e43 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_06_corner.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_06_corner", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -204,7 +204,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 11.2, "y" : 14.8, @@ -212,13 +211,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario index 87b8aeb7b..cb6faa73d 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_07_speeds.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -160,7 +160,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 105.2, "y" : 2.4, @@ -168,13 +167,15 @@ "height" : 50.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario index 995c1f047..1b4e8db27 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_08_parameter_variation", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -1635,7 +1635,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 24.0, "y" : 18.4, @@ -1643,16 +1642,17 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : false, "shape" : { "x" : 114.0, "y" : 5.5, @@ -1660,13 +1660,15 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario index c284e8700..bd250b69a 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_08_parameter_variation_part1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_08_parameter_variation_part1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -1635,7 +1635,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 24.0, "y" : 18.4, @@ -1643,16 +1642,17 @@ "height" : 0.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : false, "shape" : { "x" : 114.0, "y" : 5.5, @@ -1660,13 +1660,15 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario index 349c45ae5..84ccd1a56 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_2_exits.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_public_room_2_exits", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -211,7 +211,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -240,13 +239,15 @@ "y" : 4.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario index bb2cca4e0..abb359c3d 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_09_public_room_4_exits.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_public_room_4_exits", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -220,7 +220,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -249,13 +248,15 @@ "y" : 4.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario index 64cf47b06..dcf9873c2 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_10_pathfinding.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_10_pathfinding", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -524,7 +524,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 10.8, "y" : 18.0, @@ -532,16 +531,17 @@ "height" : 1.2, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 31.2, "y" : 6.8, @@ -549,13 +549,15 @@ "height" : 5.2, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario index 9d1309d6a..44c1dcadb 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_11_exit_selection.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_11_exit_selection", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -167,7 +167,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 20.0, "y" : 1.2, @@ -175,13 +174,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario index a259951b9..e96b8d9a7 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_12_evacuation.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_12_evacuation", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -158,7 +158,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 32.0, "y" : 4.0, @@ -166,13 +165,15 @@ "height" : 2.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario b/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario index 2a4c94982..591a313c9 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/rimea_14_select_route.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_14_select_route", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -196,7 +196,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 0.8, "y" : 7.2, @@ -204,13 +203,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario index e937c6ea9..3349c26f4 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/see_small_wall.scenario @@ -1,8 +1,8 @@ { "name" : "see_small_wall", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -175,7 +175,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -183,13 +182,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario index 321091ad5..c4e135d26 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thick_wall.scenario @@ -1,8 +1,8 @@ { "name" : "thick_wall", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -175,7 +175,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.4, @@ -183,13 +182,15 @@ "height" : 5.2, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario b/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario index 2291ccaea..e5ba26cbf 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thin_wall.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -182,7 +182,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -190,13 +189,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario b/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario index ce556681f..7d9d85c18 100644 --- a/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario +++ b/Scenarios/ModelTests/TestCA/scenarios/thin_wall_and_closer_source.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_and_closer_source", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -175,7 +175,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -183,13 +182,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario index 58b1d14da..34f7d45c0 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -130,7 +130,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 10.0, "y" : 51.0, @@ -138,13 +137,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario index 5da5f3d0b..4facf7c11 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_gnm1_displaced", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -130,7 +130,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : -179.0, "y" : 237.0, @@ -138,13 +137,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario index a00456c9c..78758f190 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario @@ -1,8 +1,8 @@ { "name" : "basic_1_chicken_gnm2", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -130,7 +130,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 10.0, "y" : 51.0, @@ -138,13 +137,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario index 90e6e002f..d81957b15 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_2_density_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -139,7 +139,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 35.0, "y" : 5.0, @@ -147,13 +146,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario index ebcea345d..373c88cfe 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_3_1_wall_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -112,7 +112,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -120,13 +119,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario index 9a09d66b4..a3bb2f047 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_3_2_wall_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -112,7 +112,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -120,13 +119,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario index df92bbb5f..161f4f638 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_3_3_wall_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -112,7 +112,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -120,13 +119,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario index 60ceee00e..7ea78d8ae 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_4_1_wall_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -112,7 +112,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -120,13 +119,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario index bab072564..b0dceb2e6 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_4_2_wall_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -112,7 +112,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -120,13 +119,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario index 7538cc59b..76080b412 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_01_pathway_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -103,7 +103,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 42.0, "y" : 0.7, @@ -111,13 +110,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario index d71ddb9e0..5b964a4b7 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_gnm1_025_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -103,7 +103,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -111,13 +110,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario index 3ca539439..0fa5f971f 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_gnm1_050_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -103,7 +103,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -111,13 +110,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario index 7ee365548..94bc0476f 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_gnm1_075_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -103,7 +103,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -111,13 +110,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario index 7cc070066..94a4b9d91 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_gnm1_100_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -103,7 +103,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -111,13 +110,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario index 09f432092..fbc75500f 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_gnm1_125_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -103,7 +103,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -111,13 +110,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario index 9a78cbb8f..a289f425d 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_05_react_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -121,7 +121,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 12.0, "y" : 2.0, @@ -129,13 +128,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario index 4685aa38a..60db76193 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_06_corner_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -121,7 +121,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 11.0, "y" : 15.0, @@ -129,13 +128,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario index e86c292ba..d7b807f64 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -103,7 +103,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 105.0, "y" : 2.5, @@ -111,13 +110,15 @@ "height" : 50.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario index 4f4a9bebc..b252f580a 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_publicRoom_gnm1_2", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -184,7 +184,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -213,13 +212,15 @@ "y" : 4.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario index 8bcb49fb9..2c0793cb3 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_publicRoom_gnm1_4", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -166,7 +166,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -195,13 +194,15 @@ "y" : 4.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario index aa5a523cd..31e70e0ed 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_10_pathfinding_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -490,7 +490,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 10.6, "y" : 78.0, @@ -498,16 +497,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 31.2, "y" : 66.9, @@ -515,13 +515,15 @@ "height" : 5.2, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario index 27b3bb405..f8f08ec85 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_11_exitSelection_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -175,7 +175,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 20.0, "y" : 1.0, @@ -183,13 +182,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario index a237a4226..e9c882955 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_12_evacuation_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -139,7 +139,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 32.0, "y" : 4.0, @@ -147,13 +146,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario index 6495904af..ece15146d 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_13_stairs_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -135,7 +135,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 20.5, "y" : 3.5, @@ -143,13 +142,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario b/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario index b300ad78f..8d963c9ed 100644 --- a/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario +++ b/Scenarios/ModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_14_selectRoute_gnm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -185,7 +185,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 7.1, @@ -193,13 +192,15 @@ "height" : 1.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario b/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario index 3fe305f20..08e788d65 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario @@ -1,8 +1,8 @@ { "name" : "basic_2_density_discrete_ca", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -198,7 +198,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 35.0, "y" : 5.0, @@ -206,13 +205,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario index 7ea5e1f9b..c801af390 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario @@ -1,8 +1,8 @@ { "name" : "basic_2_density_pso", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -170,7 +170,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 35.0, "y" : 5.0, @@ -178,13 +177,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario index 563580da6..6dbbf85b4 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario @@ -1,8 +1,8 @@ { "name" : "chicken_floorfield_displaced_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -197,7 +197,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 25.0, "y" : 41.0, @@ -205,13 +204,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario index d010be416..0c4c0c9a6 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario @@ -1,8 +1,8 @@ { "name" : "chicken_floorfield_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -207,7 +207,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 10.0, "y" : 51.0, @@ -215,13 +214,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario b/Scenarios/ModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario index cf119b7dd..206f53cc9 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario @@ -1,8 +1,8 @@ { "name" : "corner_waiting_time_processor_test", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -188,7 +188,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 11.0, "y" : 15.0, @@ -196,13 +195,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario index 5f0b562f4..bf8f84b89 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario @@ -1,8 +1,8 @@ { "name" : "narrow_passage_discrete_CA_fail", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -339,7 +339,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 7.6, "y" : 1.9, @@ -347,13 +346,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario index 30e4e9bdf..7393e98b7 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "narrow_passage_nelder_mead_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", @@ -283,7 +283,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 7.6, "y" : 1.9, @@ -291,13 +290,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario index 8126a3dbf..e38a418fc 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario @@ -1,8 +1,8 @@ { "name" : "narrow_passage_pso_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -571,7 +571,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 7.6, "y" : 1.9, @@ -579,13 +578,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario b/Scenarios/ModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario index 9957d9a5e..3508561a4 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario @@ -1,8 +1,8 @@ { "name" : "queueing_dynamic_floorfield_visual_check", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -159,7 +159,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 46.5, "y" : 5.0, @@ -167,13 +166,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 5.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "INDIVIDUAL", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 5.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario index f59d6d569..e3e3f9ba1 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario @@ -1,8 +1,8 @@ { "name" : "regular_wall_discrete_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -247,7 +247,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -255,13 +254,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario index c4271bbdf..412227257 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "regular_wall_nelder_mead_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -247,7 +247,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -255,13 +254,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario index 8ea40b726..bd275df1e 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario @@ -1,8 +1,8 @@ { "name" : "regular_wall_pso_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -175,7 +175,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -183,13 +182,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario index 2c3d0e04d..a3962047a 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_01_pathway_discrete_brute_force", "description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -314,7 +314,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 42.0, "y" : 0.7, @@ -322,13 +321,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario index 8503ce965..e1c84f1c7 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_01_pathway_discrete_ca", "description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -314,7 +314,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 42.0, "y" : 0.7, @@ -322,13 +321,15 @@ "height" : 1.6, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario index 478f72382..c028c9c4d 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_025_d", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario index fe9ee6e55..91dd97e72 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_025_up", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario index 424e2838d..f4c4e70fc 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_050_d", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario index 1331f7f94..dd9641506 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_050_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -268,7 +268,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -276,13 +275,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario index 9b5da70f4..7c799fe5f 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_050_up", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario index e754042b3..249143ae5 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_075_d", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario index 3e956bba8..b60c3bdc7 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_075_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -264,7 +264,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -272,13 +271,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario index 4ad9d0001..f6b30299d 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_075_up", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario index 0fe9911b4..54b8dffce 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_100_d", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario index 41b9dfb96..0257495a6 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_100_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -264,7 +264,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -272,13 +271,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario index 215d348f8..9a90e909c 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_100_up", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario index 483decd3e..ab0320ec9 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_125_d", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario index 228eb5d14..7e3428f82 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_125_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -264,7 +264,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -272,13 +271,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario index 6ff2451bd..5a1429b3f 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_125_up", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 33.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario index 6ba4addcf..54629adc1 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_470_h", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -264,7 +264,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 43.0, "y" : 1.0, @@ -272,13 +271,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario index 9d4bb8899..0f63a14d9 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_04_flow_osm1_550_up", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -146,7 +146,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 43.0, "y" : 1.0, @@ -154,13 +153,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_05_react.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_05_react.scenario index c400fa74d..8cf7c15e3 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_05_react.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_05_react.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_05_react", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -150,7 +150,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 12.0, "y" : 2.0, @@ -158,13 +157,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_06_corner.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_06_corner.scenario index e25bbb4ca..5b5cd34e9 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_06_corner.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_06_corner.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_06_corner", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -208,7 +208,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 11.0, "y" : 15.0, @@ -216,13 +215,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario index 4c672c0a9..7c1647cf1 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds_discrete_ca", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -170,7 +170,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 105.0, "y" : 2.5, @@ -178,13 +177,15 @@ "height" : 50.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario index b34ce52c9..61b63eb31 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds_nelder_mead", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -170,7 +170,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 105.0, "y" : 2.5, @@ -178,13 +177,15 @@ "height" : 50.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario index 53215ed8a..c78fd953d 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_07_speeds_pso", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -458,7 +458,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 105.0, "y" : 2.5, @@ -466,13 +465,15 @@ "height" : 50.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario index f90865eec..73ffe0cb7 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_08_parameter_variation", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -1636,7 +1636,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 24.0, "y" : 18.0, @@ -1644,16 +1643,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 1, - "absorbing" : false, "shape" : { "x" : 114.0, "y" : 5.5, @@ -1661,13 +1661,15 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario index ff409c003..e7d6a5fdd 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_public_room_2_exits_nelder_mead", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -249,7 +249,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -278,13 +277,15 @@ "y" : 4.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario index 07ced56a4..efe75666a 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_public_room_2_exits_pso", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -249,7 +249,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -278,13 +277,15 @@ "y" : 4.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario index 8e7fd64a1..367682279 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_public_room_4_exits_nelder_mead", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -240,7 +240,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -269,13 +268,15 @@ "y" : 4.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario index 3761bf951..ddb270acf 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_09_public_room_4_exits_pso", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -240,7 +240,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "type" : "POLYGON", "points" : [ { @@ -269,13 +268,15 @@ "y" : 4.0 } ] }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario index fddf73bb7..c515b55f4 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_10_pathfinding", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -585,7 +585,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 10.6, "y" : 18.0, @@ -593,16 +592,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 31.2, "y" : 6.9, @@ -610,13 +610,15 @@ "height" : 5.2, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario index 503af9907..cb07cb9e7 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_11_exit_selection_nelder_mead", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -204,7 +204,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 20.0, "y" : 1.0, @@ -212,13 +211,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario index c29bc1e12..4a66dcb23 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_11_exit_selection_pso", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -204,7 +204,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 20.0, "y" : 1.0, @@ -212,13 +211,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario index fdca1cccc..5fb1d9866 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_12_evacuation_nelder_mead", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -177,7 +177,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 32.0, "y" : 4.0, @@ -185,13 +184,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario index 1517cec6c..57194feee 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_12_evacuation_pso", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ { @@ -177,7 +177,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 32.0, "y" : 4.0, @@ -185,13 +184,15 @@ "height" : 3.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario index d60a0f060..81e33bab1 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_13_stairs_long_nelder_mead", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -181,7 +181,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 36.5, "y" : 3.5, @@ -189,13 +188,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario index ea1de5eb6..5918fa98f 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_13_stairs_long_pso", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -181,7 +181,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 36.5, "y" : 3.5, @@ -189,13 +188,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario index 324fe7ab1..98a6e3ee2 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_13_stairs_nelder_mead", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -181,7 +181,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 21.0, "y" : 3.5, @@ -189,13 +188,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario index bc913a0ff..5ebe9ed5a 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_13_stairs_pso", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -181,7 +181,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 21.0, "y" : 3.5, @@ -189,13 +188,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario index e60a3b20e..f84d2b065 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_14_select_route_nelder_mead", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -231,7 +231,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 7.1, @@ -239,13 +238,15 @@ "height" : 1.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario b/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario index 9a5631d5e..b095bd30e 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario @@ -1,8 +1,8 @@ { "name" : "rimea_14_select_route_pso", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -231,7 +231,6 @@ } ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 7.1, @@ -239,13 +238,15 @@ "height" : 1.8, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario index b5fd6fb22..b6f36bec1 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "see_small_wall_nelder_mead_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -193,13 +192,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario index bd5b8b81b..653098112 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario @@ -1,8 +1,8 @@ { "name" : "see_small_wall_pso_fail", "description" : "The particle swarm optimizer does not use the attribute seeSmallWalls.", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -193,13 +192,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario index 057fee0f2..c42af2885 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thick_wall_discrete_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -193,13 +192,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario index 2d3d20fd1..b5fac18a1 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thick_wall_nelder_mead_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -193,13 +192,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario index ddd11948f..e39633a29 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thick_wall_pso_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -193,13 +192,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario index f1fcf0e19..bb0aec552 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_and_closer_source_discrete_could_fail", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -193,13 +192,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario index 6ed441f1d..38c75a372 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_and_closer_source_nelder_mead_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -193,13 +192,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario index e00c1d3cc..12bec4948 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_and_closer_source_pso_could_fail", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -193,13 +192,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario index e7da3671d..40cd17a8c 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_discrete_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -192,7 +192,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -200,13 +199,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario index 01bc833b9..935ecdc57 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_nelder_mead_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -193,13 +192,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario index 24c766dc5..6d8c66954 100644 --- a/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario +++ b/Scenarios/ModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario @@ -1,8 +1,8 @@ { "name" : "thin_wall_pso_ok", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", @@ -185,7 +185,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 16.0, "y" : 2.5, @@ -193,13 +192,15 @@ "height" : 5.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario index cb4868f0f..58ad32ee5 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario @@ -1,7 +1,8 @@ { "name" : "VadereSimulation-GroupBehavior", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -85,7 +86,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -174,7 +177,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 41.1, "y" : 3.2, @@ -182,13 +184,15 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario index 84c778b18..397ac455c 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_1Source1Place", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", @@ -102,7 +103,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -155,7 +158,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 28.0, "y" : 3.0, @@ -163,13 +165,15 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario index bb09a5a76..e80ec59d8 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_1Source2Places", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -78,7 +79,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -167,7 +170,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 28.0, "y" : 3.0, @@ -175,13 +177,15 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario index 744299e24..ad3b6244a 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_2Sources1Place", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -78,7 +79,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -149,7 +152,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 28.0, "y" : 3.0, @@ -157,13 +159,15 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario index 48ed1c56f..6ae14cdf1 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_2Sources1Place_2Group_and_3Group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -78,7 +79,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -167,7 +170,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 41.1, "y" : 3.2, @@ -175,13 +177,15 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario index 609a0a3d6..052436944 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_4Source4Place_SEQ_2G_3G_4G_5G", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -81,7 +82,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -134,7 +137,6 @@ "stairs" : [ ], "targets" : [ { "id" : 5, - "absorbing" : true, "shape" : { "x" : 2.0, "y" : 1.0, @@ -142,16 +144,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : true, "shape" : { "x" : 8.0, "y" : 1.0, @@ -159,16 +162,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : true, "shape" : { "x" : 14.0, "y" : 1.0, @@ -176,16 +180,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : true, "shape" : { "x" : 20.0, "y" : 1.0, @@ -193,13 +198,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario index 6e0b1ae3e..5a675c18e 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -88,7 +89,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -168,7 +171,6 @@ "stairs" : [ ], "targets" : [ { "id" : 5, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 1.0, @@ -176,16 +178,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : true, "shape" : { "x" : 7.0, "y" : 1.0, @@ -193,16 +196,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : true, "shape" : { "x" : 13.0, "y" : 1.0, @@ -210,16 +214,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : true, "shape" : { "x" : 19.0, "y" : 1.0, @@ -227,13 +232,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario index a07a01eca..f7e64f417 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -88,7 +89,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -168,7 +171,6 @@ "stairs" : [ ], "targets" : [ { "id" : 5, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 1.0, @@ -176,16 +178,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 6, - "absorbing" : true, "shape" : { "x" : 7.0, "y" : 1.0, @@ -193,16 +196,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 7, - "absorbing" : true, "shape" : { "x" : 13.0, "y" : 1.0, @@ -210,16 +214,17 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 8, - "absorbing" : true, "shape" : { "x" : 19.0, "y" : 1.0, @@ -227,13 +232,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario index 64b53169c..1fa98fe83 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_classroom_1group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -120,7 +121,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -263,7 +266,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 7.5, "y" : 8.1, @@ -271,13 +273,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario index 113bbb932..b0e83ff2e 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_classroom_2group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -120,7 +121,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -263,7 +266,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 7.5, "y" : 8.1, @@ -271,13 +273,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario index 85e3a5902..1318bd735 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_classroom_3group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -120,7 +121,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -263,7 +266,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 7.5, "y" : 8.1, @@ -271,13 +273,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario index fd5ba62a9..6c26c3f95 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_classroom_4group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -120,7 +121,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -263,7 +266,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 7.5, "y" : 8.1, @@ -271,13 +273,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario index 66721026a..9ed6124d2 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_labratory_15group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -120,7 +121,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -236,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "x" : 18.8, "y" : 3.55, @@ -244,13 +246,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario index 32cfd2d7d..0eb6ce3e7 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_labratory_1group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -120,7 +121,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -236,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "x" : 18.8, "y" : 3.55, @@ -244,13 +246,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario index dc568725b..82023c9dc 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_labratory_25group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -120,7 +121,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -236,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "x" : 18.8, "y" : 3.55, @@ -244,13 +246,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario index ed565c628..3f50264fe 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_labratory_2group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -120,7 +121,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -236,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "x" : 18.8, "y" : 3.55, @@ -244,13 +246,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario index e070939b5..ca2762752 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_CGM_labratory_4group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -120,7 +121,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -236,7 +239,6 @@ "stairs" : [ ], "targets" : [ { "id" : 2, - "absorbing" : true, "shape" : { "x" : 18.8, "y" : 3.55, @@ -244,13 +246,15 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_change_target_stimulus.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_change_target_stimulus.scenario index a9653d7dd..090882d15 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_change_target_stimulus.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_change_target_stimulus.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_change_target_stimulus", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +94,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -154,7 +157,6 @@ "stairs" : [ ], "targets" : [ { "id" : 11, - "absorbing" : true, "shape" : { "x" : 2.3, "y" : 2.1, @@ -162,16 +164,17 @@ "height" : 2.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 21, - "absorbing" : true, "shape" : { "x" : 16.1, "y" : 2.8, @@ -179,16 +182,17 @@ "height" : 2.1, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 31, - "absorbing" : true, "shape" : { "x" : 30.7, "y" : 2.8, @@ -196,13 +200,15 @@ "height" : 2.3, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario index e75f22ea9..112ec461d 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_long_corr_2Group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +94,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -146,7 +149,6 @@ "stairs" : [ ], "targets" : [ { "id" : 5, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -154,13 +156,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario index 9df5ab503..c6867ec66 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_long_corr_3Group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -81,7 +82,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -134,7 +137,6 @@ "stairs" : [ ], "targets" : [ { "id" : 5, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -142,13 +144,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario index 423dd1c9e..299f02034 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_long_corr_4Group", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -81,7 +82,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -134,7 +137,6 @@ "stairs" : [ ], "targets" : [ { "id" : 5, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -142,13 +144,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_target_changer.scenario b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_target_changer.scenario index 81e52a114..afd827462 100644 --- a/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_target_changer.scenario +++ b/Scenarios/ModelTests/TestOSMGroup/scenarios/group_OSM_target_changer.scenario @@ -1,7 +1,8 @@ { "name" : "group_OSM_target_changer", "description" : "", - "release" : "2.2", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -93,7 +94,9 @@ }, "org.vadere.state.attributes.models.AttributesCGM" : { "groupMemberRepulsionFactor" : 0.01, - "leaderAttractionFactor" : 0.003 + "leaderAttractionFactor" : 0.003, + "lostMembers" : false, + "waitBehaviourRelevantAgentsFactor" : -1 } }, "attributesSimulation" : { @@ -146,7 +149,6 @@ "stairs" : [ ], "targets" : [ { "id" : 5, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -154,16 +156,17 @@ "height" : 4.4, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 35.0, "y" : 15.0, @@ -171,13 +174,15 @@ "height" : 4.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ { "id" : 3, diff --git a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario index d0463831b..d8f61d26c 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_1_roadReachTarget_ovm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_5_1_roadReachTarget_ovm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -100,7 +100,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 28.0, "y" : 1.0, @@ -108,13 +107,15 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario index b766dc825..53e78495c 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/basic_5_2_roadReachTarget_ovm1.scenario @@ -1,8 +1,8 @@ { "name" : "basic_5_2_roadReachTarget_ovm1", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -100,7 +100,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 275.0, "y" : 275.0, @@ -108,16 +107,19 @@ "height" : 4.0, "type" : "RECTANGLE" }, - "waitingTime" : 10.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "TRAFFIC_LIGHT", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 10.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 25.0, "y" : 0.9, @@ -125,13 +127,15 @@ "height" : 1.0, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario b/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario index 34fa1bd74..3ecb8398d 100644 --- a/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario +++ b/Scenarios/ModelTests/TestOVM/scenarios/testtrafficlight.scenario @@ -1,8 +1,8 @@ { "name" : "testtrafficlight", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ ], "processors" : [ ], @@ -114,7 +114,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : false, "shape" : { "x" : 5.8, "y" : 7.1, @@ -122,16 +121,19 @@ "height" : 1.2, "type" : "RECTANGLE" }, - "waitingTime" : 50.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : false, + "absorbing" : false, "deletionDistance" : 0.1, + "waitingBehaviour" : "TRAFFIC_LIGHT", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : "constant", + "distributionParameters" : { + "updateFrequency" : 50.0 + }, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 5.4, "y" : 2.2, @@ -139,13 +141,15 @@ "height" : 0.7, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario index 5e8d03186..bd997ea17 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/01-SimplifiedExperiment-OSMEventDriven-PsychDisabled.scenario @@ -1,8 +1,8 @@ { "name" : "01-SimplifiedExperiment-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -146,7 +146,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 8.5, "y" : 0.75, @@ -154,13 +153,15 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario index 9a36481ed..ed65aa14f 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "02-SimpliefiedExperiment-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -146,7 +146,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 8.5, "y" : 0.75, @@ -154,13 +153,15 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario index 8f671adf9..9fb58dec5 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted.scenario @@ -1,8 +1,8 @@ { "name" : "03-SimplifiedExperiment-OSMEventDriven-PsychEnabled-PersonalSpacedAdapted", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -146,7 +146,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 8.5, "y" : 0.75, @@ -154,13 +153,15 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario index a4eaf6fab..01c4c6811 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/04-SimplifiedExperiment-OSMSequential-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "04-SimplifiedExperiment-OSMSequential-PsychEnabled", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -146,7 +146,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 8.5, "y" : 0.75, @@ -154,13 +153,15 @@ "height" : 1.5, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : true, "deletionDistance" : 0.1, + "waitingBehaviour" : "NO_WAITING", + "parallelWaiters" : 0, + "nextSpeed" : -1.0, + "waitingTimeDistribution" : null, + "distributionParameters" : null, "startingWithRedLight" : false, - "nextSpeed" : -1.0 + "waitingTimeYellowPhase" : 0.0 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario index e38238a88..7f1506fbd 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-Ps