2.12.2021, 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit 71cf1cc7 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

Fixed BHM test scenarios after merge with "master"

parent a185aec9
Pipeline #352968 passed with stages
in 139 minutes and 44 seconds
{
"name" : "floor_field_navigation_test_ok",
"name" : "BHM-FloorFieldTest-Labyrinth",
"description" : "",
"release" : "1.15",
"processWriters" : {
......@@ -28,12 +28,13 @@
"stepLengthDeviation" : true,
"navigationCluster" : false,
"navigationFollower" : false,
"followerProximityNavigation" : false,
"navigationModel" : "NavigationProximity",
"directionWallDistance" : false,
"tangentialEvasion" : false,
"sidewaysEvasion" : false,
"onlyEvadeContraFlow" : false,
"makeSmallSteps" : false,
"followerProximityNavigation" : false,
"differentBehaviour" : false,
"differentEvasionBehaviourPercentage" : [ ],
"varyingBehaviour" : false,
......@@ -118,7 +119,7 @@
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 2
}, {
"shape" : {
"x" : 1.0,
......@@ -127,7 +128,7 @@
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 3
}, {
"shape" : {
"x" : 1.0,
......@@ -136,7 +137,7 @@
"height" : 19.5,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 4
}, {
"shape" : {
"x" : 1.0,
......@@ -145,7 +146,7 @@
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 5
}, {
"shape" : {
"x" : 33.0,
......@@ -154,7 +155,7 @@
"height" : 18.0,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 6
}, {
"shape" : {
"x" : 2.5,
......@@ -163,7 +164,7 @@
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 7
}, {
"shape" : {
"x" : 2.5,
......@@ -172,7 +173,7 @@
"height" : 16.4,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 8
}, {
"shape" : {
"x" : 2.5,
......@@ -181,7 +182,7 @@
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 9
}, {
"shape" : {
"x" : 24.0,
......@@ -190,7 +191,7 @@
"height" : 12.5,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 10
}, {
"shape" : {
"x" : 20.1,
......@@ -199,7 +200,7 @@
"height" : 11.4,
"type" : "RECTANGLE"
},
"id" : -1
"id" : 11
} ],
"measurementAreas" : [ ],
"stairs" : [ ],
......@@ -224,7 +225,7 @@
"targetChangers" : [ ],
"absorbingAreas" : [ ],
"sources" : [ {
"id" : -1,
"id" : 12,
"shape" : {
"x" : 16.0,
"y" : 2.0,
......
{
"name" : "floor_field_navigation_test_displaced_ok",
"name" : "BHM-FloorFieldTest-TwoObstacles",
"description" : "",
"release" : "1.15",
"processWriters" : {
......@@ -28,12 +28,13 @@
"stepLengthDeviation" : true,
"navigationCluster" : false,
"navigationFollower" : false,
"followerProximityNavigation" : false,
"navigationModel" : "NavigationProximity",
"directionWallDistance" : false,
"tangentialEvasion" : true,
"sidewaysEvasion" : true,
"onlyEvadeContraFlow" : false,
"makeSmallSteps" : false,
"followerProximityNavigation" : false,
"differentBehaviour" : false,
"differentEvasionBehaviourPercentage" : [ ],
"varyingBehaviour" : false,
......
{
"name" : "19-CounterFlow-CounterflowCognitionModel",
"name" : "Corridor-BHM-Defaults-WithFloorField-CounterflowCognitionModel",
"description" : "",
"release" : "1.15",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postvis.traj",
"processors" : [ 3, 4, 5 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv",
"processors" : [ 1 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "overlapCount.txt",
"processors" : [ 2 ]
"processors" : [ 1, 2, 3 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
"id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 1
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepProcessor",
"id" : 3
"id" : 1
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepTargetIDProcessor",
"id" : 4
"id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.FootStepPsychologyStatusProcessor",
"id" : 5
"id" : 3
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"mainModel" : "org.vadere.simulator.models.bhm.BehaviouralHeuristicsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 4,
"numberOfCircles" : 1,
"optimizationType" : "NELDER_MEAD",
"varyStepDirection" : true,
"movementType" : "ARBITRARY",
"org.vadere.state.attributes.models.AttributesBHM" : {
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"minStepLength" : 0.1,
"minimumStepLength" : true,
"maxStepDuration" : 1.7976931348623157E308,
"dynamicStepLength" : true,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"targetPotentialModel" : "org.vadere.simulator.models.potential.fields.PotentialFieldTargetGrid",
"pedestrianPotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldPedestrianCompactSoftshell",
"obstaclePotentialModel" : "org.vadere.simulator.models.potential.PotentialFieldObstacleCompactSoftshell",
"submodels" : [ ]
},
"org.vadere.state.attributes.models.AttributesPotentialCompactSoftshell" : {
"pedPotentialIntimateSpaceWidth" : 0.45,
"pedPotentialPersonalSpaceWidth" : 1.2,
"pedPotentialHeight" : 50.0,
"obstPotentialWidth" : 0.8,
"obstPotentialHeight" : 6.0,
"intimateSpaceFactor" : 1.2,
"personalSpacePower" : 1,
"intimateSpacePower" : 1
"stepLengthDeviation" : false,
"navigationCluster" : false,
"navigationFollower" : false,
"followerProximityNavigation" : true,
"navigationModel" : "NavigationProximity",
"directionWallDistance" : false,
"tangentialEvasion" : true,
"sidewaysEvasion" : false,
"onlyEvadeContraFlow" : false,
"makeSmallSteps" : false,
"differentBehaviour" : false,
"differentEvasionBehaviourPercentage" : [ ],
"varyingBehaviour" : true,
"adaptiveBehaviourDensity" : false,
"adaptiveBehaviourStepsRemained" : [ ],
"switchBehaviour" : false,
"evasionDetourThreshold" : 0.1,
"onlyEvadeContraFlowAngle" : 2.0943951023931953,
"followerAngleMovement" : 1.5707963267948966,
"followerAnglePosition" : 1.5707963267948966,
"followerDistance" : 10.0,
"smallStepResolution" : 5,
"plannedStepsAhead" : 5,
"obstacleRepulsionReach" : 1.0,
"obstacleRepulsionMaxWeight" : 0.5,
"distanceToKeep" : 0.5,
"backwardsAngle" : 1.5707963267948966,
"reconsiderOldTargets" : false,
"targetThresholdX" : 1.7976931348623157E308,
"targetThresholdY" : 1.7976931348623157E308,
"spaceToKeep" : 0.01,
"stepAwayFromCollisions" : false
},
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
......@@ -81,22 +69,22 @@
"cacheType" : "NO_CACHE",
"cacheDir" : "",
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"obstacleDensityWeight" : 3.5,
"standardDeviation" : 0.2,
"type" : "DISTANCE_TO_OBSTACLES",
"obstacleDensityWeight" : 1.0,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT",
"width" : 0.2,
"height" : 1.0
"width" : 1.0,
"height" : 5.0
}
}
},
"attributesSimulation" : {
"finishTime" : 180.0,
"finishTime" : 100.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1,
"writeSimulationData" : true,
......@@ -104,8 +92,8 @@
"printFPS" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 6138355022448163583,
"simulationSeed" : 6138355022448163583
"fixedSeed" : -8539920412942853482,
"simulationSeed" : 0
},
"attributesPsychology" : {
"usePsychologyLayer" : true,
......
{
"name" : "Corridor-BHM-Defaults-WithFloorField",
"description" : "",
"release" : "1.14",
"release" : "1.15",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -102,12 +102,6 @@
"cognition" : "CounterflowCognitionModel"
}
},
"attributesStrategy" : {
"useStrategyModel" : false,
"strategyModel" : null,
"arguments" : [ ],
"requiredDataProcessorIds" : [ ]
},
"topography" : {
"attributes" : {
"bounds" : {
......
{
"name" : "Corridor-BHM-Defaults",
"description" : "",
"release" : "1.14",
"release" : "1.15",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -81,12 +81,6 @@
"cognition" : "CounterflowCognitionModel"
}
},
"attributesStrategy" : {
"useStrategyModel" : false,
"strategyModel" : null,
"arguments" : [ ],
"requiredDataProcessorIds" : [ ]
},
"topography" : {
"attributes" : {
"bounds" : {
......
{
"name" : "CorridorKretz2006c-BHM-Defaults-WithFloorField-CounterflowCognitionModel",
"description" : "",
"release" : "1.14",
"release" : "1.15",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -102,12 +102,6 @@
"cognition" : "CounterflowCognitionModel"
}
},
"attributesStrategy" : {
"useStrategyModel" : false,
"strategyModel" : null,
"arguments" : [ ],
"requiredDataProcessorIds" : [ ]
},
"topography" : {
"attributes" : {
"bounds" : {
......
{
"name" : "CorridorKretz2006c-BHM-Defaults-WithFloorField",
"description" : "",
"release" : "1.14",
"release" : "1.15",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
......@@ -102,12 +102,6 @@
"cognition" : "CounterflowCognitionModel"
}
},
"attributesStrategy" : {
"useStrategyModel" : false,
"strategyModel" : null,
"arguments" : [ ],
"requiredDataProcessorIds" : [ ]
},
"topography" : {
"attributes" : {
"bounds" : {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment