diff --git a/CHANGELOG.md b/CHANGELOG.md index 47ceb47f7d28c7184b34c993606cfe1fbf3cc66a..270a8b3ed6fb614f075ba53c2ea002f818dc9f9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,29 @@ ### Other +## v2.3: + +### Added +- Added new parameter `waitingTimeDistribution` to `AttributesTarget` describing a distribution used for the agents waiting time at a target. +- Added new parameter `distributionParameters` to `AttributesTarget` describing the parameters of `waitingTimeDistribution`. +- Added new parameter `waitingMode` to `AttributesTarget` used for differentiating between individual waiting and traffic light waiting. + - can be set to `noWaiting` if agents should be absorbed immediately + - can be set to `individual` if agents should wait with individually assigned waiting times + - can be set to `trafficLight` if the target represents a traffic light +### Removed +- Removed parameter `waitingTime` from `AttributesTarget`, because this is now described by `distributionParameters`. +### Changed + +### Fixed + +### Performance + +### Security + +### Deprecated + +### Other + ## v2.1 (2022-03-XX) diff --git a/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario b/Scenarios/Demos/AirTransmissionModel/examples/scenarios/bottleneckA.scenario index 51423b2576e6430ec7ff139a3d124e2a7556b525..af67c8c0d0fd3a2c4178fc1ae22efb8a626183ee 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 ae62b0da929b8811043a74479b9e94989f309116..c98083144aae8733c155bd5230e9b4194299eefb 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 4cafd492706c85f1256e85e1ce8da72cc554ca66..a116e2044769ae19e878cb6b99d8c4feaa21696d 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 8f3b62ceeaa80ecbe60d35f098f7dfe9bc8a095a..b80d6276fd24df28e58b657805480c506b18a098 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 ebb759df4cfdd044ae21cc72ae49f70db1e3e235..0198da323135f7c040a59bf03ba6984eecb16afd 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 a8b4e33e661319c67ba17feaec1c6053bb4c2c86..c12c763fbec66db940df1e0fb7df48ed30a7e806 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 071461ba547dbb090b93b549e335d75e150c367c..34efecb7d4af71585d86efae7453471605d423ba 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 a6f2c16d6a0d8abac5d698e49833102ec7ee585e..4e6cc6d8a93becae5e38610e4bc19056c632b0df 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 58ad2fc8baaf4b644b97c330c462b035fdfc2705..187b62d0b8016e9d45a8dee79e501ee42738c805 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 c5067499ae40f9b5451052390a08df939dd96fdc..0b68a6e432f62f4a47f66860bf8c1529e1a8613d 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 e491efe1fd86f694a598b2ae32596fe456b37daf..f1ab6b23fd7160f76e3e29786fb7925c3ceee340 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 ee9b8e37614296f2bfacb3d187142323a2c8ad61..c0d8150aefd5667bf08fc5e5c62688410e89cc3c 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 de6986bd739edaa4bf10cc06c11f03a74ab4c451..889c1ac45d8933bcf4dcbb2b569e01b153400337 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 42356a01279a856d53f57ccd15792e4a5abad0f2..5ab9e4864b31d43855a114eb83217a2767726629 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 b1a3d44dc1496c6b45722c3bed421ebb02828e92..06f449dc85912d9e9aa8dd05fca47f1e29991006 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 2c0e36186487ea54b3760aca89902f8b835b8ee0..0d8b2f7ea1272325c3411e33010634938a43ef3b 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 bfaad8f59d9c64f29cac5f90fdfc6fdef34ad9fe..abd52ffc46e801d173d6abef587ec7f4b19719b8 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 dbc0e20ed1202f5f8bd70676514983b45d3313e2..518615ef045b9537ac0135b1521c48a4454f56b7 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 1e9fe055cb8bcdf3c762197628d323f72952a51d..9fe1ae638c4c4737aabfea620f312babb417ecfd 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 318dc2456bab72aec3463c5ef06e16a3b4232ee6..c31c6720d8c0c33d1b0bd8593e225fed956dbae0 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 8be0e14f66c55ec51efc3d57e9c73fd609a60175..7fff737770e3a88ac764e0870328faec510ccc06 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 4771ae7c4e3d39129cd1cb2e534b214e5a1ad337..23d6a1d2ad6707d085109ec017005ffc83d6aebe 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 ce45382c40b9296866f74cbc599a31dfd6bdabfc..18327ce32e14e5d8dc644539cd684d5a31664498 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 fc6f2f3aeb808e59380b699ff6821e58dbf17eeb..5a1743c06d3d62ed785469cc83b12a30c94ade01 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 49a77f4bd013d9d3773874ed5b39f45c5fed192e..f2df520e718b1eefc11ba81900c2e20f0a616c2a 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 4f63f67354d9112976a6c4ac4ee0d3dfc9234fc1..65a547d0919bab37ecd2dd428fabcf7cd1fe9a35 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 a50a2cf2b2ff10726b33d101de79c2b999ff860f..f0c4599dffe8c2a4879ad324417396cd7d9a3ec9 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 2f6286a9fdec9bff46507b71eb0925852f257ec6..18c2116b3bac12c8905aa55dd55cc5bfe9ea3a8a 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 9797f471ac4a1a0b40f9f2b621f3715d7241e7e0..3f18acf63515d416bf4e7886769999420d351643 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 ba60f99f7f8494842d92ac52921f586b2d658e9c..176c23a35778294c476bc42f1884c1226bbdeac5 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 ba2ed46e20e1321952060e7bcd9ccbd53a824220..b62cb3e8f2cad4d29b47fdd1abb567ba2fc3df34 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 795479e3f973d90bee0d8d07a5f36dce2b3de626..c3a400c50a80b01373ac11e51208d229cb51a0da 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 84abe1e9ead0baf63946e1e7c72a1f336033734b..2245be7b9ba672c440417920b5d449fa65ef989e 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 1161c543968ce0bd96cd1347f8b659021c87c7df..4210c866bf88cc95911203537bde42fa23673c24 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 a0488cfbab2eaf17b10f1f25c4091831007013ad..c5357bf8c2e398e7f3022da94e30a0a8fc926f45 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 6f12c0822609241a51f7a6052d8d9f150ccd3f25..fc7defce3d7134e19082b71e65f30a26408c36da 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 610967cb25b106b004882223cce2c915f242d8c9..6d6dde3c1acaddfd2029d1b12864ce13cf512128 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 0d0b09e05e61a8e0e1716ab443d8957172568b99..b8718c618e19c450786a2d9ada066c5d1c3659d1 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 55c0f86c0d5ee83585866d3cc4869f66564fa4c9..30648d4d78078afb041874412959d39610bcee19 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 c8c87cdf958549587cb7f3b87355f206b7894faf..cf79bcf097f261dbf021d8ddff4e094d3f15bfac 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 420790d4458b58dd1316049c08e522d8c01974f7..8d5668b90b6ebb4eb0252b740d076bc555e42deb 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 22df2289e1265dc3cbd87a5116e931d1b2326600..9d866ffef3bcab3f6814365186ca7afe135cb5ca 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 a25ddcaa7614aeae89d8ff8a6e15f378fabf3af4..f135fff3ed2b757598ca80ca7c95f6758304ede8 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 44ce2862b4b33547fba63e8c8140b65245bc429f..b5959b7f1c7be2431b994907ceae4f69b14b8798 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 a6e86cd365785aad059623f0d5442b278c944160..0d38445190d91fbe4439ab66dc24c9513d77e931 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 ba5ffe8787b338d269629983decd358565f31a6b..6a7867a03be8613539a78ad44a95b5d678a64c4c 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 25e2a310ac259ff2caabef84eebaf73fe5a3c89a..2c3624dcd06b0fbcbd896d80006a8f9b485f49fc 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 8c5119906e6ad8a2e494f327edf2e9958688c86a..02e20408089fede5f0ae30696ddab1c4d35a401b 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 afbf5e081b94fd5d242f6e6d271f2a1a38f931ab..d2cd580c24e862d7c31ff148030cfe05c5609942 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 0a8d30c832cc26a3f76f2482500156cacc32e2ee..31620a325ad1dee356fa6feee03764adadb6bf8f 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 2a098190f65ab461cd2f2ef4a524018db6e800c9..6557c554ab8853375955e991781a032b9396d51a 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 f86422df5978ea7e34fc7ea9209414a17e4278b0..c7fb366bbc9fb3b264d5993eb131b28ae39f250f 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 a92e7f04617dd7b0de1e6d64507e7415d2b384fe..f9ce5e2c39d387152b769d6e14797cf1acf85d7b 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 09007654906693a78fe4fa623d367018ab3980fe..a8a7ad50b073459ed8b0760bd980de618c46b09e 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 9eee2da12563a38a36376605496cff6f737bccb4..2a719d306a00b7ff9f4760e9d7075adba65bae27 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 15bc83b5f57036add8b433072fc0d48f0aa78013..cefbbcebcf7722674aa273052352845c3d76d8ca 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 ac06a056e73029112e4550e94c0c89bb03b421fa..2adef53b409e9af5cb4604d97a5aa82b938bb3f3 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 534b1a820a5e66e2c8e8e05a1401566ed65ab948..c2c6fe3127951b7683247de87076d0b7ff6f3799 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 4b0b8edd1ac5cbb59da3344d6c88d43ed8887ec5..8581e46740222ad9e1c970e42c3b6aa33f239c00 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 be4cdd5beee65803b06b2c6be96d0d85a7ee1175..ce203350aa55b2b17e710cc8d4e148c3bc439547 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 d899ddbbd389294b039143842ecf3e6f53712fd3..b1338ab0f106b94fff1dcf403c6ede8c88437455 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 f643aab927e5deab8aa1cff14dc45137f961afc3..7a0aa665563862b06aa39daf5ab529118f23195d 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 781750d82a30a0b4cf13c233dc7c864a333690e4..3d21e366639c776e9485306b8a296f5e599ce939 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 36b170adb5a480cfe6d922f098f57e63938c70c3..5333111155bcb019378f2f1de8d5b093564f8f0e 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 14b95217db5a32642cd21b148b8add9cf7137ebc..c2843adcbccfb93acca9ad96f8a06f78301bdd66 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 9b4766e6f26c48448f6dccd8547de5ec7a893b0b..75644a8acfc8273329b2dafef44a5b833d1b0a9a 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 c4612a7faf0520dfdfb557c6e32c59012c56416f..dbb30fc9200a487ee13a64acbd58f8c47f39d9c1 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 19e6403b9d718fa7fd676368baef166ddd2c6284..883ac4f782dfeec3ab8b909ec789cac009828c6d 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 3e07301c508f8667d7da40d63f77a32f5374542e..222f9c37a8ba114e31feb13845f52f4b4ca1ec4f 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 582ff3b2d63fe8eff219cadbe215b9942ac9f442..f7bd36568f6d2c8b2fb834a94e26cb069feb36cc 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 91bf01027467d059e06f14b56a01fc7a3b43dbb4..eb7afce1538bff7f65428de8515e42f02a68cfae 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 b166b3ec311f8ce0fd1959b28610195263cde4a1..e76ff11e8ddc3d5b4fdb6ff377893e165ab02373 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 f18ed6617227ec39d9a2d76cffe1623c0dcdc61a..14bcf499770b61c6c54c43f375c9cb5e2c7e7998 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 70646b05d230c5ccf68a6bb4f1fbfec367cb24a6..e8dc6d7efae0ecab85d4ca90db273ccfca7d1677 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 789c5734ec6913c487a8fe356a9f61e8b379a4c0..f2b7e30d7d1fd9e4e475ba8926a54a48a9b8dd8c 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 6d535541c956b60b72f3b4aba96cda3c17400473..2f833d91cbdd8e2e4c9c81b8f2bf4a669450e161 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 a13e7dcb5073edd509a4d6e09420098c43db4be7..1a35477b5a6f9d77e3e8df53fd174191978c10a9 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 05a2bc0a31ebd7a88b8f124aafb521d74b27c4c2..d2a02e341b2de1cb0183e91c228ffb39b13d3359 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 376e0ff5c339ba04fcee2dd8c906d3e3b0c13ecf..8e5cd4dd90494854d2224d1a42a083bfd62b9eba 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 292a7ab4bbc87d8b7a8528af9d4731a37ddce000..28dab8a5d769c0d5dca9ccbcd57a31a231ce5746 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 b1e71f3ee7845ab38dc6704dba81c22d76d98445..46504d63c57d66ce65d30a1d8dfc15ca9f6f896a 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 75bc8ee1a5e6a22b764c71dec00c77fbf3ea69f1..90b00bcafabce00f1ce9eddc33127e0ca656138a 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 7029f2e2e7488cb9670734fdaf0913605055f295..d6887d44314483af3f000e3f4e10cf2205c5a67d 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 bcc3552f4a7db34eab88f2d34408278321150b5d..c4a1c5fcd8a1129d30024fec9ba61d3afbeb788d 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 4a656249e254dedc4891bd023e6819046b438c1e..ef7b70b784e464a48bf05f6e098082a76332dff8 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 8b0c0a8606205648ad5d0076aa6439c5bfe6d3ed..10c41dd3899c029859c1e5b59da105d3e5a370cc 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 376aaafe8eed08b69598f128fcdd55e8d8022cf6..4786d5e76627431c6f3b043b2f6f7a874cd91e09 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 681553abb2f6887f542211e48bdeabd7804345e5..10765c9ae87cfad69abc4af276b0edc80e85f75c 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 a0755ebd7703b99cb8fc0b3e88809c68c200fcfe..3ea5fb2129aa14ca96291dbf1b0e6ff5f7d7a737 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 fb4210d6333ca03f27ef11575d914a75ffe4b435..6c6201a7496b3f949538bfe5fed7d0fbc4c72997 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 5644f0fc05b25bd43f44da8aaa5dc1a064aae2cb..b7a3bb1f079b5d5ee0e026484c9213b72742e5f0 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 01bd974066a4883498a79fde7063d7b3382e889c..7e08176e24129b50c119a3e51473cb6249a0dc52 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 dc569f317e9e03f2c28866765b6a771b17623870..a0e6e5286a8017f61c9f30a158e7ba3d69c307c5 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 b9606850cd3faa2696ee40761c367af3c288a879..78179c581386a0835d30f157b9d149e7c00dc72b 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 d1931b56ef19007e2c94b4fec5a81e2e1c591a57..e7b68d0ead938460b2400e140938b16ff8636b78 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 61a7358d6b46c28354cbb323608c9e32189a1c23..86b8dd43d11acd8ec1cca77ad1bd269249d8a7ff 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 807294dfc9d919624715e6b3eccd46fae8d840be..b99f32a6b1009b9bc2b13d7bfc6ca7752c723508 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 c757741be3b146e744c15e599dc5f5018e820a4d..6b1b039d2fedb1f22036cc88eb9db3574df1d5cf 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 5f239054fd70f863e9c1cc40721b0af20d56cc52..7d4c87cf07ef0332b9f1a1854764442235bccd1c 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 068df86f7e5a778e1b015f12c28838b7ddb4ae83..06c8fa247eaaef0848fd3ad1f441e3fa23e473ab 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 105f9bc61032f77b889d927fc4faf78eea9c6f4e..5bbbfbd0e691323f326b3d1cebf2b6e9a7d71f2d 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 dad4a0f189379f7e4329be44e6f7590fc3b8aa75..f7912dac420b7b9263ebf1c57b7c3e6fe65c53e6 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 f66a36c9f16542df00ff2353721e165d87859930..0f453f143d0dd89199feddbb0ef067f4c6910dfc 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 e3d0942a00694470a02e8d47a2057736b9098ffb..e725bf84abd6134d0be37b02e03da149784b4215 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 de6abb00d5d5f9aae5bea4a8a5c6fe6750dbffaa..b9f49ca828f00d2c28529a6ee0b825b783961676 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 37b0b34a825b08437a4119f50af05ae5454740fb..5125e7864d12373ee988f79e1043ef2da6c25885 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 d1a0edfadb6bc3fdd3f1d210532f902ec5f3e700..e3f0f8fdc7cc4c2f1ebf394c026c8a1630282a0b 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 6359903e3296b5e05e09505d2520d8918d3dfcbe..4c2df91cd9a694b12391fe9a0c11021417066292 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 6725984a9a61c278ebbd4d95d483fb1233f731da..3d8c76e8a1ffc6d079c088db9cf763aa0220a294 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 794b905054428f0fad977d1b7d371525b7ae14fa..b1251c20bb6c43d6c8da31fbf90c2bf6c0b0c19f 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 75d73ed28ae91b9d82dd0de28a4b22ee7f6b812c..e2c30a09e8b0236dd4aedfe3e13da4105df5c928 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 ae47fa750d5f7e214802d2d07d1172008011a751..8f7976a9d0098476a2db013dda95291640f9f570 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 cec3d65be7d1f869b1ec6692f5eb4a776db122e9..602773e1c6dc68b234d0b1d4df88ad37c98cdb28 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 ee033e1a5a1ced0becefe23c0792f691653440fc..c0a7c7ee70118973995c72586da175993bb7c399 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 181543898a0600c6fb3cf4d593384211007afc43..8ea9dfaaa13b9c1b72739a11ce0dedcaf53a2fb9 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 897af49fab959e24d6387c9cfb33c214e23e56c8..8a8263a8015f495dc65ab8843fc8c27851429dd9 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 0ebb804db7206fa330f2bda939d198cd9a308e31..e50f45febd6f1ce7548afe7595f6179ac518444b 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 49ac3cd8e5dae1c0083697bd794b1d951cbd026f..b685286932314a99cf3dcad43b761218852338f9 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 ab0bfa284c7b0581df564aa64536d3c1ecc42c76..d225696ece521e6965dad02100192518ad66edcb 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 2be0ed820b60e09720440e43331ae4727c68b49e..016b375b9393d4e327624d8afca4af5c63213abf 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 d47f8ee2fbf2847cdbf49d5dac931f90a5567291..ee3b0160b254b10fe988ede9e82cce5cff63851b 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 369e145fc82a7a1009e14976dfba664024e57544..1a85bfe7f04b134e94daf14b514c3f7b2b506aaa 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 5f422bf60811ae3ffef6f258e9db60129e2f6bdf..b93a1f50947cbebb2ee90661f93c1a98be8e21e5 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 3b59051960168c4d9201870d8f88416e78c8774e..8823915a793f083c5f8e7a1e37dac3db1967f0f2 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 164d164fd1a306e4620d59492b3aae4027ce6239..37186b2e3a458acbd26272344a06d11729bbd79f 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 ff8fa3b61e5cc659b4f021b7ee1814c54cb3726f..3d622288fe6201718b7278e3b51aec769dbe5072 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 f07514c3fc53c84eca1cb1c5ac74f477fd01d7d3..f2ddf6fc7dfd82c78411359771e2cf940f406e5a 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 57d0143c01d9c7fe17b68e41c3450f2d1d06a29e..490fa70b1e29e2089c8b234d4685eb6aa5cd2751 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 db798349a37b39ca9ae13d427e307d5d883f265d..8a0c32e88562b4c398519022213847832169f58c 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 0fb91cddb986c8c26af4f6e8a5ec230d67153a0a..c15f7a9cd0f5ea89d2381e8cd09a574e8653c548 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 92970b1023bab45287d5ed4a33942a08f441a356..68877a90e4a61c754fdc24c47ab903720a70747d 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 99d5dcb655c25140b0f134d97cc4e8e555060d10..d54b58765120b0762cb247f11cd1264d4fc3edec 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 ac44363bcff02fbd105d50ba87f30d4b88c3de9a..7f4c21bd3552f4796b5a81e06b471b2de663952e 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 5f8de4c214ed52ffea85a36014d64f8bb1c8fe77..c57b857b57f0ae2c435be009c24e97cfdc8f3b66 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 f4fc02ad159b859855442f63a21c505468ca0580..9ec1a4f9a2f3181eba7e92cb84fec75fe7e1a5e0 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 d809dbae201cf5219bd9e38f229f52d84f7afdce..676b45de55bd91a994b0520a24c0b697e85ac187 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 13c017efce401ba558c4e3771facd861c1efeb30..edcc6a68f8767bc2aed7802b377e187c8ce4c7e6 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 4376988c0285e471be78cbddddc6a3f502ade1b3..a52f2c32bf064eeb5d1b89f8995bb9bb2eabc824 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 f3aa010d4e4a562b8d03df4b9254a8c12efb90cd..d6794a6abb64cad5653cb1bbbfbf5188cd86e48f 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 8a0aac880b22f5ed9bba6cc78882c187d2e5e7ad..36e9c30d7e71c4255df2711ac664dba7cb657f0f 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 deeb58af41c78117a4f66372b78cad3c097809e9..38a52b12efec8b8ace0349e031589813e8c56dd0 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 fbc7be0fc7a2852e039aaaf1814f3b548f24d6fd..ecff2443e25f6fbcba7ecd958bc2c6fc2dd90fed 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 b34da945b4068c13d1161ae5c788b10b41aee2b7..6e5986c7e3da9a0b3b0c3250d95c1b2fc9a9df11 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 1c14d029c7bcdc5d95359a466c2e6d21d903b908..e62c2da4d81a0ef1abf8c1d8f38fd9368b5cbfb8 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 0e84c35de7e7689f5973e6b46597cc01d2dfbe0b..63ec9053ef55e2831315d4a147ec69509ac30d18 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 c9ee29add013d2338461d042c24bd7d4759305c0..ae667936664957fd4d164f9ecd61f36d08543495 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 1182ddfe540a8ab649f9d07f72bcb54b1b6b90da..ce857bc1ee8d32d27d3c127dd654a4e838f4f6e6 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 5ee7b707753b627f3ff963044895b3f42c08516e..e9994480aa87f7d746b61348966d6daff9432753 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 aecd2626548a7fd09904ee3732a66a81f145669e..d5229681726d0a2c53cd53e3b87cdc0f0c9b9e70 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 880c651c5c50ac20e23eecf19ccebdf036d39ac1..8fe14cd1e479c7a4da657081da653440082d2250 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 e1c5f7355376099650e3e2ac991efd13e1589e7a..ee6e8ce878f5e9dad3a5f52cd61d259a067c079a 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 aeb481773febdb048c9c6800c2866372c643144e..06a80ac730b23bb687bb8e7882549b8dd552184d 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 334bcd13c557ffd90ed87a953ced2af8699f4d99..d966d95ea5a4b9c3a66d42334005446e2d6570a8 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 781892fc3564868f65e185bac47095fe45b863ee..3b3d848280aca214fd4a1153f055de52fb078eba 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,8 @@ { "name" : "Corridor-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", @@ -122,10 +122,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 }, @@ -134,38 +134,40 @@ "stairs" : [ ], "targets" : [ { "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, + "absorbing" : 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, + "x" : 1.0, + "y" : 1.0, "width" : 1.0, "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" : [ ], @@ -174,8 +176,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 +200,8 @@ }, { "id" : 4, "shape" : { - "x" : 17.4, - "y" : 0.5, + "x" : 17.9, + "y" : 1.0, "width" : 1.0, "height" : 1.0, "type" : "RECTANGLE" diff --git a/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField.scenario b/Scenarios/ModelTests/TestBHM/scenarios/Corridor-BHM-Defaults-WithFloorField.scenario index 153b4b5c4d417d9a8046e240c49a59a3bdeb8f09..55296d79df08537cbbfe92d8515a8d8c16b200cc 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 7c2e4d4be28abbd3363195b4499a4efc2f79ba85..66506a01971337772d28d1cc4c66ea1ed7ba9cbf 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 3df4fb216b83d6a1f35946216264a73a39df46ad..232ff60b363d4e6e38d04d3a761271b31a5a34bd 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 0fe33e6fefbffb7a88a8e575eae12f354ea5b647..1d4246eece7c423600ab891f1d3cf3fa234d1199 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 543e60848a6f05ff15fcd64561512f437def7909..b9717cdd7426b1a9d56d6437a7401d1e8c10a5ad 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 67ee31dd795ba36fac177860cf63ccb084144354..f9d165db4569a9c3f562c5e81857fa65b1dbecaf 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 79e7f409c4a12f60aebe374359bc6cbf70ab07f5..e3c036ead6f43e03cb2abcf42d90129b9621f855 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 b0bc5e2e0fc7d81f7bd72090880accf2efd02829..f2d1c81fe85ed6509af1625dd9d5122885691f71 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 03f00e1651dcd2e001a1046f2b0aa7b14f769f36..51a5f058b52aea0ee24a78f5bba184b87a9e1346 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 ecd013c3760f596c591615d2fe3529cd404263d6..3fd2647f0a9525a1e696ffabdfe815026c0a1085 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 cd8927316086f827b857706e374bd8a8f61f4d74..3a400a24f0cd0338e39516a0c2395d3afd9926ee 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 6b3480b88e2d695c9c1a3cee0c9e56e78f110ada..ed3f3e59849407991899b20f82fdd849b94cf5d8 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 16bdb9e6cdf44a711e10ab4720df63e8cd70e953..417cf6a93b94a6cd4380c14a119f5b4e13347278 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 a9ce566710932a3725ae920a09afc378f0975254..be6e6b53c8260641f4cc29287f530ee76f3ef88e 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 f9ee8900505321a5fb0bfd1a1ecf106a99bc414f..13dadfb6238fa600cb2839c62df52288451c0f65 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 e31f28df9223f3ad9400dff2fa9dc5d320300e6f..f63a8f1fa67e537dadf6cc707b5246356166642e 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 05e162c09edf570f0de4949f0d1c746c0c2f5e46..0971d92a2f42dac48757b98fc3b611d3f209351d 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 5435a555b8b130e4c572e6c4b90be0f66cd4fe50..64a966be774c40c0480027173d7249a363f9646c 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 1962f6400cdbd6cc9cc319e62ebd99d788f1e7a5..8dc8ded60b87318bdf26eaf48780ae1720a6be7e 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 4209b5cf108e9e00d903c11ea471c1eb2a3b2234..646893e43b87526694c714341d386a0ad29838dd 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 87b8aeb7b6056fdca5a10d6cfc5938c70cea6205..cb6faa73d827d1790de4d48c462acccd1a575d31 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 995c1f047cbce2eb762664b0d7dc1fb6a14286a0..1b4e8db2770ec32582f6925b286aa1fdb8d00ae8 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 c284e8700489f42826bbb8c53f18172d00666a19..bd250b69a9679fd703e80985f6269435ce2bfda1 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 349c45ae554c16c06a1eefeafa29090379dd4e67..84ccd1a56437027fd7bb8fa7ec7696ece056240d 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 bb2cca4e051bb35ca70705891e803e8aba205f26..abb359c3d630cb5bdadbfdd699ef4e56560ee480 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 64cf47b063c45639fd1e14ea0156a3cec442e606..dcf9873c25a79277447cf375bcaeb04ef451b82c 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 9d1309d6ae8f14f1078a185c3b41a43d8a9b2424..44c1dcadb849562c21a2163666e053b0b348c944 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 a259951b9093c86384debb8ea65950c595e2f097..e96b8d9a7a0e3285b38e6d6436e860d07d0555bc 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 2a4c94982bba8b2cc49cf2afceffd4dd2af403d3..591a313c98a2adb5a62ba2cce1eb8eec3bb33ab5 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 e937c6ea9b229e3825a24dc1edaac7d5dd9bd359..3349c26f473f7687ecdab6097611ebc7782fa65d 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 321091ad54314fdc5c7c3dba4c4e6e068bb85874..c4e135d26bf034a0384a3ad0e36a1d5c292ac5cd 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 2291ccaea62be13683814caf6e05234fb77a9ec2..e5ba26cbf93049859b8cb1dcc682cdbe41d9e3dc 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 ce556681f7f53c3a9109821b503171ddd4a9f5c6..7d9d85c18c5cb67edfc6403b7c0c8aa1e2bd9da9 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 58b1d14daff6b8abf4d0fc8c5277625b394e8e47..34f7d45c02926b0d252da14836cd7b9fc794d717 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 5da5f3d0bf589c168d24929b6302f7644f7d890d..4facf7c1189605d7832a846ca8e9c4a69fb60f30 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 a00456c9cc30d726a76f28172890889ade39d84c..78758f190234ef40470afdd99398a834d722cd36 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 90e6e002f64b278e89b5832f1eb9169c60d64e35..d81957b1579ad0e59d2db562c4d960350393d72f 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 ebcea345df23ed851838bd3d83443180ba1a3169..373c88cfedde7334885791ebbd235c44e49dcc84 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 9a09d66b490e31c4fdbe5be33569e9f25bb38847..a3bb2f047d8a15d2e6dea507b9aba679a857037f 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 df92bbb5fa8917584f5452d0756257dbb2ce50d7..161f4f638c23a4cef05b7deb50491369564c45d4 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 60ceee00e359f47e423b064232a5efd2c6887e42..7ea78d8ae5cb12338e8497aa053bad75cd134039 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 bab072564fea07d6f8a3964401f82cfd542d26ca..b0dceb2e65f0700c2151fcbc11701b00e77ae3c9 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 7538cc59b1bfa08b5a6f6f9e10cbbc76fbb0dbe4..76080b4124563149745b20ab14387255b5f3e852 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 d71ddb9e04ce42d1517373a9d08b20be3bdc2f6d..5b964a4b7d1bf28732d11ab900c84865077866ac 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 3ca5394390d9f65daf118692c1e41c52299c94aa..0fa5f971fe1476cbe0e36c3a02cdee5f099f1f24 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 7ee365548300c00cd6d50d769eb73fedaa77e83f..94bc0476f7bea01cd982cc77f87c5fd37bc73868 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 7cc0700666b1dea9427bdd4fbf656212ad574720..94a4b9d91b8cd295fd2387975fcc525892d4129e 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 09f4320921878cef441e3474a662f3f312715ca7..fbc75500f6c51f445a41b6b24698a2829175eba1 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 9a78cbb8f8b13b505a7a5253c7af3c3103eb2595..a289f425dbcd41469e0c3bc403a00e5fcf64ef38 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 4685aa38aef50e15e2f27a7db012c4cc0031cf2b..60db76193bd7f44708e8c4ab3b4eeb34d3082c6b 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 e86c292babbd3b9ca3428c20bd857b17871ce8f7..d7b807f648d5c173742d142399e86826c5e3136b 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 4f4a9bebcea7e6e7504813892e0e7cac36fd843f..b252f580ac1b1ec035d844f826c0144ab21ada6e 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 8bcb49fb9802b941dd545366cfaeeb6c9ede041e..2c0793cb3c06ba35b1c8be8d9363a01bd3cc472f 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 aa5a523cda12950406f6bbe36aad67d5dad020f0..31e70e0ed52a20104ac59c6b3e3ba9fca33c1520 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 27b3bb4050018e71817004fcb3848d66d91b4d46..f8f08ec85f72210b1dfcc3d90e86fa4be2f0c056 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 a237a422655089ebfca4154c0f2864ee05b817ea..e9c8829554e2af7dc4e224a805f5e405cebd2fb7 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 6495904af02cb805936aa5b05c3cb8d248ba508b..ece15146da6d49d86d5dc18ef0f71d79b14a8138 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 b300ad78f3b83faea19db917770f659423442238..8d963c9ed69c31921f6e2306c056a1408c5a19c6 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 3fe305f2029eca58da5f8ee77d8a2a37f0f760b4..08e788d6582dfeb0df42e90d93ccd3f4d630c706 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 7ea5e1f9b8e314e4b3a7ffbd218cbce5bbb77932..c801af3906cb7fc8a9e75a5e875d2eac5917600a 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 563580da62bd9a05b3f44e132fbc3af3678e9b46..6dbbf85b476a82e1ecf7c090e2e2bb784ba8c926 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 d010be41601b636e4d2ba370df1b30e382c31afd..0c4c0c9a6f696ee5ba26e369c2bffc2dc9597d52 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 cf119b7dd51ea63dd3d91a921beeb39aa6563bab..206f53cc9a2ef461746a85f3faa4db1641c5e777 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 5f0b562f452e01816d7bd976a4e9953c995245fa..bf8f84b894af5c268a27a6ef70e80ef54dda9775 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 30e4e9bdfcd03a006d29b1a8bf4a80c9d213260a..7393e98b7071dc94262b172d09824df893b25d92 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 8126a3dbf519141d65ed59ec1bf1658b464e6154..e38a418fc9f58bf328b1852f446e6dbc2b865618 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 9957d9a5e199c5eb9e072088af6f2c23e59aec01..3508561a48ecc7cc1d7aaa39e021e6695855f0f4 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 f59d6d569e510ee23a52fafd03ebbb7713e1a0f2..e3e3f9ba1e035d0ed81cabf9cffd63446762701d 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 c4271bbdf8ca19b4917fc2357b1ba0ce502eec57..412227257e46c943cb50d0e84928ef1646ca6c33 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 8ea40b726113707a2cc6ac8168b703165fdea13e..bd275df1eaf7688d49fab5cff1a63e89743236df 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 2c3d0e04d5f5fa183c86b88fa3ca2bc257b29204..a3962047a8205597b69cce42d7fe27b7cbc32cda 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 8503ce9656dbc6252dd53fc63fa3edaf3e7ab35b..e1c84f1c7b1157fca357e78a8cc7b2bc31959cb2 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 478f72382fe58d928bdeea2fd70a4ce76357e8ed..c028c9c4d7de64679cd9b004f6a53c2231ec9e97 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 fe9ee6e55d0f787f2e252cf3eee300d168722d39..91dd97e724ae05f479593012c8c45d38d667f649 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 424e2838d2e4cfe70847df955a249c1e1484d47b..f4c4e70fc9501fe9e20fdbb381b528a2621777d4 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 1331f7f9405f68bbe2a6c695bfa518bb6845ab46..dd96415062c066bce1519cb81067849bcd288a02 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 9b5da70f451b5c99d31805de7515cdfd8ac9bf4a..7c799fe5ff3a3080ed9df5a615175f435d856b89 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 e754042b322d0cdec6f27eaadd6fb4bc2de2d6e2..249143ae593b23665a60774786104f5b80b8870c 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 3e956bba8e4407b482e4fc892b58576b2d66487f..b60c3bdc7b903f99ba4253b583a59f90e19d9edb 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 4ad9d00013d9d4083afd63cb3a98e6832aca2607..f6b30299d61e6b5d2519bcd327de2e6b97f18573 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 0fe9911b4c3f4c6353a71d279a1e38fa2587be19..54b8dffcea864f5819d4b3ad771b1d47016213b0 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 41b9dfb96aec05c8421425db6f80443a16c99a43..0257495a6575b624aa2a8162d7ceb31b333d867f 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 215d348f801cd11f7b76729a0b97729c42d90d50..9a90e909cae282fc6da6bcf2cbc2b38cb8df61fc 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 483decd3e051dac63457cb41a3cfcde11b5cdbed..ab0320ec96a1b86bb92c44f74f926ebbf88310a4 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 228eb5d140445df28724f4cd37a98ad27b75b194..7e3428f821feb8ed0a4295aacf962c57d0ec414e 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 6ff2451bdc6246e86d19809de4ed7ff8095bc1f3..5a1429b3f95b700bf8941c8c9d1a006bb43a1502 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 6ba4addcfc595c89d30fb548795bc137dcb5bf84..54629adc1a0599282ff7c011dcb172cac7608970 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 9d4bb88990353b9c9d36423a74e6eac6ee93b604..0f63a14d9a17ce2375abefbc9d9804f6796314d8 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 c400fa74d05c330f712f06f2b5566fbae0982184..8cf7c15e34499ac78c71dd5a81542efb62d7a713 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 e25bbb4caaf8314bbcacc26800b1c1a64cf64a5a..5b5cd34e9c63ce00196c5832ee00764dfde70663 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 4c672c0a92478896149c09f6c30d230cfa9582ed..7c1647cf12aab18cf1f3a55c57d294fcd2a82aba 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 b34ce52c9ebfcaf547010897ba3b631a3d70cd24..61b63eb3158254be5242ae9bf7666a8b4b06251e 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 53215ed8a304f052356d6660fb864b3c085b18ab..c78fd953d30688876a59665d8e9fe67adbd9b4c5 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 f90865eeca426aa153ccdfe6a7a3d0ce918cef6c..73ffe0cb7ee0b92c3c7be5c392f3bdbd90422899 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 ff409c0030a18cbfd8e859ee575ad5fcabb9cb89..e7d6a5fddd0d9b70b1d84ba8cca9bc73368d604f 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 07ced56a4994ae1c6882a8baa75181dbd72f2a69..efe75666a68c4033b58f8979f75894b3fb79b8e6 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 8e7fd64a1b466ea0758b37053d7a82d894a66f27..367682279e513d3c916fbfb69620e6c80cd3a110 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 3761bf951869a94328274618b02c54bf76da16da..ddb270acf1128b75271e02c2e974c1c90969ee6d 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 fddf73bb77759a722e987b9a63da52e096d2156c..c515b55f41a3b960aabf250859ff1ef572b4ef54 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 503af99073981732b5d3aacc655c6bf172bb814f..cb07cb9e742ed83990c57f0feb06975b9971252e 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 c29bc1e12ead62c92e68b484d773cf48a97a75cd..4a66dcb2311041c3bc2a2c368c234958fb3422b6 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 fdca1cccc5e39c2e2f8d438345cf7463bff269c8..5fb1d986697d9a0ef8c4ba0b6697b43f95222c15 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 1517cec6ce970332afbfb14025b5e85b0bcebdbe..57194feee42f3f42e8b992fb51563d38a965f199 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 d60a0f06012ceda1f3bc8ce2505a65846ddaab0a..81e33bab1e215c36fbb18a3c0a089174240587ec 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 ea1de5eb68b73291325c2958ef71fbd83d59a546..5918fa98fa946a6c8e559efcf1d7ce2613ca2c17 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 324fe7ab12737f27b5b0d4ccdd55bd3bd6ea0531..98a6e3ee23ca69bf1b8b07a55404768f27cec421 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 bc913a0fffb9c8e8583879d41776fe42c94c1c00..5ebe9ed5a16de40f0edc46fe81fe056da59301fa 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 e60a3b20e93ae7bbbfb88595049af65c8df41aad..f84d2b0652665573ae55cd54155cad3ee2d583b1 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 9a5631d5e37b7a01a60620d29539e4bfb418754a..b095bd30e90f9507fc2572dfd8334f3c3154e677 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 b5fd6fb22456f334bb664fcbef5441160f77e002..b6f36bec10c92bf038858023de7b185ad07ae6b1 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 bd5b8b81b98b6bb59f2d1af85a9f23aa88c9a59c..6530981121320a7ba188ca83c9a82f964436c4db 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 057fee0f22c56d8a10f53732b6009ce73da18e8e..c42af2885613ccf805bcef2677207ec31a280ab7 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 2d3d20fd1749667976990bbd6c59b6ba0ce77c25..b5fac18a1d9e32061234918ef3ff51cb39e0f918 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 ddd11948f7aef7a0c5ffd6f2f9a3daf8ef28a320..e39633a29e0cb1d324a5e6ebf107e1ef53a5ecc9 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 f1fcf0e19b692af99e37c46bd28f6b61a7e7af46..bb0aec552eb1af8e96221d2ea6323ff93e875686 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 6ed441f1d6be2b3d0aba54a69f40a89c36fef9eb..38c75a37271a8286af8e8d67a3eb21f8cc5e465d 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 e00c1d3ccc10e4f0445cc3831287e52033daab8a..12bec49489df188943f819ddfe8c50f2f6afe691 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 e7da3671d9ded3a7c643dd83001b1c1dced644ff..40cd17a8c772ac6b1b16b5863293fe8f1df7f5e4 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 01bc833b97743ad97ceffc651e84233380d726ef..935ecdc575bb7aeb00cee2e69fc1119e7983763c 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 24c766dc55ab8b79e4a657bb8d02820ad25ed1ac..6d8c66954112bb4869cef925971ed6f661566626 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 cb4868f0fd590dd36934c44bea6c114cac28c7d5..58ad32ee51fa80b0f1cd7fabf5897f86479d4814 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 84c778b188fe0869c1342d6b31b4508c9f8dde39..397ac455c5d72c3fbdf2f8964f6cce26f70f9d3f 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 bb09a5a76549b37b4f88d0ac57c43b7f2a196198..e80ec59d8c27bf62bfc46bbf77927e1e5df77233 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 744299e24b2c8a2c3737ee1432dca46951d97fe4..ad3b6244a362c168a20f08a90febc624acad24e5 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 48ed1c56fa3ceec8ee368d2513445324e8420b18..6ae14cdf1f65ff502e6b0c0c9451c3b800ec7871 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 609a0a3d677f9b6e8b9cc4bca6e9a71b2c8011ad..052436944e8c8c4079703b4e6dca8ebf64547954 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 6e0b1ae3ea427bea1664f78b290bd734fc5fab59..5a675c18e78bb801780f851d2b9ccf10a1685c19 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 a07a01ecaae01a7811095cbd3aa2b91c39f15859..f7e64f4171c1db61cac89aad81bb7bd19757db2d 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 64b53169c74caaf99b9236961f41da57bbda62d7..1fa98fe836e0a68e0db35f69b119812c555aa512 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 113bbb9328632571e0ff04fd6d05b214185b6931..b0e83ff2ecad76ac80cd090e2d3e9bebdd7f46cb 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 85e3a5902762a06c6d97162dd16872ca30b159d5..1318bd73501f1732efcf165c61a9e71e69551ebf 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 fd5ba62a9b8bb53260e340183de5a601bf970d6b..6c26c3f95e676cbf9cd03838042eba91504516e2 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 66721026ad4a693fa1030ef204c16fe19859829f..9ed6124d22bfea5de11203641b7df7c097260d4f 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 32cfd2d7d665ea6edb29a79459bc3629a7b68d93..0eb6ce3e78c5981d640494d9f12f487aa37716fb 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 dc568725b679a1901beecba280d93d9e64951f0b..82023c9dc0213f726a7ca54a79c83f9cf79cecb5 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 ed565c62820e594550aac85cacba269880e70f67..3f50264fea0ef0fd86cb5313881ec47fd7cd0c63 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 e070939b5a16dddd96ee85f18b9abfb9b9707455..ca276275244911b5900a702180559e2227a2c16f 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 a9653d7dd282ffbd907e8a53c77f3aa64cde7080..090882d1512d621db5e246c648aa09c33a702f0c 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 e75f22ea9bd50c63c94df5570aa5a57e31feafe3..112ec461d16af08c52ad5064c33803f0ea7d6282 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 9df5ab503ee871e0c40ba6fb4ab5636118cb85d4..c6867ec66a9a3ed01b10664a31a02274a8854b60 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 423dd1c9ecb3fc8de5ae65428d0a49e697926a70..299f020344c0bdbb8a2681908dc230519969f0c0 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 81e52a114093c7ed28bc2815cce10e3a5a9f31b4..afd8274626d76a3353c9e92fbbe6a97be9626929 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 d0463831b88d16439eebbbb56b6c00c57ed64a8c..d8f61d26c4d78572cae0b8c7b558abb3c058be50 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 b766dc825bd8745e5bc2478fd8d00fd8b571f477..53e78495cde8043ec7e354a59dc9c72a838b670b 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 34fa1bd74979f85400af44e5b334dfbddecc3a8a..3ecb8398dfc8aa116101f5536ab9918827b26d11 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 5e8d031862eebd0fd605454f2fdb240edc126c3b..bd997ea17836adb9cd8ec3eec07f995fb2352800 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 9a36481ed9717fa6a54b59e6037bd4522af56bbf..ed65aa14f52539380c004f0b4317d001ba58b073 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 8f671adf9c2af46e8e3c909005e1a09410cb9eea..9fb58dec54a4893f95282f15a3c24e58e1e6f974 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 a4eaf6fab61467d00cf787fbd2706237e9ab1a4e..01c4c6811bf636633e967bdf691b7b3bf0c3da4e 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 e38238a8854539bc67c7b53ed358e99652f14951..7f1506fbd24bcb5c2cdf53da84964587d8b95141 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/05-SimplifiedExperiment-SFM-PsychDisabled.scenario @@ -1,8 +1,8 @@ { "name" : "05-SimplifiedExperiment-SFM-PsychDisabled", "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" : 8.5, "y" : 0.75, @@ -142,16 +141,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" : false, "shape" : { "x" : 4.278606965174129, "y" : 0.5, @@ -159,13 +159,17 @@ "height" : 2.0, "type" : "RECTANGLE" }, - "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 } ], "targetChangers" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario index ec650e7be35d5ac931ffc8a4d0064900d6fca3fd..302b8e77a474a43921b032718c2429957c06298a 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/06-OriginalExperiment-OSMEventDriven-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "06-OriginalExperiment-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -191,7 +191,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 1.0, "y" : 22.4, @@ -199,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/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario index 4119fa5e4a15a713ed523601f341abd0bbd4681b..74f4c70130c8fc027dc3c97936d332e5d4a30d01 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/07-CounterFlow-OSMSequential-PsychDisabled.scenario @@ -1,8 +1,8 @@ { "name" : "07-CounterFlow-OSMSequential-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" : 18.5, "y" : 0.5, @@ -154,16 +153,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, @@ -171,13 +171,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/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario index 63c494c0e2b4fd80332da915af6ad271fd5e8362..a6256010e3d272fc664426a4137c756a793134dc 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/08-CounterFlow-OSMSequential-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "08-CounterFlow-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" : 18.5, "y" : 0.5, @@ -154,16 +153,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, @@ -171,13 +171,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/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario index 74ae39cf31db2adb4d5e21c2e9a799823a1e00b0..f4cfd47f1f0d5ff0f14be76a5275a7f8c2d711a7 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted.scenario @@ -1,8 +1,8 @@ { "name" : "09-CounterFlow-OSMSequential-PsychEnabled-SearchRadiusAdapted", "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" : 18.5, "y" : 0.5, @@ -154,16 +153,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, @@ -171,13 +171,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/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario index 087cb8024a7830d7f561545bb7d71853217f1781..cb7969124bcd2aab197ce6793d9a07da742977e1 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/10-UnidirectionalFlow-OSMSequential-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "10-UnidirectionalFlow-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" : 18.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/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario index 31ec07d7740014f93438ff8fc36dad2883feb1bb..c02e96935ccca066ba022cc8eb9125b1e7376190 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/11-CounterFlowChicken-OSMEventDriven-PsychDisabled.scenario @@ -1,8 +1,8 @@ { "name" : "11-CounterFlowChicken-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -182,7 +182,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 10.0, "y" : 51.0, @@ -190,16 +189,17 @@ "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 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 14.7, "y" : 34.5, @@ -207,13 +207,15 @@ "height" : 2.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/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario index e8b8d242477a31952ebdc3a1fd8a09ed6e75137a..b712376bfaad0f1982d673eb4ca1171b497888ae 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/12-CounterFlowChicken-OSMEventDriven-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "12-CounterFlowChicken-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -182,7 +182,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 10.0, "y" : 51.0, @@ -190,16 +189,17 @@ "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 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 14.7, "y" : 34.5, @@ -207,13 +207,15 @@ "height" : 2.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/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario index e875a72cf725e083c6023e840675b51b0bf71126..5eb59da159df1039617ff65b4d9cd6923ffd5b02 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled.scenario @@ -1,8 +1,8 @@ { "name" : "13-RiMEA11-ExitSelection-OSMEventDriven-PsychDisabled", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -212,7 +212,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 6.4, "y" : 2.4000000000000004, @@ -220,13 +219,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/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario index fe608f977f1e3375ff9c06f836e387eb477c4283..c09158ae1886646b239234c72a6b537f60be894f 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled.scenario @@ -1,8 +1,8 @@ { "name" : "14-RiMEA11-ExitSelection-OSMEventDriven-PsychEnabled", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -212,7 +212,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 6.4, "y" : 2.4000000000000004, @@ -220,13 +219,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/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario index 8b0b3e6253cbc0172ab135d4323774856bda0c99..0416dcaac4a4481c20ac163e63252fa8413ec509 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/15-ThreatShort-SelfCatThreatModel.scenario @@ -1,8 +1,8 @@ { "name" : "15-ThreatShort-SelfCatThreatModel", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -149,7 +149,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 36.0, "y" : 10.5, @@ -157,16 +156,17 @@ "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 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 36.0, "y" : 1.0, @@ -174,16 +174,17 @@ "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 }, { "id" : 0, - "absorbing" : true, "shape" : { "radius" : 1.0, "center" : { @@ -192,16 +193,17 @@ }, "type" : "CIRCLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : 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.6, "y" : 1.0, @@ -209,13 +211,15 @@ "height" : 14.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/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario index 67ff78fc739d9409d164a79c45f9935a83cd5495..e56869266d49ba53367a4c4f8cdc426d5bd6eb20 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/16-ThreatLong-SelfCatThreatModel.scenario @@ -1,8 +1,8 @@ { "name" : "16-ThreatLong-SelfCatThreatModel", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -149,7 +149,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 36.0, "y" : 10.5, @@ -157,16 +156,17 @@ "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 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 36.0, "y" : 1.0, @@ -174,16 +174,17 @@ "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 }, { "id" : 0, - "absorbing" : true, "shape" : { "radius" : 1.0, "center" : { @@ -192,16 +193,17 @@ }, "type" : "CIRCLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : 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.6, "y" : 1.0, @@ -209,13 +211,15 @@ "height" : 14.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/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario index c9100ada12c4b9a2b6b13e74277f2ac3aefb20e5..4472235635f4984a1334e82a1b5a98e588dffec2 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/17-Threat-ImitatingBehavior-SelfCatThreatModel.scenario @@ -1,8 +1,8 @@ { "name" : "17-Threat-ImitatingBehavior-SelfCatThreatModel", "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" : 36.0, "y" : 10.5, @@ -187,16 +186,17 @@ "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 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 36.0, "y" : 1.0, @@ -204,16 +204,17 @@ "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 }, { "id" : 0, - "absorbing" : true, "shape" : { "radius" : 1.0, "center" : { @@ -222,16 +223,17 @@ }, "type" : "CIRCLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : 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.6, "y" : 1.0, @@ -239,13 +241,15 @@ "height" : 14.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/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario index a733da6133b6ca86ae3ec7d8c77e007562626fd0..640899df988780b61d7c474fa9e712e3bb5f6b12 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/18-ScriptAgents-ChangeTargetScriptedCognitionModel.scenario @@ -1,8 +1,8 @@ { "name" : "18-ScriptAgents-ChangeTargetScriptedCognitionModel", "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" : 4, - "absorbing" : true, "shape" : { "x" : 8.0, "y" : 18.0, @@ -154,16 +153,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" : true, "shape" : { "x" : 0.9, "y" : 1.0, @@ -171,16 +171,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" : 3.0, "y" : 1.0, @@ -188,16 +189,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" : 3, - "absorbing" : true, "shape" : { "x" : 5.0, "y" : 1.0, @@ -205,13 +207,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/TestPsychology/CognitionAndBehavior/scenarios/19-DistanceRecommendation-SocialDistancing-OSMEventSDriven.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-DistanceRecommendation-SocialDistancing-OSMEventSDriven.scenario index ad62728746aba87d4326c25978bd356c3725d541..aff0f71cbb4b4510a7cf63aabd874650667df901 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-DistanceRecommendation-SocialDistancing-OSMEventSDriven.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/19-DistanceRecommendation-SocialDistancing-OSMEventSDriven.scenario @@ -1,8 +1,8 @@ { "name" : "19-DistanceRecommendation-SocialDistancing-OSMEventSDriven", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -166,7 +166,6 @@ "stairs" : [ ], "targets" : [ { "id" : 11, - "absorbing" : true, "shape" : { "x" : 17.0, "y" : 0.5, @@ -174,13 +173,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/TestPsychology/CognitionAndBehavior/scenarios/20-DistanceRecommendation-SocialDistancing_clogging.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/20-DistanceRecommendation-SocialDistancing_clogging.scenario index 531a524191261e858f379c1aa64796e101977ae7..19736b08e0c00d7d4eca5db27a04386343aa26cb 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/20-DistanceRecommendation-SocialDistancing_clogging.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/20-DistanceRecommendation-SocialDistancing_clogging.scenario @@ -1,8 +1,8 @@ { "name" : "20-DistanceRecommendation-SocialDistancing_clogging", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -166,7 +166,6 @@ "stairs" : [ ], "targets" : [ { "id" : 11, - "absorbing" : true, "shape" : { "x" : 16.5, "y" : 0.476386036960986, @@ -174,13 +173,15 @@ "height" : 5.023613963039014, "type" : "RECTANGLE" }, - "waitingTime" : 0.0, - "waitingTimeYellowPhase" : 0.0, - "parallelWaiters" : 0, - "individualWaiting" : true, + "absorbing" : 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/21-Ped-SocialDistancing_1.5m.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-SocialDistancing_1.5m.scenario index 1a1703e9b34051b5a7842459df16c435a2996e28..50bf8605988f19170472b1729213e688ecf406c7 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-SocialDistancing_1.5m.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-SocialDistancing_1.5m.scenario @@ -1,8 +1,8 @@ { "name" : "21-Ped-SocialDistancing_1.5m", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -180,7 +180,6 @@ "stairs" : [ ], "targets" : [ { "id" : 11, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -188,13 +187,15 @@ "height" : 19.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/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-normal_behavior.scenario b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-normal_behavior.scenario index b6a2808d7fc118d88843ad2879b4d5e2a9c4386e..475d0936f7ab3a11852fa8d51d52f9eb21c30c84 100644 --- a/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-normal_behavior.scenario +++ b/Scenarios/ModelTests/TestPsychology/CognitionAndBehavior/scenarios/21-Ped-normal_behavior.scenario @@ -1,8 +1,8 @@ { "name" : "21-Ped-normal_behavior", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -180,7 +180,6 @@ "stairs" : [ ], "targets" : [ { "id" : 11, - "absorbing" : true, "shape" : { "x" : 0.5, "y" : 0.5, @@ -188,13 +187,15 @@ "height" : 19.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/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario index b367bdc4dd6abd46cca26bdc7e6b656065047624..10b57a2d3b1e6a637b06b377ed5c224a7cf4e230 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/01-Wait-OSMSequential.scenario @@ -1,8 +1,8 @@ { "name" : "01-Wait-OSMSequential", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -128,7 +128,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true, "shape" : { "x" : 36.0, "y" : 10.5, @@ -136,16 +135,17 @@ "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 }, { "id" : 2, - "absorbing" : true, "shape" : { "x" : 36.0, "y" : 1.0, @@ -153,13 +153,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" : [ ], "absorbingAreas" : [ ], diff --git a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario index 5238a264f09ff5491b4646e0e60cda8df5c751b6..b2637f52fb305a77f014718823be66d432617acc 100644 --- a/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario +++ b/Scenarios/ModelTests/TestPsychology/Perception/scenarios/02-Wait-OSMEventDriven.scenario @@ -1,8 +1,8 @@ { "name" : "02-Wait-OSMEventDriven", "description" : "", - "release" : "2.2", - "commithash" : "bef9b7bef5c5755b23c296217e1454e4af9b7d15", + "release" : "2.3", + "commithash" : "ff5b381ea8f959e7e0d65a1b13bcdde1e13782cf", "processWriters" : { "files" : [ { "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile", @@ -128,7 +128,6 @@ "stairs" : [ ], "targets" : [ { "id" : 1, - "absorbing" : true,