04.07., 9:00 - 11:00: Due to updates GitLab will be unavailable for some minutes between 09:00 and 11:00.

Commit b6424114 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier

Merge branch 'master' of gitlab.lrz.de:vadere/vadere

parents d7a03210 9b1a4add
Pipeline #116007 passed with stages
in 208 minutes and 14 seconds
......@@ -7,7 +7,7 @@
### Added
- Scenario elements like obstacles and targets can now be resized using the mouse in the topography creator tab (first, select element via left-click and then move mouse to one of its edges to get the resize handles).
- Draw also Voronoi diagram in `TikeGenerator`.
- Draw also Voronoi diagram in `TikzGenerator`.
- Added new scenario element `AbsorbingArea` to absorb agents immediately.
* The new scenario element can be selected in `TopographyCreator` via the "emergency exit" button.
* The new scenario element is also taken into account by `SettingsDialaog` and `TikzGenerator`.
......
This diff is collapsed.
{
"name" : "C-050-180-180",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-050-180-180_GNM",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -194,7 +195,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -339,7 +341,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" : {
......
{
"name" : "C-050-180-180_Q",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-060-180-180",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-060-180-180_Q",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-070-180-180",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-070-180-180_Q",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-100-180-180",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-100-180-180_Q",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-145-180-180",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-145-180-180_Q",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-070",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -391,7 +393,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-070_Q",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -391,7 +393,11 @@
"speedDistributionStandardDeviation" : 0.09,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-070_UNIT",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -373,7 +375,11 @@
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-070_default",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -391,7 +393,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-070_ramp",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -403,7 +405,11 @@
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-095",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -373,7 +375,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-095_Q",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -373,7 +375,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-120",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -373,7 +375,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-120_Q",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -373,7 +375,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-180",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0
},
"teleporter" : null,
"attributesCar" : {
......
{
"name" : "C-180-180-180_Q",
"description" : "",
"release" : "0.9",
"release" : "0.10",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +211,8 @@
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 5116495530058623348,
"simulationSeed" : 0
"simulationSeed" : 0,
"useSalientBehavior" : false
},
"topography" : {
"attributes" : {
......@@ -355,7 +357,11 @@
"speedDistributionStandardDeviation" : 0.15,
"minimumSpeed" : 1.37,
"maximumSpeed" : 1.73,
"acceleration" : 2.0
"acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",