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

b6424114 · Benedikt Kleinmeier · d7a03210 · 9b1a4add · b6424114 · b6424114
Commit b6424114 authored May 23, 2019 by Benedikt Kleinmeier
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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`.

--- a/Tools/Notebooks/TrajectoryMetric.ipynb
+++ b/Tools/Notebooks/TrajectoryMetric.ipynb
--- a/Tools/Notebooks/data/TrajectoryMetric/KO/ko-240-120-240/ko-240-120-240_combined_MB.txt
+++ b/Tools/Notebooks/data/TrajectoryMetric/KO/ko-240-120-240/ko-240-120-240_combined_MB.txt
--- a/Tools/Notebooks/data/TrajectoryMetric/trajectories_simulation.txt
+++ b/Tools/Notebooks/data/TrajectoryMetric/trajectories_simulation.txt
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_GNM.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-050-180-180_Q.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-060-180-180_Q.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-070-180-180_Q.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-100-180-180_Q.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-145-180-180_Q.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_Q.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_UNIT.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_default.scenario
 {
  "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" : {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-070_ramp.scenario
 {
  "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" : {