Commit 231f5a4a authored by Benedikt Zoennchen's avatar Benedikt Zoennchen
Browse files

replace doUpdate calls by update calls in data processors.

parent d18a6ba0
......@@ -35,7 +35,7 @@ public class MaxOverlapProcessor extends NoDataKeyProcessor<Double> {
@Override
protected void doUpdate(final SimulationState state) {
//ensure that all required DataProcessors are updated.
this.pedOverlapProc.doUpdate(state);
this.pedOverlapProc.update(state);
}
@Override
......
......@@ -26,7 +26,7 @@ public class MeanPedestrianEvacuationTimeProcessor extends NoDataKeyProcessor<Do
@Override
protected void doUpdate(final SimulationState state) {
//ensure that all required DataProcessors are updated.
this.pedEvacTimeProc.doUpdate(state);
this.pedEvacTimeProc.update(state);
}
@Override
......
......@@ -32,7 +32,7 @@ public class NumberOverlapsProcessor extends NoDataKeyProcessor<Long> {
@Override
protected void doUpdate(final SimulationState state) {
//ensure that all required DataProcessors are updated.
this.pedOverlapProc.doUpdate(state);
this.pedOverlapProc.update(state);
}
@Override
......
......@@ -73,8 +73,8 @@ public class PedestrianFundamentalDiagramAProcessor extends DataProcessor<Timest
deltaSimTime = state.getSimTimeInSec();
}
pedestrianLineCrossProcessor.doUpdate(state);
pedestrianVelocityProcessor.doUpdate(state);
pedestrianLineCrossProcessor.update(state);
pedestrianVelocityProcessor.update(state);
double simTime = state.getSimTimeInSec();
double measureTime = simTime - deltaTime / 2.0;
......
......@@ -67,7 +67,7 @@ public class PedestrianFundamentalDiagramBProcessor extends DataProcessor<Pedest
@Override
protected void doUpdate(SimulationState state) {
pedestrianTrajectoryProcessor.doUpdate(state);
pedestrianTrajectoryProcessor.update(state);
}
@Override
......
......@@ -23,8 +23,6 @@ import java.util.Collection;
@DataProcessorClass()
public class PedestrianTrajectoryProcessor extends DataProcessor<PedestrianIdKey, VTrajectory> {
private static double epsilon = 1.0E-9;
public PedestrianTrajectoryProcessor() {
super("trajectory");
setAttributes(new AttributesPedestrianLineCrossProcessor());
......
......@@ -49,6 +49,8 @@ public class PedestrianVelocityProcessor extends DataProcessor<TimestepPedestria
if (lastSimTimes.size() >= backSteps) {
lastSimTimes.removeLast();
}
lastSimTimes.addFirst(state.getSimTimeInSec());
}
@Override
......
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