Skip to content

V
vadere
Commit 098d758e authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files
Options

Merge branch 'salient_behavior' into 'master' 

Salient behavior

See merge request !68
parents 0f0d9a0a 78f8c061
Pipeline #115663 passed with stages
          in 115 minutes and 22 seconds
          Expand all Hide whitespace changes
          Inline Side-by-side
          Showing with 8711 additions and 617 deletions
          VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario
          View file @ 098d758e
          {
          "name" : "floor_field_navigation_test_displaced_ok",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -84,7 +85,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -184,7 +186,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_ok.scenario
          View file @ 098d758e
          {
          "name" : "floor_field_navigation_test_ok",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -84,7 +85,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -193,7 +195,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestEvents/BangEvent/scenarios/01_unsupported_event_exception_for_unsupported_models.scenario
          View file @ 098d758e
          {
          "name" : "01_unsupported_event_exception_for_unsupported_models",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -98,7 +99,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : -2062305966864041707,
          "simulationSeed" : 0
          "simulationSeed" : 0,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -176,7 +178,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : {
          ......
          VadereModelTests/TestEvents/BangEvent/scenarios/02_bang_event_one_agent.scenario
          View file @ 098d758e
          {
          "name" : "02_bang_event_one_agent",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -98,7 +99,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : -2062305966864041707,
          "simulationSeed" : 0
          "simulationSeed" : 0,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -176,7 +178,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : {
          ......
          VadereModelTests/TestEvents/BangEvent/scenarios/03_bang_event_multiple_agents.scenario
          View file @ 098d758e
          {
          "name" : "03_bang_event_multiple_agents",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -98,7 +99,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : -2062305966864041707,
          "simulationSeed" : 0
          "simulationSeed" : 0,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -278,7 +280,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : {
          ......
          VadereModelTests/TestEvents/BangEvent/scenarios/04_bang_event_one_agent_one_obstacle.scenario
          View file @ 098d758e
          {
          "name" : "04_bang_event_one_agent_one_obstacle",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -98,7 +99,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : -2062305966864041707,
          "simulationSeed" : 0
          "simulationSeed" : 0,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -185,7 +187,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : {
          ......
          VadereModelTests/TestEvents/BangEvent/scenarios/05_bang_event_narrowed_street.scenario
          View file @ 098d758e
          {
          "name" : "05_bang_event_narrowed_street",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -106,7 +107,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : -5666974701049342956,
          "simulationSeed" : 0
          "simulationSeed" : 0,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -902,7 +904,11 @@
          "speedDistributionStandardDeviation" : 0.05,
          "minimumSpeed" : 0.55,
          "maximumSpeed" : 0.65,
          "acceleration" : 2.0
          "acceleration" : 2.0,
          "footStepsToStore" : 4,
          "searchRadius" : 1.0,
          "angleCalculationType" : "USE_CENTER",
          "targetOrientationAngleThreshold" : 45.0
          },
          "teleporter" : null,
          "attributesCar" : {
          ......
          VadereModelTests/TestEvents/BangEvent/scenarios/06_bang_event_guimaraes_platz.scenario
          View file @ 098d758e
          {
          "name" : "06_bang_event_guimaraes_platz",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -106,7 +107,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : -5666974701049342956,
          "simulationSeed" : 0
          "simulationSeed" : 0,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -1173,7 +1175,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : {
          ......
          VadereModelTests/TestEvents/DifferentEvents/scenarios/01_wait_event_osm_sequential.scenario
          View file @ 098d758e
          {
          "name" : "01_wait_event_osm_sequential",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -114,7 +115,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -215,7 +217,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestEvents/DifferentEvents/scenarios/02_wait_event_osm_event_driven.scenario
          View file @ 098d758e
          {
          "name" : "02_wait_event_osm_event_driven",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -114,7 +115,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -215,7 +217,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestEvents/DifferentEvents/scenarios/03_wait_event_recurring_osm_sequential.scenario
          View file @ 098d758e
          {
          "name" : "03_wait_event_recurring_osm_sequential",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -114,7 +115,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -215,7 +217,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestEvents/DifferentEvents/scenarios/04_wait_in_area_event_osm_sequential.scenario
          View file @ 098d758e
          {
          "name" : "04_wait_in_area_event_osm_sequential",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -114,7 +115,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -215,7 +217,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestEvents/DifferentEvents/scenarios/05_wait_in_area_event_bhm.scenario
          View file @ 098d758e
          {
          "name" : "05_wait_in_area_event_bhm",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -102,7 +103,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -203,7 +205,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestEvents/DifferentEvents/scenarios/06_bang_event_osm_sequential.scenario
          View file @ 098d758e
          {
          "name" : "06_bang_event_osm_sequential",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -114,7 +115,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -232,7 +234,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestEvents/DifferentEvents/scenarios/07_bang_event_osm_event_driven.scenario
          View file @ 098d758e
          {
          "name" : "07_bang_event_osm_event_driven",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ {
          "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
          ......@@ -114,7 +115,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -232,7 +234,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
          View file @ 098d758e
          {
          "name" : "basic_1_chicken_gnm1",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ ],
          "processors" : [ ],
          ......@@ -58,7 +59,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -149,7 +151,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario
          View file @ 098d758e
          {
          "name" : "basic_1_chicken_gnm1_displaced",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ ],
          "processors" : [ ],
          ......@@ -58,7 +59,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 1
          "simulationSeed" : 1,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -149,7 +151,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
          View file @ 098d758e
          {
          "name" : "basic_1_chicken_gnm2",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ ],
          "processors" : [ ],
          ......@@ -58,7 +59,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 0
          "simulationSeed" : 0,
          "useSalientBehavior" : false
          },
          "topography" : {
          "attributes" : {
          ......@@ -149,7 +151,11 @@
          "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
          },
          "teleporter" : null,
          "attributesCar" : null
          ......
          VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
          View file @ 098d758e
          {
          "name" : "basic_2_density_gnm1",
          "description" : "",
          "release" : "0.9",
          "release" : "0.10",
          "commithash" : "warning: no commit hash",
          "processWriters" : {
          "files" : [ ],
          "processors" : [ ],
          ......@@ -58,7 +59,8 @@
          "digitsPerCoordinate" : 2,
          "useFixedSeed" : true,
          "fixedSeed" : 1,
          "simulationSeed" : 0
          "simulationSeed" : 0,
          "useSalientBehavior" : false