Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
V
vadere
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
110
Issues
110
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
3
Merge Requests
3
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vadere
vadere
Commits
fd7953ae
Commit
fd7953ae
authored
Jun 14, 2019
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'issue#242' into 'master'
fix issue
#242
. Closes
#242
See merge request
!66
parents
a303cac0
ea3b983c
Pipeline
#122557
passed with stages
in 114 minutes and 28 seconds
Changes
102
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
102 changed files
with
9349 additions
and
68861 deletions
+9349
-68861
Tools/Notebooks/TrajectoryMetric.ipynb
Tools/Notebooks/TrajectoryMetric.ipynb
+885
-251
Tools/Notebooks/data/TrajectoryMetric/KO/ko-240-120-240/ko-240-120-240_combined_MB.txt
...ryMetric/KO/ko-240-120-240/ko-240-120-240_combined_MB.txt
+0
-67992
Tools/Notebooks/data/TrajectoryMetric/trajectories_simulation.txt
...tebooks/data/TrajectoryMetric/trajectories_simulation.txt
+0
-306
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
...n/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
.../TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
...stOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
.../TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
...ation/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
...ion/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario
+536
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario
+531
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario
+536
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario
+531
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario
+536
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario
+531
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario
+536
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario
+531
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario
+518
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario
+513
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario
+518
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario
+513
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario
...ation/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario
+1
-1
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario
+518
-0
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario
...n/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario
+513
-0
VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario
...enarios/floor_field_navigation_test_displaced_ok.scenario
+2
-2
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
...odelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario
...TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
...odelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
...odelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario
...delTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario
...ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario
...odelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario
...odelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario
...sts/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario
...sts/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario
...ests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario
...ts/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario
+5
-4
VadereModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario
...Tests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario
...odelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario
+3
-2
VadereModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario
...ests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario
+3
-2
VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario
...SMGroup/scenarios/VadereSimulation-GroupBehavior.scenario
+10
-3
VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario
...enarios/VadereSimulation-GroupBehavior_no_groups.scenario
+14
-6
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario
...s/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario
+9
-4
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario
...MGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario
+8
-3
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario
.../TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario
+8
-3
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario
...roup/scenarios/group_OSM_1Source2Places_noGroups.scenario
+8
-3
VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario
.../TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario
+8
-3
VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario
...arios/group_OSM_2Sources1Place_2Group_and_3Group.scenario
+8
-3
VadereModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario
...cenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario
+11
-4
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario
...s/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario
+15
-7
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario
...s/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario
+15
-7
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario
+190
-33
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario
+191
-34
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario
+191
-34
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario
...SMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario
+191
-34
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario
...MGroup/scenarios/group_OSM_CGM_labratory_15group.scenario
+11
-4
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario
...SMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario
+11
-4
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario
...MGroup/scenarios/group_OSM_CGM_labratory_25group.scenario
+11
-4
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario
...SMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario
+11
-4
VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario
...SMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario
+11
-4
VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario
...estOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario
+11
-4
VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario
...estOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario
+11
-4
VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario
...estOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario
+11
-4
VadereModelTests/TestOSMGroup/vadere.project
VadereModelTests/TestOSMGroup/vadere.project
+1
-1
VadereSimulator/src/org/vadere/simulator/models/osm/OSMBehaviorController.java
...rg/vadere/simulator/models/osm/OSMBehaviorController.java
+8
-6
VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java
...or/src/org/vadere/simulator/models/osm/PedestrianOSM.java
+3
-0
VadereSimulator/src/org/vadere/simulator/models/osm/optimization/StepCircleOptimizerDiscrete.java
.../models/osm/optimization/StepCircleOptimizerDiscrete.java
+2
-1
VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeEventDriven.java
...ator/models/osm/updateScheme/UpdateSchemeEventDriven.java
+9
-6
VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeEventDrivenParallel.java
...els/osm/updateScheme/UpdateSchemeEventDrivenParallel.java
+1
-1
VadereSimulator/src/org/vadere/simulator/models/potential/timeCostFunction/TimeCostFunctionObstacleDistance.java
...al/timeCostFunction/TimeCostFunctionObstacleDistance.java
+6
-1
No files found.
Tools/Notebooks/TrajectoryMetric.ipynb
100644 → 100755
View file @
fd7953ae
This diff is collapsed.
Click to expand it.
Tools/Notebooks/data/TrajectoryMetric/KO/ko-240-120-240/ko-240-120-240_combined_MB.txt
deleted
100755 → 0
View file @
a303cac0
This diff is collapsed.
Click to expand it.
Tools/Notebooks/data/TrajectoryMetric/trajectories_simulation.txt
deleted
100644 → 0
View file @
a303cac0
This diff is collapsed.
Click to expand it.
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
View file @
fd7953ae
{
"name" : "C-050-180-180",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
View file @
fd7953ae
{
"name" : "C-050-180-180_GNM",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
View file @
fd7953ae
{
"name" : "C-050-180-180_Q",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
View file @
fd7953ae
{
"name" : "C-060-180-180",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
View file @
fd7953ae
{
"name" : "C-060-180-180_Q",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
View file @
fd7953ae
{
"name" : "C-070-180-180",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
View file @
fd7953ae
{
"name" : "C-070-180-180_Q",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
View file @
fd7953ae
{
"name" : "C-100-180-180",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
View file @
fd7953ae
{
"name" : "C-100-180-180_Q",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
View file @
fd7953ae
{
"name" : "C-145-180-180",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
View file @
fd7953ae
{
"name" : "C-145-180-180_Q",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
View file @
fd7953ae
{
"name" : "C-180-180-070",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
View file @
fd7953ae
{
"name" : "C-180-180-070_Q",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
View file @
fd7953ae
{
"name" : "C-180-180-070_UNIT",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
View file @
fd7953ae
{
"name" : "C-180-180-070_default",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
View file @
fd7953ae
{
"name" : "C-180-180-070_ramp",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
View file @
fd7953ae
{
"name" : "C-180-180-095",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
View file @
fd7953ae
{
"name" : "C-180-180-095_Q",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
View file @
fd7953ae
{
"name" : "C-180-180-120",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
View file @
fd7953ae
{
"name" : "C-180-180-120_Q",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
View file @
fd7953ae
{
"name" : "C-180-180-180",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
View file @
fd7953ae
{
"name" : "C-180-180-180_Q",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
View file @
fd7953ae
{
"name" : "T-240-050-240",
"description" : "",
"release" : "
0.1
0",
"release" : "
1.
0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
...
...
VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario
0 → 100644
View file @
fd7953ae
{
"name" : "T-240-050-240_BHM",
"description" : "",
"release" : "1.0",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2, 5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
"processors" : [ 3 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "overlapCount.txt",
"processors" : [ 4 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
"filename" : "aTimeStep.fundamentalDiagram",
"processors" : [ 6 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "bPedestrian.fundamentalDiagram",
"processors" : [ ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
"filename" : "cTimeStep.fundamentalDiagram",
"processors" : [ 11 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
"filename" : "dTimeStep.fundamentalDiagram",
"processors" : [ ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
"filename" : "eTimeStep.fundamentalDiagram",
"processors" : [ ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
"filename" : "cTimeStep_left.fundamentalDiagram",
"processors" : [ 15 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
"filename" : "cTimeStep_right.fundamentalDiagram",
"processors" : [ 16 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
"filename" : "aTimeStep_left.fundamentalDiagram",
"processors" : [ 17 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepOutputFile",
"filename" : "aTimeStep_right.fundamentalDiagram",
"processors" : [ 20 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "trajectories-BHM-240-050-240.txt",
"processors" : [ 21 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor",
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
"id" : 4,
"attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"id" : 5
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
"id" : 6,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramAProcessor",
"attributes" : {
"pedestrianLineCrossProcessorId" : 8,
"pedestrianVelocityProcessorId" : 7,
"deltaTime" : 10.0
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianVelocityProcessor",
"id" : 7,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianVelocityProcessor",
"attributes" : {
"pedestrianPositionProcessorId" : 1,
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianLineCrossProcessor",
"id" : 8,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianLineCrossProcessor",
"attributes" : {
"p1" : {
"x" : 16.3,
"y" : 8.0
},
"p2" : {
"x" : 18.7,
"y" : 8.0
}
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor",
"id" : 10,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianLineCrossProcessor",
"attributes" : {
"p1" : {
"x" : 0.0,
"y" : 0.0
},
"p2" : {
"x" : 1.0,
"y" : 0.0
}
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramCProcessor",
"id" : 11,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : {
"measurementAreaId" : 1,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianVelocityByTrajectoryProcessor",
"id" : 13,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianVelocityByTrajectoryProcessor",
"attributes" : {
"pedestrianTrajectoryProcessorId" : 10,
"backSteps" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramCProcessor",
"id" : 15,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : {
"measurementAreaId" : 2,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramCProcessor",
"id" : 16,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramCProcessor",
"attributes" : {
"measurementAreaId" : 3,
"pedestrianVelocityProcessorId" : 13
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
"id" : 17,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramAProcessor",
"attributes" : {
"pedestrianLineCrossProcessorId" : 18,
"pedestrianVelocityProcessorId" : 7,
"deltaTime" : 10.0
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianLineCrossProcessor",
"id" : 18,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianLineCrossProcessor",
"attributes" : {
"p1" : {
"x" : 16.0,
"y" : 4.2
},
"p2" : {
"x" : 16.0,
"y" : 18.0
}
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianLineCrossProcessor",
"id" : 19,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianLineCrossProcessor",
"attributes" : {
"p1" : {
"x" : 19.0,
"y" : 4.2
},
"p2" : {
"x" : 19.0,
"y" : 1.8
}
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FundamentalDiagramAProcessor",
"id" : 20,
"attributesType" : "org.vadere.state.attributes.processor.AttributesFundamentalDiagramAProcessor",
"attributes" : {
"pedestrianLineCrossProcessorId" : 19,
"pedestrianVelocityProcessorId" : 7,
"deltaTime" : 10.0
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTrajectoryProcessor",
"id" : 21
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.bhm.BehaviouralHeuristicsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesBHM" : {
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"stepLengthDeviation" : true,
"navigationCluster" : false,
"navigationFollower" : true,
"directionWallDistance" : false,
"tangentialEvasion" : true,
"sidewaysEvasion" : false,
"onlyEvadeContraFlow" : false,
"makeSmallSteps" : true,
"followerProximityNavigation" : true,
"differentBehaviour" : false,
"differentEvasionBehaviourPercentage" : [ ],
"varyingBehaviour" : false,
"adaptiveBehaviourDensity" : false,
"adaptiveBehaviourStepsRemained" : [ ],
"switchBehaviour" : false,
"evasionDetourThreshold" : 0.1,
"onlyEvadeContraFlowAngle" : 2.0943951023931953,
"followerAngleMovement" : 1.5707963267948966,
"followerAnglePosition" : 1.5707963267948966,
"followerDistance" : 10.0,
"smallStepResolution" : 5,
"plannedStepsAhead" : 5,
"obstacleRepulsionReach" : 1.0,
"obstacleRepulsionMaxWeight" : 0.5,
"distanceToKeep" : 0.5,
"backwardsAngle" : 1.5707963267948966,
"reconsiderOldTargets" : false,
"targetThresholdX" : 1.7976931348623157E308,
"targetThresholdY" : 1.7976931348623157E308,
"spaceToKeep" : 0.01,
"stepAwayFromCollisions" : false
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.3,
"type" : "DISTANCE_TO_OBSTACLES",
"obstacleDensityWeight" : 0.3,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 0.1,
"pedestrianDynamicWeight" : 1.0,
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.5
}
}
},
"attributesSimulation" : {
"finishTime" : 200.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : -2121147915669383012,
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
"bounds" : {
"x" : 0.0,
"y" : 0.0,
"width" : 35.0,
"height" : 12.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
},
"obstacles" : [ {
"shape" : {
"x" : 13.0,
"y" : 0.8,
"width" : 9.0,
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 13.0,
"y" : 4.2,
"width" : 3.3,
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 18.7,
"y" : 4.2,
"width" : 3.3,
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 15.3,
"y" : 5.2,
"width" : 1.0,
"height" : 6.4,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 18.7,
"y" : 5.2,
"width" : 1.0,
"height" : 6.4,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 8.0,
"y" : 0.5,
"width" : 1.0,
"height" : 2.25,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 8.0,
"y" : 3.25,
"width" : 1.0,
"height" : 2.25,
"type" : "RECTANGLE"
},
"id" : -1
}, {
"shape" : {
"x" : 26.0,
"y" : 3.25,
"width" : 1.0,
"height" : 2.25,
"type" : "RECTANGLE"