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

Commit 72194a05 authored by Marion Goedel's avatar Marion Goedel

Updated OSM Test scenarios:

- added PedestrianOverlapProcessor, MAxOverlapProcessor and NumberOverlapProcessor to all scenarios
- increased size of sources in cases where overlaps occurred in the source
parent ab209b7c
Pipeline #107306 failed with stages
in 51 seconds
...@@ -42,6 +42,13 @@ ...@@ -42,6 +42,13 @@
"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
}
} ], } ],
"isTimestamped" : true "isTimestamped" : true
}, },
...@@ -179,7 +186,7 @@ ...@@ -179,7 +186,7 @@
"shape" : { "shape" : {
"x" : 1.0, "x" : 1.0,
"y" : 1.0, "y" : 1.0,
"width" : 3.0, "width" : 5.0,
"height" : 10.0, "height" : 10.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
......
{
"name" : "basic_2_density_neder_mead",
"description" : "",
"release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "density.txt",
"processors" : [ 1 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityCountingProcessor",
"id" : 1,
"attributesType" : "org.vadere.state.attributes.processor.AttributesPedestrianDensityCountingProcessor",
"attributes" : {
"pedestrianPositionProcessorId" : 2,
"radius" : 1.5
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 2
} ],
"isTimestamped" : true
},
"scenario" : {
"mainModel" : "org.vadere.simulator.models.osm.OptimalStepsModel",
"attributesModel" : {
"org.vadere.state.attributes.models.AttributesFloorField" : {
"createMethod" : "HIGH_ACCURACY_FAST_MARCHING",
"potentialFieldResolution" : 0.1,
"obstacleGridPenalty" : 0.1,
"targetAttractionStrength" : 1.0,
"timeCostAttributes" : {
"standardDeviation" : 0.7,
"type" : "UNIT",
"obstacleDensityWeight" : 3.5,
"pedestrianSameTargetDensityWeight" : 3.5,
"pedestrianOtherTargetDensityWeight" : 3.5,
"pedestrianWeight" : 3.5,
"queueWidthLoading" : 1.0,
"pedestrianDynamicWeight" : 6.0,
"loadingType" : "CONSTANT"
}
},
"org.vadere.state.attributes.models.AttributesOSM" : {
"stepCircleResolution" : 18,
"numberOfCircles" : 1,
"varyStepDirection" : false,
"stepLengthIntercept" : 0.4625,
"stepLengthSlopeSpeed" : 0.2345,
"stepLengthSD" : 0.036,
"movementThreshold" : 0.0,
"optimizationType" : "NELDER_MEAD",
"movementType" : "ARBITRARY",
"dynamicStepLength" : false,
"updateType" : "EVENT_DRIVEN",
"seeSmallWalls" : false,
"minimumStepLength" : 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
}
},
"attributesSimulation" : {
"finishTime" : 200.0,
"simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : true,
"visualizationEnabled" : true,
"printFPS" : false,
"digitsPerCoordinate" : 2,
"useFixedSeed" : true,
"fixedSeed" : 1,
"simulationSeed" : 1
},
"topography" : {
"attributes" : {
"bounds" : {
"x" : 0.0,
"y" : 0.0,
"width" : 38.0,
"height" : 12.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
},
"obstacles" : [ {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 9.0,
"y" : 12.0
}, {
"x" : 9.0,
"y" : 10.0
}, {
"x" : 30.0,
"y" : 7.0
}, {
"x" : 30.0,
"y" : 12.0
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 9.0,
"y" : 0.0
}, {
"x" : 9.0,
"y" : 2.0
}, {
"x" : 30.0,
"y" : 5.0
}, {
"x" : 30.0,
"y" : 0.0
} ]
},
"id" : -1
} ],
"stairs" : [ ],
"targets" : [ {
"id" : 1,
"absorbing" : true,
"shape" : {
"x" : 35.0,
"y" : 5.0,
"width" : 2.0,
"height" : 2.0,
"type" : "RECTANGLE"
},
"waitingTime" : 0.0,
"waitingTimeYellowPhase" : 0.0,
"parallelWaiters" : 0,
"individualWaiting" : true,
"deletionDistance" : 0.1,
"startingWithRedLight" : false,
"nextSpeed" : -1.0
} ],
"sources" : [ {
"id" : -1,
"shape" : {
"x" : 1.0,
"y" : 1.0,
"width" : 3.0,
"height" : 10.0,
"type" : "RECTANGLE"
},
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
"distributionParameters" : [ 1.0 ],
"spawnNumber" : 200,
"maxSpawnNumberTotal" : -1,
"startTime" : 0.0,
"endTime" : 0.0,
"spawnAtRandomPositions" : true,
"useFreeSpaceOnly" : true,
"targetIds" : [ 1 ],
"groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN"
} ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"dynamicElements" : [ ],
"attributesCar" : null
}
}
}
\ No newline at end of file
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "basic_2_density_pso", "name" : "basic_2_density_pso",
"description" : "", "description" : "",
"release" : "0.6", "release" : "0.6",
"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",
...@@ -20,6 +19,23 @@ ...@@ -20,6 +19,23 @@
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor",
"id" : 2 "id" : 2
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 3
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.MaxOverlapProcessor",
"id" : 4,
"attributesType" : "org.vadere.state.attributes.processor.AttributesMaxOverlapProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
"id" : 5,
"attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 3
}
} ], } ],
"isTimestamped" : true "isTimestamped" : true
}, },
...@@ -157,7 +173,7 @@ ...@@ -157,7 +173,7 @@
"shape" : { "shape" : {
"x" : 1.0, "x" : 1.0,
"y" : 1.0, "y" : 1.0,
"width" : 3.0, "width" : 5.0,
"height" : 10.0, "height" : 10.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
...@@ -173,6 +189,7 @@ ...@@ -173,6 +189,7 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
...@@ -182,7 +199,6 @@ ...@@ -182,7 +199,6 @@
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0 "acceleration" : 2.0
}, },
"dynamicElements" : [ ],
"attributesCar" : null "attributesCar" : null
} }
} }
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "chicken_floorfield_ok", "name" : "chicken_floorfield_ok",
"description" : "", "description" : "",
"release" : "0.6", "release" : "0.6",
"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",
...@@ -47,6 +46,13 @@ ...@@ -47,6 +46,13 @@
"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
}
} ], } ],
"isTimestamped" : true "isTimestamped" : true
}, },
...@@ -174,9 +180,9 @@ ...@@ -174,9 +180,9 @@
"id" : -1, "id" : -1,
"shape" : { "shape" : {
"x" : 10.0, "x" : 10.0,
"y" : 6.0, "y" : 5.0,
"width" : 15.0, "width" : 15.0,
"height" : 7.0, "height" : 9.0,
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution", "interSpawnTimeDistribution" : "org.vadere.state.scenario.ConstantDistribution",
...@@ -191,6 +197,7 @@ ...@@ -191,6 +197,7 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"dynamicElements" : [ ],
"attributesPedestrian" : { "attributesPedestrian" : {
"radius" : 0.195, "radius" : 0.195,
"densityDependentSpeed" : false, "densityDependentSpeed" : false,
...@@ -200,7 +207,6 @@ ...@@ -200,7 +207,6 @@
"maximumSpeed" : 2.2, "maximumSpeed" : 2.2,
"acceleration" : 2.0 "acceleration" : 2.0
}, },
"dynamicElements" : [ ],
"attributesCar" : null "attributesCar" : null
} }
} }
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "corner_waiting_time_processor_test", "name" : "corner_waiting_time_processor_test",
"description" : "", "description" : "",
"release" : "0.6", "release" : "0.6",
"commithash" : "warning: no commit hash",
"processWriters" : { "processWriters" : {
"files" : [ { "files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
...@@ -15,7 +14,7 @@ ...@@ -15,7 +14,7 @@
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile",
"filename" : "out.txt", "filename" : "out.txt",
"processors" : [ 5 ] "processors" : [ ]
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile", "type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile",
"filename" : "out1.txt", "filename" : "out1.txt",
...@@ -47,16 +46,23 @@ ...@@ -47,16 +46,23 @@
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianStartTimeProcessor",
"id" : 4 "id" : 4
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 6
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.MaxOverlapProcessor",
"id" : 7,
"attributesType" : "org.vadere.state.attributes.processor.AttributesMaxOverlapProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 6
}
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor",
"id" : 5, "id" : 8,
"attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor", "attributesType" : "org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor",
"attributes" : { "attributes" : {
"pedestrianOverlapProcessorId" : 6 "pedestrianOverlapProcessorId" : 6
} }
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 6
} ], } ],
"isTimestamped" : true "isTimestamped" : true
}, },
...@@ -114,7 +120,7 @@ ...@@ -114,7 +120,7 @@
"finishTime" : 100.0, "finishTime" : 100.0,
"simTimeStepLength" : 0.4, "simTimeStepLength" : 0.4,
"realTimeSimTimeRatio" : 0.0, "realTimeSimTimeRatio" : 0.0,
"writeSimulationData" : false, "writeSimulationData" : true,
"visualizationEnabled" : true, "visualizationEnabled" : true,
"printFPS" : false, "printFPS" : false,
"digitsPerCoordinate" : 2, "digitsPerCoordinate" : 2,
...@@ -192,15 +198,6 @@ ...@@ -192,15 +198,6 @@
"groupSizeDistribution" : [ 1.0 ], "groupSizeDistribution" : [ 1.0 ],
"dynamicElementType" : "PEDESTRIAN" "dynamicElementType" : "PEDESTRIAN"
} ], } ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"dynamicElements" : [ { "dynamicElements" : [ {
"source" : null, "source" : null,
"targetIds" : [ 1 ], "targetIds" : [ 1 ],
...@@ -231,6 +228,15 @@ ...@@ -231,6 +228,15 @@
"groupIds" : [ ], "groupIds" : [ ],
"type" : "PEDESTRIAN" "type" : "PEDESTRIAN"
} ], } ],
"attributesPedestrian" : {
"radius" : 0.195,
"densityDependentSpeed" : false,
"speedDistributionMean" : 1.34,
"speedDistributionStandardDeviation" : 0.26,
"minimumSpeed" : 0.5,
"maximumSpeed" : 2.2,
"acceleration" : 2.0
},
"attributesCar" : null "attributesCar" : null
} }
} }
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
"name" : "narrow_passage_discrete_CA_fail", "name" : "narrow_passage_discrete_CA_fail",
"description" : "", "description" : "",
"release" : "0.6", "release" : "0.6",
"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",
...@@ -33,6 +32,13 @@ ...@@ -33,6 +32,13 @@
}, { }, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor", "type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor",
"id" : 4 "id" : 4
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.MaxOverlapProcessor",
"id" : 5,
"attributesType" : "org.vadere.state.attributes.processor.AttributesMaxOverlapProcessor",
"attributes" : {
"pedestrianOverlapProcessorId" : 4
}
} ], } ],
"isTimestamped" : true "isTimestamped" : true
}, },
...@@ -154,6 +160,150 @@ ...@@ -154,6 +160,150 @@
"type" : "RECTANGLE" "type" : "RECTANGLE"
}, },
"id" : -1 "id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : -1.0E-4
}, {
"x" : 10.0001,
"y" : -1.0E-4
}, {
"x" : 10.0001,
"y" : 0.5001
}, {
"x" : -1.0E-4,
"y" : 0.5001
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 10.0001,
"y" : -1.0E-4
}, {
"x" : 10.0001,
"y" : 5.0001
}, {
"x" : 9.4999,
"y" : 5.0001
}, {
"x" : 9.4999,
"y" : -1.0E-4
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : 10.0001,
"y" : 5.0001
}, {
"x" : -1.0E-4,
"y" : 5.0001
}, {
"x" : -1.0E-4,
"y" : 4.4999
}, {
"x" : 10.0001,
"y" : 4.4999
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : 5.0001
}, {
"x" : -1.0E-4,
"y" : -1.0E-4
}, {
"x" : 0.5001,
"y" : -1.0E-4
}, {
"x" : 0.5001,
"y" : 5.0001
} ]
},
"id" : -1
}, {
"shape" : {
"type" : "POLYGON",
"points" : [ {
"x" : -1.0E-4,
"y" : -1.0E-4
}, {
"x" : 10.0001,
"y" : -1.0E-4
}, {
"x" : 10.0001,
"y" : 0.5001
}, {
"x" : -1.0E-4,
"y" : 0.5001
} ]
},