Merge branch 'issue#242' into 'master'

fix issue #242. Closes #242 See merge request !66

Merge branch 'issue#242' into 'master'
fix issue #242. Closes #242 See merge request !66
fd7953ae · BZoennchen · a303cac0 · ea3b983c · fd7953ae · a303cac0
Commit fd7953ae authored Jun 14, 2019 by BZoennchen
102 changed files
--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- 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.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095.scenario
 {
  "name" : "C-180-180-095",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-095_Q.scenario
 {
  "name" : "C-180-180-095_Q",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120.scenario
 {
  "name" : "C-180-180-120",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-120_Q.scenario
 {
  "name" : "C-180-180-120_Q",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180.scenario
 {
  "name" : "C-180-180-180",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/C-180-180-180_Q.scenario
 {
  "name" : "C-180-180-180_Q",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240.scenario
 {
  "name" : "T-240-050-240",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_BHM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-050-240_OSM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240.scenario
 {
  "name" : "T-240-060-240",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_BHM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-060-240_OSM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240.scenario
 {
  "name" : "T-240-080-240",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_BHM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-080-240_OSM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240.scenario
 {
  "name" : "T-240-100-240",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_BHM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-100-240_OSM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240.scenario
 {
  "name" : "T-240-120-240",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_BHM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-120-240_OSM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240.scenario
 {
  "name" : "T-240-150-240",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_BHM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-150-240_OSM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240.scenario
 {
  "name" : "T-240-240-240",
  "description" : "",
-  "release" : "0.10",
+  "release" : "1.0",
  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ {

--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_BHM.scenario
--- a/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario
+++ b/VadereModelCalibration/TestOSM_zhang-2011/scenarios/T-240-240-240_OSM.scenario
--- a/VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario
+++ b/VadereModelTests/TestBHM/scenarios/floor_field_navigation_test_displaced_ok.scenario
@@ -26,8 +26,8 @@
        "navigationCluster" : false,
        "navigationFollower" : false,
        "directionWallDistance" : false,
-        "tangentialEvasion" : false,
-        "sidewaysEvasion" : false,
+        "tangentialEvasion" : true,
+        "sidewaysEvasion" : true,
        "onlyEvadeContraFlow" : false,
        "makeSmallSteps" : false,
        "followerProximityNavigation" : false,

--- a/VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1.scenario
@@ -2,7 +2,6 @@
  "name" : "basic_1_chicken_gnm1",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario
+++ b/VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm1_displaced.scenario
@@ -2,7 +2,6 @@
  "name" : "basic_1_chicken_gnm1_displaced",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
+++ b/VadereModelTests/TestGNM/scenarios/basic_1_chicken_gnm2.scenario
@@ -2,7 +2,6 @@
  "name" : "basic_1_chicken_gnm2",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/basic_2_density_gnm1.scenario
@@ -2,7 +2,6 @@
  "name" : "basic_2_density_gnm1",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/basic_3_1_wall_gnm1.scenario
@@ -2,7 +2,6 @@
  "name" : "basic_3_1_wall_gnm1",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/basic_3_2_wall_gnm1.scenario
@@ -2,7 +2,6 @@
  "name" : "basic_3_2_wall_gnm1",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/basic_3_3_wall_gnm1.scenario
@@ -2,7 +2,6 @@
  "name" : "basic_3_3_wall_gnm1",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/basic_4_1_wall_gnm1.scenario
@@ -2,7 +2,6 @@
  "name" : "basic_4_1_wall_gnm1",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/basic_4_2_wall_gnm1.scenario
@@ -2,7 +2,6 @@
  "name" : "basic_4_2_wall_gnm1",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_01_pathway_gnm1.scenario
@@ -2,7 +2,6 @@
  "name" : "rimea_01_pathway_gnm1",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_025_h.scenario
@@ -2,7 +2,6 @@
  "name" : "rimea_04_flow_gnm1_025_h",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_050_h.scenario
@@ -2,7 +2,6 @@
  "name" : "rimea_04_flow_gnm1_050_h",
  "description" : "",
  "release" : "1.0",
-  "commithash" : "warning: no commit hash",
  "processWriters" : {
    "files" : [ ],
    "processors" : [ ],
@@ -26,7 +25,9 @@
          "pedestrianWeight" : 3.5,
          "queueWidthLoading" : 1.0,
          "pedestrianDynamicWeight" : 6.0,
-          "loadingType" : "CONSTANT"
+          "loadingType" : "CONSTANT",
+          "width" : 0.2,
+          "height" : 1.0
        }
      },
      "org.vadere.state.attributes.models.AttributesGNM" : {

--- a/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_075_h.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_100_h.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_04_flow_gnm1_125_h.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_05_react_gnm1.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_06_corner_gnm1.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_07_speeds_gnm1.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_2.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_09_publicRoom_gnm1_4.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_10_pathfinding_gnm1.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_11_exitSelection_gnm1.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_12_evacuation_gnm1.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_13_stairs_gnm1.scenario
--- a/VadereModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario
+++ b/VadereModelTests/TestGNM/scenarios/rimea_14_selectRoute_gnm1.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/VadereSimulation-GroupBehavior_no_groups.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source1Place_noGroup.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_1Source2Places_noGroups.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_2Sources1Place_2Group_and_3Group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_4Source4Place_SEQ_2G_3G_4G_5G.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_EVD_2G_3G_4G_5G.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_4Source4Place_v2_SEQ_2G_3G_4G_5G.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_1group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_2group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_3group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_classroom_4group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_15group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_1group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_25group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_2group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_CGM_labratory_4group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_2Group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_3Group.scenario
--- a/VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario
+++ b/VadereModelTests/TestOSMGroup/scenarios/group_OSM_long_corr_4Group.scenario
--- a/VadereModelTests/TestOSMGroup/vadere.project
+++ b/VadereModelTests/TestOSMGroup/vadere.project
-TestOSMGroup
+TestOSMGroup
\ No newline at end of file
--- a/VadereSimulator/src/org/vadere/simulator/models/osm/OSMBehaviorController.java
+++ b/VadereSimulator/src/org/vadere/simulator/models/osm/OSMBehaviorController.java
--- a/VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java
+++ b/VadereSimulator/src/org/vadere/simulator/models/osm/PedestrianOSM.java
--- a/VadereSimulator/src/org/vadere/simulator/models/osm/optimization/StepCircleOptimizerDiscrete.java
+++ b/VadereSimulator/src/org/vadere/simulator/models/osm/optimization/StepCircleOptimizerDiscrete.java
--- a/VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeEventDriven.java
+++ b/VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeEventDriven.java
--- a/VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeEventDrivenParallel.java
+++ b/VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeEventDrivenParallel.java
--- a/VadereSimulator/src/org/vadere/simulator/models/potential/timeCostFunction/TimeCostFunctionObstacleDistance.java
+++ b/VadereSimulator/src/org/vadere/simulator/models/potential/timeCostFunction/TimeCostFunctionObstacleDistance.java