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
ea3b983c
Commit
ea3b983c
authored
Jun 13, 2019
by
Benedikt Zoennchen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change ode solver for one gmn scenario to euler to avoid long execution time.
parent
e9f93a7c
Pipeline
#122487
passed with stages
in 109 minutes and 37 seconds
Changes
51
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
51 changed files
with
1052 additions
and
275 deletions
+1052
-275
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
+7
-7
No files found.
VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario
View file @
ea3b983c
...
...
@@ -26,8 +26,8 @@
"navigationCluster" : false,
"navigationFollower" : false,
"directionWallDistance" : false,
"tangentialEvasion" :
fals
e,
"sidewaysEvasion" :
fals
e,
"tangentialEvasion" :
tru
e,
"sidewaysEvasion" :
tru
e,
"onlyEvadeContraFlow" : false,
"makeSmallSteps" : false,
"followerProximityNavigation" : false,
...
...
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "basic_1_chicken_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "basic_1_chicken_gnm1_displaced",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "basic_1_chicken_gnm2",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "basic_2_density_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "basic_3_1_wall_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "basic_3_2_wall_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "basic_3_3_wall_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "basic_4_1_wall_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "basic_4_2_wall_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_01_pathway_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_025_h",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_050_h",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_075_h",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_100_h",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_125_h",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_05_react_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_06_corner_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_07_speeds_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_09_publicRoom_gnm1_2",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_09_publicRoom_gnm1_4",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_10_pathfinding_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_11_exitSelection_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,13 +25,15 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
"attributesODEIntegrator" : {
"solverType" : "
DORMAND_PRINCE_45
",
"stepSizeMin" :
1.0E-4
,
"solverType" : "
EULER
",
"stepSizeMin" :
0.05
,
"stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4
...
...
VadereModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_12_evacuation_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_13_stairs_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "rimea_14_selectRoute_gnm1",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
"processors" : [ ],
...
...
@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesGNM" : {
...
...
VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "VadereSimulation-GroupBehavior",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -26,7 +25,8 @@
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 4
} ],
"isTimestamped" : true
"isTimestamped" : true,
"isWriteMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
...
...
@@ -45,7 +45,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
...
...
@@ -145,6 +147,7 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
@@ -230,6 +233,10 @@
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
...
...
VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "VadereSimulation-GroupBehavior_no_groups",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -26,7 +25,8 @@
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 4
} ],
"isTimestamped" : true
"isTimestamped" : true,
"isWriteMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
...
...
@@ -45,25 +45,27 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 4,
"numberOfCircles" : 1,
"optimizationType" : "NELDER_MEAD",
"varyStepDirection" : true,
"movementType" : "ARBITRARY",
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.17,
"minimumStepLength" : true,
"maxStepDuration" : 3.0,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : true,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : true,
"minimumStepLength" : true,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
...
...
@@ -141,6 +143,7 @@
},
"id" : -1
} ],
"measurementAreas" : [ ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
@@ -160,6 +163,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : 1,
"shape" : {
...
...
@@ -225,6 +229,10 @@
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
...
...
VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario
View file @
ea3b983c
...
...
@@ -2,7 +2,6 @@
"name" : "group_OSM_1Source1Place",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -49,7 +48,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",