Commit c6dcfe8e authored by Daniel Lehmberg's avatar Daniel Lehmberg
Browse files

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

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