The expiration time for new job artifacts in CI/CD pipelines is now 30 days (GitLab default). Previously generated artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

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

change pedestrian position processor to more accurate position using FootStep (interpolated)

parent c6dcfe8e
Pipeline #146601 failed with stages
in 1 minute and 23 seconds
......@@ -189,7 +189,7 @@ public class PedestrianBHM extends Pedestrian {
throw new UnsupportedEventException(mostImportantEvent, this.getClass());
}
getTrajectory().add(new FootStep(position, getPosition(), timeOfNextStep, timeOfNextStep + durationNextStep));
addFootStepToTrajectory(new FootStep(position, getPosition(), timeOfNextStep, timeOfNextStep + durationNextStep));
}
/**
......
......@@ -110,7 +110,7 @@ public class BiomechanicsModel implements MainModel {
for(int i = 0; i < pedestriansBMM.size(); i++) {
PedestrianBMM agent = pedestriansBMM.get(i);
agent.clearFootSteps();
agent.getTrajectory().add(new FootStep(positions.get(i), agent.getPosition(), lastSimTimeInSec, simTimeInSec));
agent.addFootStepToTrajectory(new FootStep(positions.get(i), agent.getPosition(), lastSimTimeInSec, simTimeInSec));
}
this.lastSimTimeInSec = simTimeInSec;
......
......@@ -128,7 +128,7 @@ public abstract class ODEModel<T extends DynamicElement, TAttributes extends Att
if (element.getType() == ScenarioElementType.PEDESTRIAN) {
Pedestrian pedestrian = (Pedestrian)element;
pedestrian.clearFootSteps();
pedestrian.getTrajectory().add(new FootStep(positions.get(i), pedestrian.getPosition(), lastSimTimeInSec, simTimeInSec));
pedestrian.addFootStepToTrajectory(new FootStep(positions.get(i), pedestrian.getPosition(), lastSimTimeInSec, simTimeInSec));
}
}
}
......
......@@ -78,7 +78,7 @@ public class OSMBehaviorController {
// strides and foot steps have no influence on the simulation itself, i.e. they are saved to analyse trajectories
pedestrian.getStrides().add(Pair.of(currentPosition.distance(nextPosition), stepStartTime));
pedestrian.getTrajectory().add(new FootStep(currentPosition, nextPosition, stepStartTime, stepEndTime));
pedestrian.addFootStepToTrajectory(new FootStep(currentPosition, nextPosition, stepStartTime, stepEndTime));
}
public void wait(PedestrianOSM pedestrian) {
......
......@@ -134,7 +134,7 @@ public interface UpdateSchemeOSM extends DynamicElementRemoveListener<Pedestrian
* strides and foot steps have no influence on the simulation itself, i.e. they are saved to analyse trajectories
*/
pedestrian.getStrides().add(Pair.of(currentPosition.distance(nextPosition), timeOfNextStep));
pedestrian.getTrajectory().add(new FootStep(currentPosition, nextPosition, timeOfNextStep, entTimeOfStep));
pedestrian.addFootStepToTrajectory(new FootStep(currentPosition, nextPosition, timeOfNextStep, entTimeOfStep));
}
}
......@@ -44,7 +44,7 @@ public class PedestrianReynolds extends Pedestrian {
setPosition(newPosition);
clearFootSteps();
// TODO: the first footstep starts at the wrong time!
getTrajectory().add(new FootStep(oldPosition, newPosition, lastSimTimeInSec, simTime));
addFootStepToTrajectory(new FootStep(oldPosition, newPosition, lastSimTimeInSec, simTime));
lastSimTimeInSec = simTime;
}
......
......@@ -24,10 +24,11 @@ public abstract class PedestrianDensityProcessor extends DataProcessor<TimestepP
@Override
public void doUpdate(final SimulationState state) {
this.pedPosProc.update(state);
double simTime = state.getSimTimeInSec();
state.getTopography().getElements(Pedestrian.class).stream()
.forEach(ped -> this.putValue(new TimestepPedestrianIdKey(state.getStep(), ped.getId()),
this.densAlg.getDensity(ped.getPosition(), state)));
state.getTopography().getElements(Pedestrian.class).stream().
forEach(ped -> this.putValue(new TimestepPedestrianIdKey(state.getStep(), ped.getId()),
this.densAlg.getDensity(ped.getInterpolatedFootStepPosition(simTime), state)));
}
@Override
......
......@@ -7,8 +7,10 @@ import org.vadere.simulator.projects.dataprocessing.datakey.PedestrianIdKey;
import org.vadere.simulator.projects.dataprocessing.datakey.TimestepKey;
import org.vadere.simulator.projects.dataprocessing.datakey.TimestepPedestrianIdKey;
import org.vadere.state.scenario.Pedestrian;
import org.vadere.state.simulation.FootStep;
import org.vadere.util.geometry.shapes.VPoint;
import java.util.Collection;
import java.util.Map;
import java.util.stream.Collectors;
......@@ -30,9 +32,15 @@ public class PedestrianPositionProcessor extends DataProcessor<TimestepPedestria
@Override
protected void doUpdate(final SimulationState state) {
// This does not work currently, bcause of the mocking in the tests.
// Collection<Pedestrian> pedestrians = state.getTopography().getPedestrianDynamicElements().getElements();
Collection<Pedestrian> pedestrians = state.getTopography().getElements(Pedestrian.class);
Integer timeStep = state.getStep();
for (Pedestrian p : state.getTopography().getElements(Pedestrian.class)) {
this.putValue(new TimestepPedestrianIdKey(timeStep, p.getId()), p.getPosition());
double simTime = state.getSimTimeInSec();
for (Pedestrian pedestrian : pedestrians){
VPoint interpolatedPoint = pedestrian.getInterpolatedFootStepPosition(simTime);
this.putValue(new TimestepPedestrianIdKey(timeStep, pedestrian.getId()), interpolatedPoint);
}
}
......
......@@ -21,11 +21,15 @@ public class PointDensityCountingAlgorithm extends PointDensityAlgorithm {
}
@Override
public double getDensity(VPoint pos, SimulationState state) {
public double getDensity(VPoint densityEvalPosition, SimulationState state) {
int numberOfPedsInCircle = 0;
double simTimeSeconds = state.getSimTimeInSec();
for (Pedestrian ped : state.getTopography().getElements(Pedestrian.class)) {
if (pos.distance(ped.getPosition()) < this.radius) {
VPoint pedestrianPosition = ped.getInterpolatedFootStepPosition(simTimeSeconds);
if (densityEvalPosition.distance(pedestrianPosition) < this.radius) {
numberOfPedsInCircle++;
}
}
......
......@@ -288,7 +288,7 @@ public class TrajectoryReader {
if(stridesIndex != NOT_SET_COLUMN_INDEX_IDENTIFIER) {
FootStep[] footSteps = StateJsonConverter.deserializeObjectFromJson(rowTokens[stridesIndex], FootStep[].class);
for(FootStep footStep : footSteps) {
ped.getTrajectory().add(footStep);
ped.addFootStepToTrajectory(footStep);
}
}
......
......@@ -7,6 +7,8 @@ import org.vadere.state.attributes.processor.AttributesAreaSpeedProcessor;
import org.vadere.state.attributes.scenario.AttributesMeasurementArea;
import org.vadere.state.scenario.MeasurementArea;
import org.vadere.state.scenario.Pedestrian;
import org.vadere.state.simulation.FootStep;
import org.vadere.state.simulation.VTrajectory;
import org.vadere.util.geometry.shapes.VPoint;
import org.vadere.util.geometry.shapes.VRectangle;
......@@ -49,9 +51,19 @@ public class AreaSpeedProcessorTestEnv extends ProcessorTestEnv<TimestepKey, Dou
addSimState(new SimulationStateMock(1) {
@Override
public void mockIt() {
b.clear().add(1, new VPoint(1.0, 0.0))
.add(2, new VPoint(0.0, 0.0))
.add(3, new VPoint(7.0, 4.0)); //not in area
VTrajectory traj1 = new VTrajectory();
VTrajectory traj2 = new VTrajectory();
VTrajectory traj3 = new VTrajectory();
//trajectoryID
traj1.add(new FootStep(new VPoint(1,0), new VPoint(1,0), 0, 1));
traj2.add(new FootStep(new VPoint(0,0), new VPoint(0,0), 0, 1));
traj3.add(new FootStep(new VPoint(7,4), new VPoint(7,4), 0, 1));
b.clear().add(1, traj1)
.add(2, traj2)
.add(3, traj3); //not in area
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
when(state.getSimTimeInSec()).thenReturn(0.0);
......@@ -64,9 +76,18 @@ public class AreaSpeedProcessorTestEnv extends ProcessorTestEnv<TimestepKey, Dou
addSimState(new SimulationStateMock(2) {
@Override
public void mockIt() {
b.clear().add(1, new VPoint(1.0, 1.0)) //dist = 1.0
.add(2, new VPoint(3.0, 4.0)) //dist = 5.0
.add(3, new VPoint(8.0, 4.0)); //not in area
VTrajectory traj1 = new VTrajectory();
VTrajectory traj2 = new VTrajectory();
VTrajectory traj3 = new VTrajectory();
traj1.add(new FootStep(new VPoint(1,1), new VPoint(1,1), 1, 2.0));
traj2.add(new FootStep(new VPoint(3,4), new VPoint(3,4), 1, 2.0));
traj3.add(new FootStep(new VPoint(8,4), new VPoint(8,4), 1, 2.0));
b.clear().add(1, traj1) //dist = 1.0
.add(2, traj2) //dist = 5.0
.add(3, traj3); //not in area
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
double simTime = 1.0;
......@@ -82,9 +103,18 @@ public class AreaSpeedProcessorTestEnv extends ProcessorTestEnv<TimestepKey, Dou
addSimState(new SimulationStateMock(3) {
@Override
public void mockIt() {
b.clear().add(1, new VPoint(3.0, 1.0)) //dist = 2.0
.add(2, new VPoint(5.0, 4.0)) //not in area
.add(3, new VPoint(8.0, 8.0)); //not in area
VTrajectory traj1 = new VTrajectory();
VTrajectory traj2 = new VTrajectory();
VTrajectory traj3 = new VTrajectory();
traj1.add(new FootStep(new VPoint(3,1), new VPoint(3,1), 1.0, 2.0));
traj2.add(new FootStep(new VPoint(5,4), new VPoint(5,4), 1.0, 2.0));
traj3.add(new FootStep(new VPoint(8,8), new VPoint(8,8), 1.0, 2.0));
b.clear().add(1, traj1) //dist = 2.0
.add(2, traj2) //not in area
.add(3, traj3); //not in area
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
double simTime = 2.0;
......@@ -100,9 +130,18 @@ public class AreaSpeedProcessorTestEnv extends ProcessorTestEnv<TimestepKey, Dou
addSimState(new SimulationStateMock(4) {
@Override
public void mockIt() {
b.clear().add(1, new VPoint(6.0, 1.0)) // not in area
.add(2, new VPoint(7.0, 4.0)) // not in area
.add(3, new VPoint(9.0, 8.0)); // not in area
VTrajectory traj1 = new VTrajectory();
VTrajectory traj2 = new VTrajectory();
VTrajectory traj3 = new VTrajectory();
traj1.add(new FootStep(new VPoint(6,1), new VPoint(6,1), 2, 3.0));
traj2.add(new FootStep(new VPoint(7,4), new VPoint(7,4), 2, 3.0));
traj3.add(new FootStep(new VPoint(9,8), new VPoint(9,8), 2, 3.0));
b.clear().add(1, traj1) // not in area
.add(2, traj2) // not in area
.add(3, traj3); // not in area
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
double simTime = 3.0;
......
......@@ -5,6 +5,8 @@ import org.vadere.simulator.projects.dataprocessing.datakey.TimestepPedestrianId
import org.vadere.simulator.utils.PedestrianListBuilder;
import org.vadere.state.attributes.processor.AttributesPedestrianDensityCountingProcessor;
import org.vadere.state.scenario.Pedestrian;
import org.vadere.state.simulation.FootStep;
import org.vadere.state.simulation.VTrajectory;
import org.vadere.util.geometry.shapes.VPoint;
import java.util.ArrayList;
......@@ -43,13 +45,23 @@ public class PedestrianDensityCountingProcessorTestEnv extends ProcessorTestEnv<
@Override
public void mockIt() {
b.clear().add(1, new VPoint(1.0, 1.0));
b.add(2, new VPoint(1.2, 1.2));
b.add(3, new VPoint(1.4, 1.4));
VTrajectory traj1 = new VTrajectory().add(new FootStep(new VPoint(1,1), new VPoint(1,1), 0,0));
VTrajectory traj2 = new VTrajectory().add(new FootStep(new VPoint(1.2,1.2), new VPoint(1.2,1.2), 0,0));
VPoint p = new VPoint(1.4, 1.4);
p = p.addPrecise(new VPoint(Math.sqrt(radius) - 0.001, Math.sqrt(radius) - 0.001));
b.add(4, p);
b.add(5, new VPoint(10.0, 10.0));
VPoint pPrecise = p.clone().addPrecise(new VPoint(Math.sqrt(radius) - 0.001, Math.sqrt(radius) - 0.001));
VTrajectory traj3 = new VTrajectory().add(new FootStep(p, p, 0,0));
VTrajectory traj4 = new VTrajectory().add(new FootStep(pPrecise, pPrecise, 0,0));
VTrajectory traj5 = new VTrajectory().add(new FootStep(new VPoint(10,10), new VPoint(10,10), 0,0));
b.clear().add(1, traj1);
b.add(2, traj2);
b.add(3, traj3);
b.add(4, traj4);
b.add(5, traj5);
Mockito.when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
int step = state.getStep();
......
......@@ -6,6 +6,8 @@ import org.vadere.simulator.utils.PedestrianListBuilder;
import org.vadere.state.attributes.processor.AttributesPedestrianDensityCountingProcessor;
import org.vadere.state.attributes.processor.AttributesPedestrianFlowProcessor;
import org.vadere.state.scenario.Pedestrian;
import org.vadere.state.simulation.FootStep;
import org.vadere.state.simulation.VTrajectory;
import org.vadere.util.geometry.shapes.VPoint;
import java.util.ArrayList;
......@@ -49,13 +51,23 @@ public class PedestrianFlowProcessorTestEnv extends ProcessorTestEnv<TimestepPed
addSimState(new SimulationStateMock(1) {
@Override
public void mockIt() {
b.clear().add(1, new VPoint(1.0, 1.0));
b.add(2, new VPoint(1.2, 1.2));
b.add(3, new VPoint(1.4, 1.4));
VTrajectory traj1 = new VTrajectory().add(new FootStep(new VPoint(1,1), new VPoint(1,1), 0,0));
VTrajectory traj2 = new VTrajectory().add(new FootStep(new VPoint(1.2,1.2), new VPoint(1.2,1.2), 0,0));
VPoint p = new VPoint(1.4, 1.4);
p = p.addPrecise(new VPoint(Math.sqrt(radius) - 0.001, Math.sqrt(radius) - 0.001));
b.add(4, p);
b.add(5, new VPoint(10.0, 10.0));
VPoint pPrecise = p.clone().addPrecise(new VPoint(Math.sqrt(radius) - 0.001, Math.sqrt(radius) - 0.001));
VTrajectory traj3 = new VTrajectory().add(new FootStep(p, p, 0,0));
VTrajectory traj4 = new VTrajectory().add(new FootStep(pPrecise, pPrecise, 0,0));
VTrajectory traj5 = new VTrajectory().add(new FootStep(new VPoint(10,10), new VPoint(10,10), 0,0));
b.clear().add(1, traj1);
b.add(2, traj2);
b.add(3, traj3);
b.add(4, traj4);
b.add(5, traj5);
Mockito.when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
Mockito.when(state.getSimTimeInSec()).thenReturn(0.0);
......@@ -76,14 +88,38 @@ public class PedestrianFlowProcessorTestEnv extends ProcessorTestEnv<TimestepPed
addSimState(new SimulationStateMock(2) {
@Override
public void mockIt() {
VPoint mov = new VPoint(3.0, 4.0); //dist = 5 time = 1 -> 5ms^-1
b.clear().add(1, new VPoint(1.0, 1.0).addPrecise(mov));
b.add(2, new VPoint(1.2, 1.2).addPrecise(mov));
b.add(3, new VPoint(1.4, 1.4).addPrecise(mov));
VTrajectory traj1 = new VTrajectory().add(
new FootStep(
new VPoint(1,1).addPrecise(mov),
new VPoint(1,1).addPrecise(mov), 1,1));
VTrajectory traj2 = new VTrajectory().add(
new FootStep(
new VPoint(1.2,1.2).addPrecise(mov),
new VPoint(1.2,1.2).addPrecise(mov), 1,1));
VPoint p = new VPoint(1.4, 1.4);
p = p.addPrecise(new VPoint(Math.sqrt(radius) - 0.001, Math.sqrt(radius) - 0.001));
b.add(4, p.addPrecise(mov));
b.add(5, new VPoint(10.0, 10.0).addPrecise(mov));
VPoint pPrecise = p.clone().addPrecise(
new VPoint(Math.sqrt(radius) - 0.001, Math.sqrt(radius) - 0.001));
VTrajectory traj3 = new VTrajectory().add(
new FootStep(p.addPrecise(mov), p.addPrecise(mov), 1,1));
VTrajectory traj4 = new VTrajectory().add(
new FootStep(pPrecise.addPrecise(mov), pPrecise.addPrecise(mov), 1,1));
VTrajectory traj5 = new VTrajectory().add(
new FootStep(new VPoint(10,10).addPrecise(mov), new VPoint(10,10).addPrecise(mov), 1,1));
b.clear().add(1, traj1);
b.add(2, traj2);
b.add(3, traj3);
b.add(4, traj4);
b.add(5, traj5);
Mockito.when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
Mockito.when(state.getSimTimeInSec()).thenReturn(1.0);
......
......@@ -4,6 +4,8 @@ import org.vadere.simulator.projects.dataprocessing.datakey.PedestrianIdKey;
import org.vadere.simulator.utils.PedestrianListBuilder;
import org.vadere.state.attributes.processor.AttributesPedestrianLastPositionProcessor;
import org.vadere.state.scenario.Pedestrian;
import org.vadere.state.simulation.FootStep;
import org.vadere.state.simulation.VTrajectory;
import org.vadere.util.geometry.shapes.VPoint;
import java.util.ArrayList;
......@@ -36,9 +38,13 @@ public class PedestrianLastPositionProcessorTestEnv extends ProcessorTestEnv<Ped
@Override
public void mockIt() {
b.clear().add(1, new VPoint(1.0, 1.2))
.add(3, new VPoint(4.45, 1.2))
.add(5, new VPoint(3.546, 7.2342));
VTrajectory traj1 = new VTrajectory().add(new FootStep(new VPoint(1.0, 1.2), new VPoint(1.0, 1.2), 0,0));
VTrajectory traj3 = new VTrajectory().add(new FootStep(new VPoint(4.45, 1.2), new VPoint(4.45, 1.2), 0,0));
VTrajectory traj5 = new VTrajectory().add(new FootStep(new VPoint(3.546, 7.2342), new VPoint(3.546, 7.2342), 0,0));
b.clear().add(1, traj1)
.add(3, traj3)
.add(5, traj5);
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
addToExpectedOutput(new PedestrianIdKey(1), new VPoint(1.0, 1.2));
......@@ -51,9 +57,14 @@ public class PedestrianLastPositionProcessorTestEnv extends ProcessorTestEnv<Ped
addSimState(new SimulationStateMock(2) {
@Override
public void mockIt() {
b.clear().add(1, new VPoint(33.2, 3.22))
.add(3, new VPoint(3.2, 22.3))
.add(7, new VPoint(1.2, 3.3));
VTrajectory traj1 = new VTrajectory().add(new FootStep(new VPoint(33.2, 3.22), new VPoint(33.2, 3.22), 0,0));
VTrajectory traj3 = new VTrajectory().add(new FootStep(new VPoint(3.2, 22.3), new VPoint(3.2, 22.3), 0,0));
VTrajectory traj7 = new VTrajectory().add(new FootStep(new VPoint(1.2, 3.3), new VPoint(1.2, 3.3), 0,0));
b.clear().add(1, traj1)
.add(3, traj3)
.add(7, traj7);
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
//overwrite Values!
......
......@@ -3,6 +3,8 @@ package org.vadere.simulator.projects.dataprocessing.processor;
import org.vadere.simulator.projects.dataprocessing.datakey.TimestepPedestrianIdKey;
import org.vadere.simulator.utils.PedestrianListBuilder;
import org.vadere.state.scenario.Pedestrian;
import org.vadere.state.simulation.FootStep;
import org.vadere.state.simulation.VTrajectory;
import org.vadere.util.geometry.shapes.VPoint;
import java.util.ArrayList;
......@@ -39,9 +41,18 @@ public class PedestrianPositionProcessorTestEnv extends ProcessorTestEnv<Timeste
public void mockIt() {
when(state.getStep()).thenReturn(1);
b.clear().add(1, new VPoint(1.435346, 1.0))
.add(2, new VPoint(2.0, 2.0))
.add(3, new VPoint(3.0, 3.0));
VTrajectory traj1 = new VTrajectory();
VTrajectory traj2 = new VTrajectory();
VTrajectory traj3 = new VTrajectory();
traj1.add(new FootStep(new VPoint(0,0 ), new VPoint(0,1), 0, 0.4));
traj2.add(new FootStep(new VPoint(0,0 ), new VPoint(1,0), 0, 0.2));
traj3.add(new FootStep(new VPoint(0,0 ), new VPoint(1,1), 0, 1.));
b.clear().add(1, traj1)
.add(2, traj2)
.add(3, traj3);
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
addToExpectedOutput(state.getStep(), b.getList());
......@@ -52,9 +63,18 @@ public class PedestrianPositionProcessorTestEnv extends ProcessorTestEnv<Timeste
@Override
public void mockIt() {
when(state.getStep()).thenReturn(2);
b.clear().add(4, new VPoint(1.0, 1.0))
.add(2, new VPoint(5.0, 5.0))
.add(3, new VPoint(6.0, 6.0));
VTrajectory traj1 = new VTrajectory();
VTrajectory traj2 = new VTrajectory();
VTrajectory traj3 = new VTrajectory();
traj1.add(new FootStep(new VPoint(0,0 ), new VPoint(0,1), 0, 0.4));
traj2.add(new FootStep(new VPoint(0,0 ), new VPoint(1,0), 0, 0.2));
traj3.add(new FootStep(new VPoint(0,0 ), new VPoint(1,1), 0, 1.));
b.clear().add(4, traj1)
.add(5, traj2)
.add(6, traj3);
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
addToExpectedOutput(state.getStep(), b.getList());
}
......@@ -64,7 +84,11 @@ public class PedestrianPositionProcessorTestEnv extends ProcessorTestEnv<Timeste
@Override
public void mockIt() {
when(state.getStep()).thenReturn(3);
b.clear().add(4, new VPoint(5.0, 5.0));
VTrajectory traj1 = new VTrajectory();
traj1.add(new FootStep(new VPoint(0,0 ), new VPoint(1,1), 0, 1.));
b.clear().add(7, traj1);
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
addToExpectedOutput(state.getStep(), b.getList());
}
......
......@@ -4,6 +4,8 @@ import org.vadere.simulator.projects.dataprocessing.datakey.TimestepPedestrianId
import org.vadere.simulator.utils.PedestrianListBuilder;
import org.vadere.state.attributes.processor.AttributesPedestrianVelocityProcessor;
import org.vadere.state.scenario.Pedestrian;
import org.vadere.state.simulation.FootStep;
import org.vadere.state.simulation.VTrajectory;
import org.vadere.util.geometry.shapes.VPoint;
import java.util.ArrayList;
......@@ -44,9 +46,14 @@ public class PedestrianVelocityProcessorTestEnv extends ProcessorTestEnv<Timeste
@Override
public void mockIt() {
b.clear().add(1, new VPoint(1.0, 1.0))
.add(2, new VPoint(2.3, 2.3))
.add(3, new VPoint(5.7, 3.3));
VTrajectory traj1 = new VTrajectory().add(new FootStep(new VPoint(1,1), new VPoint(1,1), 0,0));
VTrajectory traj2 = new VTrajectory().add(new FootStep(new VPoint(2.3,2.3), new VPoint(2.3,2.3), 0,0));
VTrajectory traj3 = new VTrajectory().add(new FootStep(new VPoint(5.7,3.3), new VPoint(5.7,3.3), 0,0));
b.clear().add(1, traj1)
.add(2, traj2)
.add(3, traj3);
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
when(state.getSimTimeInSec()).thenReturn(0.0);
......@@ -63,9 +70,14 @@ public class PedestrianVelocityProcessorTestEnv extends ProcessorTestEnv<Timeste
@Override
public void mockIt() {
b.clear().add(1, new VPoint(1.5, 1.0))
.add(2, new VPoint(5.3, 6.3))
.add(3, new VPoint(5.7, 3.3));
VTrajectory traj1 = new VTrajectory().add(new FootStep(new VPoint(1.5,1.0), new VPoint(1.5,1.0), 1,1));
VTrajectory traj2 = new VTrajectory().add(new FootStep(new VPoint(5.3,6.3), new VPoint(5.3,6.3), 1,1));
VTrajectory traj3 = new VTrajectory().add(new FootStep(new VPoint(5.7,3.3), new VPoint(5.7,3.3), 1,1));
b.clear().add(1, traj1)
.add(2, traj2)
.add(3, traj3);
when(state.getTopography().getElements(Pedestrian.class)).thenReturn(b.getList());
when(state.getSimTimeInSec()).thenReturn(1.0);
......@@ -82,9 +94,13 @@ public class PedestrianVelocityProcessorTestEnv extends ProcessorTestEnv<Timeste
@Override
public void mockIt() {
b.clear().add(1, new VPoint(1.5, 1.0))
.add(2, new VPoint(5.3, 6.3))
.add(3, new VPoint(5.7, 3.3));
VTrajectory traj1 = new VTrajectory().add(new FootStep(new VPoint(1.5,1.0), new VPoint(1.5,1.0), 2,2));
VTrajectory traj2 = new VTrajectory().add(new FootStep(new VPoint(5.3,6.3), new VPoint(5.3,6.3), 2,2));
VTrajectory traj3 = new VTrajectory().add(new FootStep(new VPoint(5.7,3.3), new VPoint(5.7,3.3), 2,2));
b.clear().add(1, traj1)
.add(2, traj2)
.add(3, traj3);