Commit c2048ad0 authored by Benedikt Kleinmeier's avatar Benedikt Kleinmeier
Browse files

Deleted folder "TestNonWorkingFeatures" and added scenario...

Deleted folder "TestNonWorkingFeatures" and added scenario "TestSalientBehavior/scenarios/12-CounterFlow-SBEnabled.scenario".
parent 89ca9c72
Pipeline #138015 passed with stages
in 104 minutes and 19 seconds
{ {
"name" : "thin_wall_discrete_ok", "name" : "thin_wall_discrete_ok",
"description" : "", "description" : "",
"release" : "1.1", "release" : "1.2",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1, "obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0, "targetAttractionStrength" : 1.0,
"cacheType" : "NO_CACHE",
"cacheDir" : "",
"timeCostAttributes" : { "timeCostAttributes" : {
"standardDeviation" : 0.7, "standardDeviation" : 0.7,
"type" : "UNIT", "type" : "UNIT",
......
{ {
"name" : "thin_wall_nelder_mead_ok", "name" : "thin_wall_nelder_mead_ok",
"description" : "", "description" : "",
"release" : "1.1", "release" : "1.2",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1, "obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0, "targetAttractionStrength" : 1.0,
"cacheType" : "NO_CACHE",
"cacheDir" : "",
"timeCostAttributes" : { "timeCostAttributes" : {
"standardDeviation" : 0.7, "standardDeviation" : 0.7,
"type" : "UNIT", "type" : "UNIT",
......
{ {
"name" : "thin_wall_pso_ok", "name" : "thin_wall_pso_ok",
"description" : "", "description" : "",
"release" : "1.1", "release" : "1.2",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1, "obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0, "targetAttractionStrength" : 1.0,
"cacheType" : "NO_CACHE",
"cacheDir" : "",
"timeCostAttributes" : { "timeCostAttributes" : {
"standardDeviation" : 0.7, "standardDeviation" : 0.7,
"type" : "UNIT", "type" : "UNIT",
......
{ {
"name" : "10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled", "name" : "10-RiMEA11-ExitSelection-OSMEventDriven-SBDisabled",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.2",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -60,6 +60,8 @@ ...@@ -60,6 +60,8 @@
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1, "obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0, "targetAttractionStrength" : 1.0,
"cacheType" : "NO_CACHE",
"cacheDir" : "",
"timeCostAttributes" : { "timeCostAttributes" : {
"standardDeviation" : 0.7, "standardDeviation" : 0.7,
"type" : "UNIT", "type" : "UNIT",
......
{ {
"name" : "11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled", "name" : "11-RiMEA11-ExitSelection-OSMEventDriven-SBEnabled",
"description" : "", "description" : "",
"release" : "0.10", "release" : "1.2",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
...@@ -60,6 +60,8 @@ ...@@ -60,6 +60,8 @@
"potentialFieldResolution" : 0.1, "potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1, "obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0, "targetAttractionStrength" : 1.0,
"cacheType" : "NO_CACHE",
"cacheDir" : "",
"timeCostAttributes" : { "timeCostAttributes" : {
"standardDeviation" : 0.7, "standardDeviation" : 0.7,
"type" : "UNIT", "type" : "UNIT",
......
{ {
"name" : "cooperative_behavior_agents_get_stuck", "name" : "12-CounterFlow-SBEnabled",
"description" : "", "description" : "",
"release" : "1.2", "release" : "1.2",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories", "filename" : "postvis.trajectories",
"processors" : [ 1, 2 ] "processors" : [ 1 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
"filename" : "waitingTimes.txt",
"processors" : [ 2 ]
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "overlaps.csv", "filename" : "out.txt",
"processors" : [ 3 ] "processors" : [ 3 ]
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "overlapCount.txt", "filename" : "out1.txt",
"processors" : [ 4 ] "processors" : [ 4 ]
} ], } ],
"processors" : [ { "processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 1 "id" : 1
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianWaitingTimeProcessor",
"id" : 2 "id" : 2,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianWaitingTimeProcessor",
"attributes" : {
"waitingAreaId" : 1
}
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3 "id" : 3
...@@ -32,6 +40,23 @@ ...@@ -32,6 +40,23 @@
"attributes" : { "attributes" : {
"pedestrianOverlapProcessorId" : 3 "pedestrianOverlapProcessorId" : 3
} }
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.MaxOverlapProcessor",
"id" : 5,
"attributesType" : "org.vadere.state.attributes.processor.AttributesMaxOverlapProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.tests.TestPedestrianWaitingTimeProcessor",
"id" : 6,
"attributesType" : "org.vadere.state.attributes.processor.AttributesTestPedestrianWaitingTimeProcessor",
"attributes" : {
"expectedResult" : "SUCCESS",
"pedestrianWaitingTimeProcessorId" : 2,
"maximalWaitingTime" : 0.0,
"minimalWaitingTime" : 0.0
}
} ], } ],
"isTimestamped" : true, "isTimestamped" : true,
"isWriteMetaData" : false "isWriteMetaData" : false
...@@ -63,7 +88,7 @@ ...@@ -63,7 +88,7 @@
"org.vadere.state.attributes.models.AttributesOSM" : { "org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18, "stepCircleResolution" : 18,
"numberOfCircles" : 1, "numberOfCircles" : 1,
"optimizationType" : "DISCRETE", "optimizationType" : "NELDER_MEAD",
"varyStepDirection" : false, "varyStepDirection" : false,
"movementType" : "ARBITRARY", "movementType" : "ARBITRARY",
"stepLengthIntercept" : 0.4625, "stepLengthIntercept" : 0.4625,
...@@ -93,16 +118,16 @@ ...@@ -93,16 +118,16 @@
} }
}, },
"attributesSimulation" : { "attributesSimulation" : {
"finishTime" : 120.0, "finishTime" : 200.0,
"simTimeStepLength" : 0.4, "simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.1, "realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true, "writeSimulationData" : true,
"visualizationEnabled" : true, "visualizationEnabled" : true,
"printFPS" : false, "printFPS" : false,
"digitsPerCoordinate" : 2, "digitsPerCoordinate" : 2,
"useFixedSeed" : true, "useFixedSeed" : true,
"fixedSeed" : 8993983048730112153, "fixedSeed" : 1,
"simulationSeed" : 0, "simulationSeed" : 1,
"useSalientBehavior" : false "useSalientBehavior" : false
}, },
"topography" : { "topography" : {
...@@ -110,23 +135,59 @@ ...@@ -110,23 +135,59 @@
"bounds" : { "bounds" : {
"x" : 0.0, "x" : 0.0,
"y" : 0.0, "y" : 0.0,
"width" : 30.0, "width" : 35.0,
"height" : 3.0 "height" : 60.0
}, },
"boundingBoxWidth" : 0.5, "boundingBoxWidth" : 0.5,
"bounded" : true "bounded" : true
}, },
"obstacles" : [ ], "obstacles" : [ {
"measurementAreas" : [ ], "shape" : {
"x" : 9.0,
"y" : 21.0,
"width" : 1.0,
"height" : 20.0,
"type" : "RECTANGLE"
},
"id" : 5
}, {
"shape" : {
"x" : 25.0,
"y" : 21.0,
"width" : 1.0,
"height" : 20.0,
"type" : "RECTANGLE"
},
"id" : 6
}, {
"shape" : {
"x" : 10.0,
"y" : 40.0,
"width" : 15.0,
"height" : 1.0,
"type" : "RECTANGLE"
},
"id" : 7
} ],
"measurementAreas" : [ {
"shape" : {
"x" : 10.0,
"y" : 32.0,
"width" : 15.0,
"height" : 8.0,
"type" : "RECTANGLE"
},
"id" : 1
} ],
"stairs" : [ ], "stairs" : [ ],
"targets" : [ { "targets" : [ {
"id" : 1, "id" : 1,
"absorbing" : true, "absorbing" : true,
"shape" : { "shape" : {
"x" : 0.8, "x" : 10.0,
"y" : 0.7, "y" : 51.0,
"width" : 0.6, "width" : 15.0,
"height" : 1.6, "height" : 5.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"waitingTime" : 0.0, "waitingTime" : 0.0,
...@@ -140,10 +201,10 @@ ...@@ -140,10 +201,10 @@
"id" : 2, "id" : 2,
"absorbing" : true, "absorbing" : true,
"shape" : { "shape" : {
"x" : 28.6, "x" : 14.7,
"y" : 0.7, "y" : 34.5,
"width" : 0.6, "width" : 5.3,
"height" : 1.6, "height" : 2.7,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"waitingTime" : 0.0, "waitingTime" : 0.0,
...@@ -156,32 +217,32 @@ ...@@ -156,32 +217,32 @@
} ], } ],
"absorbingAreas" : [ ], "absorbingAreas" : [ ],
"sources" : [ { "sources" : [ {
"id" : -1, "id" : 3,
"shape" : { "shape" : {
"x" : 1.7, "x" : 10.0,
"y" : 0.7, "y" : 5.0,
"width" : 0.6, "width" : 15.0,
"height" : 1.6, "height" : 9.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ], "distributionParameters" : [ 1.0 ],
"spawnNumber" : 50, "spawnNumber" : 300,
"maxSpawnNumberTotal" : -1, "maxSpawnNumberTotal" : -1,
"startTime" : 0.0, "startTime" : 0.0,
"endTime" : 0.0, "endTime" : 0.0,
"spawnAtRandomPositions" : false, "spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 2 ], "targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
}, { }, {
"id" : -1, "id" : 4,
"shape" : { "shape" : {
"x" : 27.7, "x" : 2.1,
"y" : 0.7, "y" : 30.2,
"width" : 0.6, "width" : 4.9,
"height" : 1.6, "height" : 3.1,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
...@@ -192,7 +253,7 @@ ...@@ -192,7 +253,7 @@
"endTime" : 0.0, "endTime" : 0.0,
"spawnAtRandomPositions" : false, "spawnAtRandomPositions" : false,
"useFreeSpaceOnly" : true, "useFreeSpaceOnly" : true,
"targetIds" : [ 1 ], "targetIds" : [ 2 ],
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
......
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