Commit fd7953ae authored by Benedikt Zoennchen's avatar Benedikt Zoennchen

Merge branch 'issue#242' into 'master'

fix issue #242.

Closes #242

See merge request !66
parents a303cac0 ea3b983c
Pipeline #122557 passed with stages
in 114 minutes and 28 seconds
This diff is collapsed.
{ {
"name" : "C-050-180-180", "name" : "C-050-180-180",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-050-180-180_GNM", "name" : "C-050-180-180_GNM",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-050-180-180_Q", "name" : "C-050-180-180_Q",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-060-180-180", "name" : "C-060-180-180",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-060-180-180_Q", "name" : "C-060-180-180_Q",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-070-180-180", "name" : "C-070-180-180",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-070-180-180_Q", "name" : "C-070-180-180_Q",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-100-180-180", "name" : "C-100-180-180",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-100-180-180_Q", "name" : "C-100-180-180_Q",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-145-180-180", "name" : "C-145-180-180",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-145-180-180_Q", "name" : "C-145-180-180_Q",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-070", "name" : "C-180-180-070",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-070_Q", "name" : "C-180-180-070_Q",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-070_UNIT", "name" : "C-180-180-070_UNIT",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-070_default", "name" : "C-180-180-070_default",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-070_ramp", "name" : "C-180-180-070_ramp",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-095", "name" : "C-180-180-095",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-095_Q", "name" : "C-180-180-095_Q",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-120", "name" : "C-180-180-120",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-120_Q", "name" : "C-180-180-120_Q",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-180", "name" : "C-180-180-180",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "C-180-180-180_Q", "name" : "C-180-180-180_Q",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "T-240-050-240", "name" : "T-240-050-240",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "T-240-060-240", "name" : "T-240-060-240",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "T-240-080-240", "name" : "T-240-080-240",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "T-240-100-240", "name" : "T-240-100-240",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "T-240-120-240", "name" : "T-240-120-240",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "T-240-150-240", "name" : "T-240-150-240",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
{ {
"name" : "T-240-240-240", "name" : "T-240-240-240",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.0",
"commithash" : "warning: no commit hash", "commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
"navigationCluster" : false, "navigationCluster" : false,
"navigationFollower" : false, "navigationFollower" : false,
"directionWallDistance" : false, "directionWallDistance" : false,
"tangentialEvasion" : false, "tangentialEvasion" : true,
"sidewaysEvasion" : false, "sidewaysEvasion" : true,
"onlyEvadeContraFlow" : false, "onlyEvadeContraFlow" : false,
"makeSmallSteps" : false, "makeSmallSteps" : false,
"followerProximityNavigation" : false, "followerProximityNavigation" : false,
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_1_chicken_gnm1", "name" : "basic_1_chicken_gnm1",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -26,7 +25,9 @@ ...@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesGNM" : { "org.vadere.state.attributes.models.AttributesGNM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_1_chicken_gnm1_displaced", "name" : "basic_1_chicken_gnm1_displaced",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -26,7 +25,9 @@ ...@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesGNM" : { "org.vadere.state.attributes.models.AttributesGNM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_1_chicken_gnm2", "name" : "basic_1_chicken_gnm2",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -26,7 +25,9 @@ ...@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesGNM" : { "org.vadere.state.attributes.models.AttributesGNM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_2_density_gnm1", "name" : "basic_2_density_gnm1",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -26,7 +25,9 @@ ...@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesGNM" : { "org.vadere.state.attributes.models.AttributesGNM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_3_1_wall_gnm1", "name" : "basic_3_1_wall_gnm1",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -26,7 +25,9 @@ ...@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesGNM" : { "org.vadere.state.attributes.models.AttributesGNM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_3_2_wall_gnm1", "name" : "basic_3_2_wall_gnm1",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -26,7 +25,9 @@ ...@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesGNM" : { "org.vadere.state.attributes.models.AttributesGNM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_3_3_wall_gnm1", "name" : "basic_3_3_wall_gnm1",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -26,7 +25,9 @@ ...@@ -26,7 +25,9 @@
"pedestrianWeight" : 3.5, "pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0, "queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0, "pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT" "loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
} }
}, },
"org.vadere.state.attributes.models.AttributesGNM" : { "org.vadere.state.attributes.models.AttributesGNM" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_4_1_wall_gnm1", "name" : "basic_4_1_wall_gnm1",
"description" : "", "description" : "",