Commit c6dcfe8e authored by Daniel Lehmberg's avatar Daniel Lehmberg

resolve in-code TODO -> rename getFootsteps() to getTrajectory()

parent 9eec9eb4
......@@ -113,7 +113,7 @@ public class OnlinevisualizationRenderer extends SimulationRenderer {
*/
private Stream<VPoint> getFootStepsPosition(@NotNull final Agent agent) {
if(agent instanceof Pedestrian) {
return ((Pedestrian) agent).getFootSteps().stream().map(footStep -> footStep.getStart());
return ((Pedestrian) agent).getTrajectory().stream().map(footStep -> footStep.getStart());
}
else {
return Stream.of(agent.getPosition());
......
{
"name" : "basic_2_density_discrete_ca",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -19,6 +19,10 @@
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
"filename" : "postvis.trajectories",
"processors" : [ 1, 2 ]
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.EventtimePedestrianIdOutputFile",
"filename" : "postviz.traj",
"processors" : [ 6 ]
} ],
"processors" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianDensityCountingProcessor",
......@@ -48,6 +52,9 @@
"attributes" : {
"pedestrianOverlapProcessorId" : 3
}
}, {
"type" : "org.vadere.simulator.projects.dataprocessing.processor.PedestrianFootStepProcessor",
"id" : 6
} ],
"isTimestamped" : true,
"isWriteMetaData" : false
......@@ -130,7 +137,8 @@
"height" : 12.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "basic_2_density_pso",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -118,7 +118,8 @@
"height" : 12.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "chicken_floorfield_displaced_ok",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -129,7 +129,8 @@
"height" : 60.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "chicken_floorfield_ok",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -139,7 +139,8 @@
"height" : 60.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "corner_waiting_time_processor_test",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -139,7 +139,8 @@
"height" : 18.0
},
"boundingBoxWidth" : 1.0,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "narrow_passage_discrete_CA_fail",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -121,7 +121,8 @@
"height" : 5.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "narrow_passage_nelder_mead_ok",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -137,7 +137,8 @@
"height" : 5.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "narrow_passage_pso_ok",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -137,7 +137,8 @@
"height" : 5.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "queueing_dynamic_floorfield_visual_check",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -112,7 +112,8 @@
"height" : 10.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "regular_wall_discrete_ok",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -128,7 +128,8 @@
"height" : 10.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "regular_wall_nelder_mead_ok",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -128,7 +128,8 @@
"height" : 10.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "regular_wall_pso_ok",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -128,7 +128,8 @@
"height" : 10.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "rimea_01_pathway_discrete_brute_force",
"description" : "numberOfCircles = 4, stepCircleResolution = 30, DISCRETE",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -138,7 +138,8 @@
"height" : 3.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "rimea_01_pathway_discrete_ca",
"description" : "numberOfCircles = 1, stepCircleResolution = 18, DISCRETE",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.PedestrianIdOutputFile",
......@@ -138,7 +138,8 @@
"height" : 3.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......
{
"name" : "rimea_04_flow_osm1_025_d",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_04_flow_osm1_025_up",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_04_flow_osm1_050_d",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_04_flow_osm1_050_h",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +210,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ {
......
{
"name" : "rimea_04_flow_osm1_050_up",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_04_flow_osm1_075_d",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_04_flow_osm1_075_h",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +210,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ {
......
{
"name" : "rimea_04_flow_osm1_075_up",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_04_flow_osm1_100_d",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_04_flow_osm1_100_h",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +210,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ {
......
{
"name" : "rimea_04_flow_osm1_100_up",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_04_flow_osm1_125_d",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_04_flow_osm1_125_h",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +210,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ {
......
{
"name" : "rimea_04_flow_osm1_125_up",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 4.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_04_flow_osm1_470_h",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ {
"type" : "org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile",
......@@ -210,7 +210,8 @@
"height" : 5.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ {
......
{
"name" : "rimea_04_flow_osm1_550_up",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 5.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ ],
"measurementAreas" : [ ],
......
{
"name" : "rimea_05_react",
"description" : "",
"release" : "1.2",
"release" : "1.3",
"processWriters" : {
"files" : [ ],
"processors" : [ {
......@@ -103,7 +103,8 @@
"height" : 6.0
},
"boundingBoxWidth" : 0.5,
"bounded" : true
"bounded" : true,
"referenceCoordinateSystem" : null
},
"obstacles" : [ {
"shape" : {
......