Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
vadere
vadere
Commits
57fe7db3
Commit
57fe7db3
authored
Jul 12, 2019
by
Stefan Schuhbaeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
migrate to version 1.1: include default values for new members in json
parent
c2f7c07f
Pipeline
#132797
passed with stages
in 133 minutes and 12 seconds
Changes
220
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
75 changed files
with
251 additions
and
361 deletions
+251
-361
VadereGui/testResources/test-scenario.scenario
VadereGui/testResources/test-scenario.scenario
+41
-30
VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario
...enarios/floor_field_navigation_test_displaced_ok.scenario
+1
-1
VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario
...TestBHM/scenarios/floor_field_navigation_test_ok.scenario
+1
-1
VadereModelTests/TestEvents/BangEvent/scenarios/01_unsupported_event_exception_for_unsupported_models.scenario
...supported_event_exception_for_unsupported_models.scenario
+11
-20
VadereModelTests/TestEvents/BangEvent/scenarios/02_bang_event_one_agent.scenario
...ents/BangEvent/scenarios/02_bang_event_one_agent.scenario
+11
-20
VadereModelTests/TestEvents/BangEvent/scenarios/03_bang_event_multiple_agents.scenario
...angEvent/scenarios/03_bang_event_multiple_agents.scenario
+29
-23
VadereModelTests/TestEvents/BangEvent/scenarios/04_bang_event_one_agent_one_obstacle.scenario
...t/scenarios/04_bang_event_one_agent_one_obstacle.scenario
+11
-20
VadereModelTests/TestEvents/BangEvent/scenarios/05_bang_event_narrowed_street.scenario
...angEvent/scenarios/05_bang_event_narrowed_street.scenario
+5
-19
VadereModelTests/TestEvents/BangEvent/scenarios/06_bang_event_guimaraes_platz.scenario
...angEvent/scenarios/06_bang_event_guimaraes_platz.scenario
+5
-19
VadereModelTests/TestEvents/DifferentEvents/scenarios/01_wait_event_osm_sequential.scenario
...entEvents/scenarios/01_wait_event_osm_sequential.scenario
+4
-3
VadereModelTests/TestEvents/DifferentEvents/scenarios/02_wait_event_osm_event_driven.scenario
...tEvents/scenarios/02_wait_event_osm_event_driven.scenario
+4
-3
VadereModelTests/TestEvents/DifferentEvents/scenarios/03_wait_event_recurring_osm_sequential.scenario
...scenarios/03_wait_event_recurring_osm_sequential.scenario
+4
-3
VadereModelTests/TestEvents/DifferentEvents/scenarios/04_wait_in_area_event_osm_sequential.scenario
...s/scenarios/04_wait_in_area_event_osm_sequential.scenario
+4
-3
VadereModelTests/TestEvents/DifferentEvents/scenarios/05_wait_in_area_event_bhm.scenario
...ferentEvents/scenarios/05_wait_in_area_event_bhm.scenario
+1
-2
VadereModelTests/TestEvents/DifferentEvents/scenarios/06_bang_event_osm_sequential.scenario
...entEvents/scenarios/06_bang_event_osm_sequential.scenario
+4
-3
VadereModelTests/TestEvents/DifferentEvents/scenarios/07_bang_event_osm_event_driven.scenario
...tEvents/scenarios/07_bang_event_osm_event_driven.scenario
+4
-3
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
...odelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario
...TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
...odelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
...odelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario
...ModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario
...delTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario
...Tests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario
...ModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario
...odelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario
...odelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario
...sts/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario
...sts/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario
...ests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario
...ts/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario
...Tests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario
...odelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario
+1
-1
VadereModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario
...ests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario
+1
-1
VadereModelTests/TestNelderMead/scenarios/counterflow.scenario
...eModelTests/TestNelderMead/scenarios/counterflow.scenario
+2
-21
VadereModelTests/TestNelderMead/scenarios/labyrinth.scenario
VadereModelTests/TestNelderMead/scenarios/labyrinth.scenario
+1
-1
VadereModelTests/TestNelderMead/scenarios/rimea_11_exit_selection_nelder_mead.scenario
...ad/scenarios/rimea_11_exit_selection_nelder_mead.scenario
+1
-1
VadereModelTests/TestNelderMead/scenarios/s2ucre.scenario
VadereModelTests/TestNelderMead/scenarios/s2ucre.scenario
+2
-21
VadereModelTests/TestNonWorkingFeatures/scenarios/cooperative_behavior_agents_get_stuck.scenario
.../scenarios/cooperative_behavior_agents_get_stuck.scenario
+5
-19
VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario
...ts/TestOSM/scenarios/basic_2_density_discrete_ca.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario
...ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario
...estOSM/scenarios/chicken_floorfield_displaced_ok.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
...delTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario
...OSM/scenarios/corner_waiting_time_processor_test.scenario
+7
-2
VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
...estOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
+14
-19
VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario
.../TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario
+14
-19
VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
...delTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
+14
-19
VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario
...enarios/queueing_dynamic_floorfield_visual_check.scenario
+2
-17
VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario
...Tests/TestOSM/scenarios/regular_wall_discrete_ok.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
...ts/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario
...ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario
.../scenarios/rimea_01_pathway_discrete_brute_force.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario
...s/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_050_h.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_075_h.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_100_h.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_125_h.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario
+1
-1
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_470_h.scenario
+1
-1
No files found.
VadereGui/testResources/test-scenario.scenario
View file @
57fe7db3
{
"name" : "Neues_Szenario",
"description" : "",
"release" : "0.9",
"commithash" : "warning: no commit hash",
"release" : "1.1",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -32,7 +31,7 @@
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "out1.txt",
"processors" : [
"
14
"
]
"processors" : [ 14 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
...
...
@@ -67,8 +66,8 @@
"attributes" : {
"pedestrianPositionProcessorId" : 1,
"scale" : 10.0,
"
ob
sta
cleDensity" : true
,
"sta
ndardDeviation" : 0.7
"sta
ndardDeviation" : 0.7
,
"
ob
sta
cleDensity" : true
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.AreaDensityVoronoiProcessor",
...
...
@@ -83,9 +82,9 @@
"id" : 7,
"attributesType" : "org.vadere.state.attributes.processor.AttributesAreaSpeedProcessor",
"attributes" : {
"measurementAreaId" : 1,
"pedestrianPositionProcessorId" : 1,
"pedestrianVelocityProcessorId" : 2,
"measurementAreaId" : 1
"pedestrianVelocityProcessorId" : 2
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor",
...
...
@@ -159,7 +158,8 @@
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor",
"id" : 21
} ],
"isTimestamped" : true
"isTimestamped" : true,
"isWriteMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
...
...
@@ -178,29 +178,31 @@
"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" : 18,
"numberOfCircles" : 1,
"optimizationType" : "DISCRETE",
"varyStepDirection" : false,
"movementType" : "ARBITRARY",
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"minStepLength" : 0.4625,
"minimumStepLength" : false,
"maxStepDuration" : 1.7976931348623157E308,
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompact",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompact",
"submodels" : [ ],
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompact" : {
"pedPotentialWidth" : 0.5,
...
...
@@ -222,7 +224,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : null
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
...
...
@@ -245,6 +248,16 @@
},
"id" : -1
} ],
"measurementAreas" : [ {
"shape" : {
"x" : 5.0,
"y" : 2.0,
"width" : 1.0,
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
...
...
@@ -281,6 +294,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : 1,
"shape" : {
...
...
@@ -299,8 +313,10 @@
"spawnAtRandomPositions" : false,
"useFreeSpaceOnly" : false,
"targetIds" : [ 1, 2 ],
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -308,20 +324,15 @@
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"dynamicElements" : [ ],
"attributesCar" : null,
"measurementAreas" : [ {
"shape" : {
"x" : 5.0,
"y" : 2.0,
"width" : 1.0,
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : 1
} ]
}
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario
View file @
57fe7db3
{
"name" : "floor_field_navigation_test_displaced_ok",
"description" : "",
"release" : "1.
0
",
"release" : "1.
1
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario
View file @
57fe7db3
{
"name" : "floor_field_navigation_test_ok",
"description" : "",
"release" : "1.
0
",
"release" : "1.
1
",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
VadereModelTests/TestEvents/BangEvent/scenarios/01_unsupported_event_exception_for_unsupported_models.scenario
View file @
57fe7db3
{
"name" : "01_unsupported_event_exception_for_unsupported_models",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"release" : "1.1",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -85,7 +84,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -157,12 +158,17 @@
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"idAsTarget" : -1,
"isChild" : false,
"isLikelyInjured" : false,
"mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ],
"trajectory" : {
"footSteps" : [ ]
...
...
@@ -185,22 +191,7 @@
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.2,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
}
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
...
...
VadereModelTests/TestEvents/BangEvent/scenarios/02_bang_event_one_agent.scenario
View file @
57fe7db3
{
"name" : "02_bang_event_one_agent",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"release" : "1.1",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -85,7 +84,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -157,12 +158,17 @@
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"idAsTarget" : -1,
"isChild" : false,
"isLikelyInjured" : false,
"mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ],
"trajectory" : {
"footSteps" : [ ]
...
...
@@ -185,22 +191,7 @@
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.2,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
}
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
...
...
VadereModelTests/TestEvents/BangEvent/scenarios/03_bang_event_multiple_agents.scenario
View file @
57fe7db3
{
"name" : "03_bang_event_multiple_agents",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"release" : "1.1",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -85,7 +84,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -157,12 +158,17 @@
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"idAsTarget" : -1,
"isChild" : false,
"isLikelyInjured" : false,
"mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ],
"trajectory" : {
"footSteps" : [ ]
...
...
@@ -191,12 +197,17 @@
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"idAsTarget" : -1,
"isChild" : false,
"isLikelyInjured" : false,
"mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ],
"trajectory" : {
"footSteps" : [ ]
...
...
@@ -225,12 +236,17 @@
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"idAsTarget" : -1,
"isChild" : false,
"isLikelyInjured" : false,
"mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ],
"trajectory" : {
"footSteps" : [ ]
...
...
@@ -259,12 +275,17 @@
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"idAsTarget" : -1,
"isChild" : false,
"isLikelyInjured" : false,
"mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ],
"trajectory" : {
"footSteps" : [ ]
...
...
@@ -287,22 +308,7 @@
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.2,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
}
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
...
...
VadereModelTests/TestEvents/BangEvent/scenarios/04_bang_event_one_agent_one_obstacle.scenario
View file @
57fe7db3
{
"name" : "04_bang_event_one_agent_one_obstacle",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"release" : "1.1",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -85,7 +84,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -166,12 +167,17 @@
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"idAsTarget" : -1,
"isChild" : false,
"isLikelyInjured" : false,
"mostImportantEvent" : null,
"salientBehavior" : "TARGET_ORIENTED",
"groupIds" : [ ],
"trajectory" : {
"footSteps" : [ ]
...
...
@@ -194,22 +200,7 @@
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.2,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
}
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
...
...
VadereModelTests/TestEvents/BangEvent/scenarios/05_bang_event_narrowed_street.scenario
View file @
57fe7db3
{
"name" : "05_bang_event_narrowed_street",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"release" : "1.1",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -93,7 +92,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -911,22 +912,7 @@
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
}
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
...
...
VadereModelTests/TestEvents/BangEvent/scenarios/06_bang_event_guimaraes_platz.scenario
View file @
57fe7db3
{
"name" : "06_bang_event_guimaraes_platz",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"release" : "1.1",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -93,7 +92,9 @@
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
}
}
},
...
...
@@ -1182,22 +1183,7 @@
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
}
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
...
...
VadereModelTests/TestEvents/DifferentEvents/scenarios/01_wait_event_osm_sequential.scenario
View file @
57fe7db3
{
"name" : "01_wait_event_osm_sequential",
"description" : "",
"release" : "1.0",
"commithash" : "warning: no commit hash",
"release" : "1.1",
"processWriters" : {