Commit 6f8badd0 authored by hm-schuhba1's avatar hm-schuhba1

New scenario.json Version (0.5), test utils, simulation result

New Features:

* Graphical simulation result is displayed in a table view to show
  run-time and overlap information if the corresponding processors
  are loaded. The Simulation result dialog can be deactivated in
  the preferences.
* PedestrianOverlapProcessor returns two values "distance", "overlaps"
  for each overlap detected. If no overlap occurs the output is empty.
  "distance": The distance between the center of the two pedestrians
  "overlaps": The amount the two pedestrian overlap

Changes:

* New version for scenario.json (0.5):
  - remove scenario/attributesSimulation/needsBoundary as it is not
  used anymore.
  - remove attributes from processor PedestrianOverlapProcessor because
  the radius of a pedestrian can be retrieved from the topography at
  run-time. This would allow to detect overlaps of different sized
  pedestrian in the future.
* Helper interfaces for testing:
  - The TestResourceHandler interface groups all methods
  needed to retrieve backup and reset test resources between single test
  runs. All methods, except getTestDir() have default implementation
  which rely rely on relative paths on getTestDir().
  - The JsonNodeTest interface groups all methods needed to travers or
  search the Jackson JsonNode data structures. In contains methos for
  path finding and will fail the test if a path does not exist.
* Added Test for PedestrianOverlapProcessor to check if a overlap
  of (2*r - 0.001) will always be treated as an overlap. Additional
  test are  created to ensure (2*r + 0.001) with r:= pedestrian radius,
  will never create an overlap. Only between
  [2*r - 0.001 , 2*r + 0.001] different placements of pedestrian can
  produce overlaps. Example: --,  /(45 degree) , |  represent the
  distance (2*r)

  	Case A:		Case B: 	Case: C
	   O--O		  O 		  O
	   			  |			   \
	   			  O             O

  In the Case A and B no overlap is detected. In Case C an overlap
  is detected, because of rounding errors when calculating the
  distance \.
  This does not occure if the overlap is bigger than 0.001. Then in all
  three case a overlap is detected. If the distance between two
  pedestrian is 0.001 bigger than 2*r in none of the above cases an
  overlap is detected.
parent 739aba4a
Pipeline #66400 failed with stages
in 39 minutes and 16 seconds
{
"name" : "Neues_Szenario",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
......@@ -138,11 +138,7 @@
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 14,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianOverlapProcessor",
"attributes" : {
"pedRadius" : 0.21
}
"id" : 14
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 15,
......@@ -247,7 +243,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_5_1_roadReachTarget_ovm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -52,7 +52,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_5_2_roadReachTarget_ovm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -52,7 +52,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "testtrafficlight",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -64,7 +64,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_1_chicken_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_1_chicken_gnm2",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_2_density_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_3_1_wall_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_3_2_wall_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_3_3_wall_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_4_1_wall_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_4_2_wall_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_01_pathway_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_04_flow_gnm1_025_h",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_04_flow_gnm1_050_h",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_04_flow_gnm1_075_h",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_04_flow_gnm1_100_h",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_04_flow_gnm1_125_h",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_05_react_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_06_corner_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_07_speeds_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_09_publicRoom_gnm1_2",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_09_publicRoom_gnm1_4",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_10_pathfinding_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_11_exitSelection_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_12_evacuation_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_13_stairs_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "rimea_14_selectRoute_gnm1",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ ],
......@@ -55,7 +55,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_2_density_discrete_ca",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -15,6 +15,10 @@
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "out1.txt",
"processors" : [ 4 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityCountingProcessor",
......@@ -29,11 +33,7 @@
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianOverlapProcessor",
"attributes" : {
"pedRadius" : 0.2
}
"id" : 3
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
"id" : 4,
......@@ -101,7 +101,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_2_density_neder_mead",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -79,7 +79,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "basic_2_density_pso",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -79,7 +79,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "chicken_floorfield_ok",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -38,11 +38,7 @@
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianOverlapProcessor",
"attributes" : {
"pedRadius" : 0.2
}
"id" : 3
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
"id" : 4,
......@@ -110,7 +106,6 @@
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "corner_waiting_time_processor_test",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -55,11 +55,7 @@
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 6,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianOverlapProcessor",
"attributes" : {
"pedRadius" : 0.2
}
"id" : 6
} ],
"isTimestamped" : true
},
......@@ -120,7 +116,6 @@
"writeSimulationData" : false,
"visualizationEnabled" : true,
"printFPS" : false,
"needsBoundary" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
......
{
"name" : "narrow_passage_discrete_CA_fail",
"description" : "",
"release" : "0.4",
"release" : "0.5",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -31,17 +31,30 @@
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 4,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianOverlapProcessor",
"attributes" : {
"pedRadius" : 0.2
}
"id" : 4
} ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,