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
e2fb6208
Commit
e2fb6208
authored
Jan 10, 2019
by
Stefan Schuhbaeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rearrange key-Value pairs in scenario files due to release 0.7
parent
a929495e
Pipeline
#83179
failed with stages
in 108 minutes and 59 seconds
Changes
60
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
60 changed files
with
645 additions
and
553 deletions
+645
-553
VadereModelTests/TestEvents/scenarios/wait_event_2_sources_2_targets_osm_sequential.scenario
...os/wait_event_2_sources_2_targets_osm_sequential.scenario
+19
-19
VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_bhm.scenario
...arios/wait_in_area_event_2_sources_2_targets_bhm.scenario
+23
-23
VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_osm_sequential.scenario
...in_area_event_2_sources_2_targets_osm_sequential.scenario
+26
-26
VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario
...ts/TestOSM/scenarios/basic_2_density_discrete_ca.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario
...ModelTests/TestOSM/scenarios/basic_2_density_pso.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario
...estOSM/scenarios/chicken_floorfield_displaced_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
...delTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario
...OSM/scenarios/corner_waiting_time_processor_test.scenario
+21
-15
VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
...estOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
+44
-33
VadereModelTests/TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario
.../TestOSM/scenarios/narrow_passage_nelder_mead_ok.scenario
+44
-33
VadereModelTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
...delTests/TestOSM/scenarios/narrow_passage_pso_ok.scenario
+44
-33
VadereModelTests/TestOSM/scenarios/queueing_dynamic_floorfield_visual_check.scenario
...enarios/queueing_dynamic_floorfield_visual_check.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/regular_wall_discrete_ok.scenario
...Tests/TestOSM/scenarios/regular_wall_discrete_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
...ts/TestOSM/scenarios/regular_wall_nelder_mead_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario
...ModelTests/TestOSM/scenarios/regular_wall_pso_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_brute_force.scenario
.../scenarios/rimea_01_pathway_discrete_brute_force.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario
...s/TestOSM/scenarios/rimea_01_pathway_discrete_ca.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_025_d.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_025_up.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_050_d.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_050_up.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_075_d.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_075_up.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_100_d.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_100_up.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario
...Tests/TestOSM/scenarios/rimea_04_flow_osm1_125_d.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_125_up.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario
...ests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario
VadereModelTests/TestOSM/scenarios/rimea_05_react.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario
VadereModelTests/TestOSM/scenarios/rimea_06_corner.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario
...ts/TestOSM/scenarios/rimea_07_speeds_discrete_ca.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario
...ts/TestOSM/scenarios/rimea_07_speeds_nelder_mead.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario
...ModelTests/TestOSM/scenarios/rimea_07_speeds_pso.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_08_parameter_variation.scenario
...s/TestOSM/scenarios/rimea_08_parameter_variation.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_nelder_mead.scenario
...enarios/rimea_09_public_room_2_exits_nelder_mead.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario
...stOSM/scenarios/rimea_09_public_room_2_exits_pso.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_nelder_mead.scenario
...enarios/rimea_09_public_room_4_exits_nelder_mead.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario
...stOSM/scenarios/rimea_09_public_room_4_exits_pso.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario
...odelTests/TestOSM/scenarios/rimea_10_pathfinding.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_nelder_mead.scenario
...SM/scenarios/rimea_11_exit_selection_nelder_mead.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario
...ts/TestOSM/scenarios/rimea_11_exit_selection_pso.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario
...estOSM/scenarios/rimea_12_evacuation_nelder_mead.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario
...lTests/TestOSM/scenarios/rimea_12_evacuation_pso.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario
...stOSM/scenarios/rimea_13_stairs_long_nelder_mead.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario
...Tests/TestOSM/scenarios/rimea_13_stairs_long_pso.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario
...ts/TestOSM/scenarios/rimea_13_stairs_nelder_mead.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario
...ModelTests/TestOSM/scenarios/rimea_13_stairs_pso.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_14_select_route_nelder_mead.scenario
...tOSM/scenarios/rimea_14_select_route_nelder_mead.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/rimea_14_select_route_pso.scenario
...ests/TestOSM/scenarios/rimea_14_select_route_pso.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario
.../TestOSM/scenarios/see_small_wall_nelder_mead_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario
...lTests/TestOSM/scenarios/see_small_wall_pso_fail.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario
...elTests/TestOSM/scenarios/thick_wall_discrete_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario
...ests/TestOSM/scenarios/thick_wall_nelder_mead_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario
...reModelTests/TestOSM/scenarios/thick_wall_pso_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_discrete_could_fail.scenario
.../thin_wall_and_closer_source_discrete_could_fail.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_nelder_mead_ok.scenario
...arios/thin_wall_and_closer_source_nelder_mead_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/thin_wall_and_closer_source_pso_could_fail.scenario
...arios/thin_wall_and_closer_source_pso_could_fail.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario
...delTests/TestOSM/scenarios/thin_wall_discrete_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario
...Tests/TestOSM/scenarios/thin_wall_nelder_mead_ok.scenario
+8
-7
VadereModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario
VadereModelTests/TestOSM/scenarios/thin_wall_pso_ok.scenario
+8
-7
No files found.
VadereModelTests/TestEvents/scenarios/wait_event_2_sources_2_targets_osm_sequential.scenario
View file @
e2fb6208
...
...
@@ -2,7 +2,6 @@
"name" : "wait_event_2_sources_2_targets_osm_sequential",
"description" : "",
"release" : "0.7",
"commithash" : "45917996dc1d7ac7f31aff96d40e2886d36a5cd3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -80,6 +79,8 @@
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.4625,
"maxStepDuration" : 1.7976931348623157E308,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
...
...
@@ -89,9 +90,7 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ],
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -116,18 +115,6 @@
"fixedSeed" : 1,
"simulationSeed" : 1
},
"eventInfos" : [ {
"eventTimeframe" : {
"startTime" : 10.0,
"endTime" : 60.0,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "WaitEvent",
"targets" : [ ]
} ]
} ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -217,6 +204,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -226,8 +214,20 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
}
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
"startTime" : 10.0,
"endTime" : 60.0,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "WaitEvent",
"targets" : [ ]
} ]
} ]
}
}
\ No newline at end of file
VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_bhm.scenario
View file @
e2fb6208
...
...
@@ -2,7 +2,6 @@
"name" : "wait_in_area_event_2_sources_2_targets_bhm",
"description" : "",
"release" : "0.7",
"commithash" : "45917996dc1d7ac7f31aff96d40e2886d36a5cd3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -104,25 +103,6 @@
"fixedSeed" : 1,
"simulationSeed" : 1
},
"eventInfos" : [ {
"eventTimeframe" : {
"startTime" : 10.0,
"endTime" : 60.0,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "WaitInAreaEvent",
"targets" : [ ],
"area" : {
"x" : 15.0,
"y" : 0.0,
"width" : 6.0,
"height" : 8.0,
"type" : "RECTANGLE"
}
} ]
} ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -212,6 +192,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -221,8 +202,27 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
"startTime" : 10.0,
"endTime" : 60.0,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "WaitInAreaEvent",
"targets" : [ ],
"area" : {
"x" : 15.0,
"y" : 0.0,
"width" : 6.0,
"height" : 8.0,
"type" : "RECTANGLE"
}
} ]
} ]
}
}
\ No newline at end of file
VadereModelTests/TestEvents/scenarios/wait_in_area_event_2_sources_2_targets_osm_sequential.scenario
View file @
e2fb6208
...
...
@@ -2,7 +2,6 @@
"name" : "wait_in_area_event_2_sources_2_targets_osm_sequential",
"description" : "",
"release" : "0.7",
"commithash" : "45917996dc1d7ac7f31aff96d40e2886d36a5cd3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -80,6 +79,8 @@
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.4625,
"maxStepDuration" : 1.7976931348623157E308,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
...
...
@@ -89,9 +90,7 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ],
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -116,25 +115,6 @@
"fixedSeed" : 1,
"simulationSeed" : 1
},
"eventInfos" : [ {
"eventTimeframe" : {
"startTime" : 10.0,
"endTime" : 60.0,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "WaitInAreaEvent",
"targets" : [ ],
"area" : {
"x" : 15.0,
"y" : 0.0,
"width" : 6.0,
"height" : 8.0,
"type" : "RECTANGLE"
}
} ]
} ],
"topography" : {
"attributes" : {
"bounds" : {
...
...
@@ -224,6 +204,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -233,8 +214,27 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ {
"eventTimeframe" : {
"startTime" : 10.0,
"endTime" : 60.0,
"repeat" : false,
"waitTimeBetweenRepetition" : 0.0
},
"events" : [ {
"type" : "WaitInAreaEvent",
"targets" : [ ],
"area" : {
"x" : 15.0,
"y" : 0.0,
"width" : 6.0,
"height" : 8.0,
"type" : "RECTANGLE"
}
} ]
} ]
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/basic_2_density_discrete_ca.scenario
View file @
e2fb6208
...
...
@@ -2,7 +2,6 @@
"name" : "basic_2_density_discrete_ca",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -80,6 +79,8 @@
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.4625,
"maxStepDuration" : 1.7976931348623157E308,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
...
...
@@ -89,9 +90,7 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ],
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -204,6 +203,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -213,8 +213,9 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
}
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/basic_2_density_pso.scenario
View file @
e2fb6208
...
...
@@ -2,7 +2,6 @@
"name" : "basic_2_density_pso",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -68,6 +67,8 @@
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.4625,
"maxStepDuration" : 1.7976931348623157E308,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
...
...
@@ -77,9 +78,7 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ],
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -192,6 +191,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -201,8 +201,9 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
}
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/chicken_floorfield_displaced_ok.scenario
View file @
e2fb6208
...
...
@@ -2,7 +2,6 @@
"name" : "chicken_floorfield_displaced_ok",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -85,6 +84,8 @@
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.4625,
"maxStepDuration" : 1.7976931348623157E308,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
...
...
@@ -94,9 +95,7 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ],
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -200,6 +199,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -209,8 +209,9 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
}
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/chicken_floorfield_ok.scenario
View file @
e2fb6208
...
...
@@ -2,7 +2,6 @@
"name" : "chicken_floorfield_ok",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -95,6 +94,8 @@
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.4625,
"maxStepDuration" : 1.7976931348623157E308,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
...
...
@@ -104,9 +105,7 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ],
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -210,6 +209,7 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"dynamicElements" : [ ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
...
...
@@ -219,8 +219,9 @@
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null,
"dynamicElements" : [ ]
}
"teleporter" : null,
"attributesCar" : null
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/corner_waiting_time_processor_test.scenario
View file @
e2fb6208
...
...
@@ -2,7 +2,6 @@
"name" : "corner_waiting_time_processor_test",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...
...
@@ -95,6 +94,8 @@
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.4625,
"maxStepDuration" : 1.7976931348623157E308,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
...
...
@@ -104,9 +105,7 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ],
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -201,15 +200,6 @@
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"dynamicElements" : [ {
"source" : null,
"targetIds" : [ 1 ],
...
...
@@ -234,13 +224,29 @@
"acceleration" : 2.0
},
"idAsTarget" : -1,
"modelPedestrianMap" : { },
"isChild" : false,
"isLikelyInjured" : false,
"mostImportantEvent" : null,
"groupIds" : [ ],
"trajectory" : {
"footSteps" : [ ]
},
"groupSizes" : [ ],
"modelPedestrianMap" : { },
"type" : "PEDESTRIAN"
} ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : null
}
},
"eventInfos" : [ ]
}
}
\ No newline at end of file
VadereModelTests/TestOSM/scenarios/narrow_passage_discrete_CA_fail.scenario
View file @
e2fb6208
...
...
@@ -2,7 +2,6 @@
"name" : "narrow_passage_discrete_CA_fail",
"description" : "",
"release" : "0.7",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...
...
@@ -71,6 +70,8 @@
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.4625,
"maxStepDuration" : 1.7976931348623157E308,
"optimizationType" : "DISCRETE",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
...
...
@@ -80,9 +81,7 @@
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ],
"minStepLength" : "0.4625",
"maxStepDuration" : "1.7976931348623157E308"
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
...
...
@@ -327,31 +326,7 @@
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0
}
},
"sources" : [ ],
"dynamicElements" : [ {
"source" : null,
"targetIds" : [ 1 ],
...
...
@@ -376,10 +351,15 @@
"acceleration" : 2.0
},
"idAsTarget" : -1,
"modelPedestrianMap" : { },
"isChild" : false,
"isLikelyInjured" : false,
"mostImportantEvent" : null,
"groupIds" : [ ],
"trajectory" : {
"footSteps" : [ ]
},
"groupSizes" : [ ],
"modelPedestrianMap" : { },
"type" : "PEDESTRIAN"
}, {
"source" : null,
...
...
@@ -405,13 +385,44 @@
"acceleration" : 2.0
},
"idAsTarget" : -1,
"modelPedestrianMap" : { },
"isChild" : false,
"isLikelyInjured" : false,
"mostImportantEvent" : null,
"groupIds" : [ ],
"trajectory" : {
"footSteps" : [ ]
},
"groupSizes" : [ ],
"modelPedestrianMap" : { },
"type" : "PEDESTRIAN"
} ],
"sources" : [ ]
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0
},
"teleporter" : null,
"attributesCar" : {
"id" : -1,
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.0,
"minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,
"acceleration" : 2.0,
"length" : 4.5,
"width" : 1.7,
"direction" : {
"x" : 1.0,
"y" : 0.0