Commit fd7953ae authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

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
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_04_flow_gnm1_100_h", "name" : "rimea_04_flow_gnm1_100_h",
"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" : "rimea_04_flow_gnm1_125_h", "name" : "rimea_04_flow_gnm1_125_h",
"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" : "rimea_05_react_gnm1", "name" : "rimea_05_react_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" : "rimea_06_corner_gnm1", "name" : "rimea_06_corner_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" : "rimea_07_speeds_gnm1", "name" : "rimea_07_speeds_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" : "rimea_09_publicRoom_gnm1_2", "name" : "rimea_09_publicRoom_gnm1_2",
"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" : "rimea_09_publicRoom_gnm1_4", "name" : "rimea_09_publicRoom_gnm1_4",
"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" : "rimea_10_pathfinding_gnm1", "name" : "rimea_10_pathfinding_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" : "rimea_11_exitSelection_gnm1", "name" : "rimea_11_exitSelection_gnm1",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ ], "files" : [ ],
"processors" : [ ], "processors" : [ ],
...@@ -26,13 +25,15 @@ ...@@ -26,13 +25,15 @@
"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" : {
"attributesODEIntegrator" : { "attributesODEIntegrator" : {
"solverType" : "DORMAND_PRINCE_45", "solverType" : "EULER",
"stepSizeMin" : 1.0E-4, "stepSizeMin" : 0.05,
"stepSizeMax" : 1.0, "stepSizeMax" : 1.0,
"toleranceAbsolute" : 1.0E-5, "toleranceAbsolute" : 1.0E-5,
"toleranceRelative" : 1.0E-4 "toleranceRelative" : 1.0E-4
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "rimea_12_evacuation_gnm1", "name" : "rimea_12_evacuation_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" : "rimea_13_stairs_gnm1", "name" : "rimea_13_stairs_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" : "rimea_14_selectRoute_gnm1", "name" : "rimea_14_selectRoute_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" : "VadereSimulation-GroupBehavior", "name" : "VadereSimulation-GroupBehavior",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -26,7 +25,8 @@ ...@@ -26,7 +25,8 @@
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 4 "id" : 4
} ], } ],
"isTimestamped" : true "isTimestamped" : true,
"isWriteMetaData" : false
}, },
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
...@@ -45,7 +45,9 @@ ...@@ -45,7 +45,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.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
...@@ -145,6 +147,7 @@ ...@@ -145,6 +147,7 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
...@@ -230,6 +233,10 @@ ...@@ -230,6 +233,10 @@
"minimumSpeed" : 0.3, "minimumSpeed" : 0.3,
"maximumSpeed" : 3.0, "maximumSpeed" : 3.0,
"acceleration" : 2.0, "acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0,
"length" : 4.5, "length" : 4.5,
"width" : 1.7, "width" : 1.7,
"direction" : { "direction" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "VadereSimulation-GroupBehavior_no_groups", "name" : "VadereSimulation-GroupBehavior_no_groups",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -26,7 +25,8 @@ ...@@ -26,7 +25,8 @@
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 4 "id" : 4
} ], } ],
"isTimestamped" : true "isTimestamped" : true,
"isWriteMetaData" : false
}, },
"scenario" : { "scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel", "mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
...@@ -45,25 +45,27 @@ ...@@ -45,25 +45,27 @@
"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.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 4, "stepCircleResolution" : 4,
"numberOfCircles" : 1, "numberOfCircles" : 1,
"optimizationType" : "NELDER_MEAD",
"varyStepDirection" : true, "varyStepDirection" : true,
"movementType" : "ARBITRARY",
"stepLengthIntercept" : 0.4625, "stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345, "stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036, "stepLengthSD" : 0.036,
"movementThreshold" : 0.0, "movementThreshold" : 0.0,
"minStepLength" : 0.17, "minStepLength" : 0.17,
"minimumStepLength" : true,
"maxStepDuration" : 3.0, "maxStepDuration" : 3.0,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : true, "dynamicStepLength" : true,
"updateType" : "EVENT_DRIVEN", "updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : true, "seeSmallWalls" : true,
"minimumStepLength" : true,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
...@@ -141,6 +143,7 @@ ...@@ -141,6 +143,7 @@
}, },
"id" : -1 "id" : -1
} ], } ],
"measurementAreas" : [ ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
...@@ -160,6 +163,7 @@ ...@@ -160,6 +163,7 @@
"startingWithRedLight" : false, "startingWithRedLight" : false,
"nextSpeed" : -1.0 "nextSpeed" : -1.0
} ], } ],
"absorbingAreas" : [ ],
"sources" : [ { "sources" : [ {
"id" : 1, "id" : 1,
"shape" : { "shape" : {
...@@ -225,6 +229,10 @@ ...@@ -225,6 +229,10 @@
"minimumSpeed" : 0.3, "minimumSpeed" : 0.3,
"maximumSpeed" : 3.0, "maximumSpeed" : 3.0,
"acceleration" : 2.0, "acceleration" : 2.0,
"footStepsToStore" : 4,
"searchRadius" : 1.0,
"angleCalculationType" : "USE_CENTER",
"targetOrientationAngleThreshold" : 45.0,
"length" : 4.5, "length" : 4.5,
"width" : 1.7, "width" : 1.7,
"direction" : { "direction" : {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "group_OSM_1Source1Place", "name" : "group_OSM_1Source1Place",
"description" : "", "description" : "",
"release" : "1.0", "release" : "1.0",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -49,7 +48,9 @@ ...@@ -49,7 +48,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.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
...@@ -63,11 +64,11 @@ ...@@ -63,11 +64,11 @@
"stepLengthSD" : 0.036, "stepLengthSD" : 0.036,
"movementThreshold" : 0.0, "movementThreshold" : 0.0,
"minStepLength" : 0.4625, "minStepLength" : 0.4625,
"minimumStepLength" : false,
"maxStepDuration" : 1.7976931348623157E308, "maxStepDuration" : 1.7976931348623157E308,
"dynamicStepLength" : false, "dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN", "updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false, "seeSmallWalls" : false,
"minimumStepLength" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid", "targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell", "pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell", "obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
...@@ -91,7 +92,7 @@ ...@@ -91,7 +92,7 @@
"attributesSimulation" : { "attributesSimulation" : {
"finishTime" : 40.0, "finishTime" : 40.0,
"simTimeStepLength" : 0.4, "simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.8, "realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true, "writeSimulationData" : true,
"visualizationEnabled" : true, "visualizationEnabled" : true,
"printFPS" : false, "printFPS" : false,
...@@ -179,6 +180,10 @@ ...@@ -179,6 +180,10 @@
"minimumSpeed" : 0.3, "minimumSpeed" : 0.3,
"maximumSpeed" : 3.0,