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

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`.

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {

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" : {