Commit a1396962 authored by Jakob Schöttl's avatar Jakob Schöttl

Fix visibility of init method

parent ca33418b
......@@ -2,7 +2,7 @@ package org.vadere.simulator.projects.dataprocessing_mtp;
public class AreaDensityVoronoiProcessor extends AreaDensityProcessor {
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
super.init(attributes, manager);
AttributesAreaDensityVoronoiProcessor att = (AttributesAreaDensityVoronoiProcessor) attributes;
......
......@@ -6,7 +6,7 @@ public abstract class AreaProcessor<V> extends Processor<TimestepDataKey, V> {
private VRectangle measurementArea;
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesAreaProcessor att = (AttributesAreaProcessor) attributes;
this.measurementArea = att.getMeasurementArea();
}
......
......@@ -39,7 +39,7 @@ public class AreaSpeedProcessor extends AreaProcessor<Double> {
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesAreaSpeedProcessor att = (AttributesAreaSpeedProcessor) attributes;
this.pedPosProc = (PedestrianPositionProcessor) manager.getProcessor(att.getPedestrianPositionProcessorId());
this.pedVelProc = (PedestrianVelocityProcessor) manager.getProcessor(att.getPedestrianVelocityProcessorId());
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import org.vadere.simulator.control.SimulationState;
import org.vadere.state.scenario.Pedestrian;
import java.util.Collection;
import java.util.Collections;
import org.vadere.simulator.control.SimulationState;
import org.vadere.state.scenario.Pedestrian;
public class EvacuationTimeProcessor extends Processor<NoDataKey, Double> {
private PedestrianEvacuationTimeProcessor pedEvacTimeProc;
......@@ -30,7 +30,7 @@ public class EvacuationTimeProcessor extends Processor<NoDataKey, Double> {
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesEvacuationTimeProcessor att = (AttributesEvacuationTimeProcessor) attributes;
this.pedEvacTimeProc = (PedestrianEvacuationTimeProcessor) manager.getProcessor(att.getPedestrianEvacuationTimeProcessorId());
}
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import org.vadere.simulator.control.SimulationState;
import java.util.List;
import java.util.stream.Collectors;
import org.vadere.simulator.control.SimulationState;
public class MeanPedestrianEvacuationTimeProcessor extends Processor<NoDataKey, Double> {
private PedestrianEvacuationTimeProcessor pedEvacTimeProc;
......@@ -18,7 +18,7 @@ public class MeanPedestrianEvacuationTimeProcessor extends Processor<NoDataKey,
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesMeanPedestrianEvacuationTimeProcessor att = (AttributesMeanPedestrianEvacuationTimeProcessor) attributes;
this.pedEvacTimeProc = (PedestrianEvacuationTimeProcessor) manager.getProcessor(att.getPedestrianEvacuationTimeProcessorId());
}
......
......@@ -3,7 +3,7 @@ package org.vadere.simulator.projects.dataprocessing_mtp;
public class PedestrianDensityCountingProcessor extends PedestrianDensityProcessor {
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesPedestrianDensityCountingProcessor attDensCountProc =
(AttributesPedestrianDensityCountingProcessor) attributes;
this.setAlgorithm(new PointDensityCountingAlgorithm(attDensCountProc.getRadius()));
......
......@@ -3,7 +3,7 @@ package org.vadere.simulator.projects.dataprocessing_mtp;
public class PedestrianDensityGaussianProcessor extends PedestrianDensityProcessor {
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesPedestrianDensityGaussianProcessor attDensGauss =
(AttributesPedestrianDensityGaussianProcessor) attributes;
this.setAlgorithm(new PointDensityGaussianAlgorithm(attDensGauss.getScale(), attDensGauss.getStandardDerivation(),
......
......@@ -22,7 +22,7 @@ public abstract class PedestrianDensityProcessor extends Processor<TimestepPedes
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesPedestrianDensityProcessor attDensProc = (AttributesPedestrianDensityProcessor) attributes;
this.pedPosProc =
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import java.util.Collection;
import org.vadere.simulator.control.SimulationState;
import org.vadere.state.scenario.Pedestrian;
import java.util.Collection;
public class PedestrianEndTimeProcessor extends Processor<PedestrianIdDataKey, Double> {
public PedestrianEndTimeProcessor() {
super("tend");
......@@ -21,7 +21,7 @@ public class PedestrianEndTimeProcessor extends Processor<PedestrianIdDataKey, D
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
// No initialization needed
}
......
......@@ -27,7 +27,7 @@ public class PedestrianEvacuationTimeProcessor extends Processor<PedestrianIdDat
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesPedestrianEvacuationTimeProcessor att = (AttributesPedestrianEvacuationTimeProcessor) attributes;
this.pedStTimeProc = (PedestrianStartTimeProcessor) manager.getProcessor(att.getPedestrianStartTimeProcessorId());
}
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import org.vadere.simulator.control.SimulationState;
import java.util.Set;
import java.util.stream.Collectors;
import org.vadere.simulator.control.SimulationState;
public class PedestrianFlowProcessor extends Processor<TimestepPedestrianIdDataKey, Double> {
private PedestrianVelocityProcessor pedVelProc;
private PedestrianDensityProcessor pedDensProc;
......@@ -29,7 +29,7 @@ public class PedestrianFlowProcessor extends Processor<TimestepPedestrianIdDataK
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesPedestrianFlowProcessor att = (AttributesPedestrianFlowProcessor) attributes;
this.pedVelProc = (PedestrianVelocityProcessor) manager.getProcessor(att.getPedestrianVelocityProcessorId());
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import java.util.Map;
import org.vadere.simulator.control.SimulationState;
import org.vadere.util.geometry.shapes.VPoint;
import java.util.Map;
public class PedestrianLastPositionProcessor extends Processor<PedestrianIdDataKey, VPoint> {
private PedestrianPositionProcessor pedPosProc;
......@@ -22,7 +22,7 @@ public class PedestrianLastPositionProcessor extends Processor<PedestrianIdDataK
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesPedestrianLastPositionProcessor attLastPosProc =
(AttributesPedestrianLastPositionProcessor) attributes;
this.pedPosProc =
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import java.util.Collection;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.models.Model;
import org.vadere.simulator.models.osm.OptimalStepsModel;
import org.vadere.state.scenario.Pedestrian;
import java.util.Collection;
public class PedestrianOSMStrideLengthProcessor extends Processor<TimestepPedestrianIdDataKey, Double> {
private OptimalStepsModel osm;
......@@ -24,7 +24,7 @@ public class PedestrianOSMStrideLengthProcessor extends Processor<TimestepPedest
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
Model model = manager.getModel();
if (model instanceof OptimalStepsModel)
this.osm = (OptimalStepsModel) model;
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import java.util.Map;
import org.vadere.simulator.control.SimulationState;
import org.vadere.util.geometry.shapes.VPoint;
import java.util.Map;
public class PedestrianOverlapProcessor extends Processor<TimestepPedestrianIdDataKey, Integer> {
private double pedRadius;
......@@ -20,7 +20,7 @@ public class PedestrianOverlapProcessor extends Processor<TimestepPedestrianIdDa
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesPedestrianOverlapProcessor att = (AttributesPedestrianOverlapProcessor) attributes;
this.pedRadius = att.getPedRadius();
......
......@@ -33,7 +33,7 @@ public class PedestrianPositionProcessor extends Processor<TimestepPedestrianIdD
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {}
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {}
@Override
public String[] toStrings(TimestepPedestrianIdDataKey key) {
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import java.util.Collection;
import org.vadere.simulator.control.SimulationState;
import org.vadere.state.scenario.Pedestrian;
import java.util.Collection;
public class PedestrianSourceIdProcessor extends Processor<PedestrianIdDataKey, Integer> {
public PedestrianSourceIdProcessor() {
......@@ -19,7 +19,7 @@ public class PedestrianSourceIdProcessor extends Processor<PedestrianIdDataKey,
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
// No initialization needed
}
}
......@@ -18,7 +18,7 @@ public class PedestrianStartTimeProcessor extends Processor<PedestrianIdDataKey,
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
// No initialization needed
}
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import java.util.Collection;
import org.vadere.simulator.control.SimulationState;
import org.vadere.state.scenario.Pedestrian;
import java.util.Collection;
public class PedestrianTargetIdProcessor extends Processor<TimestepPedestrianIdDataKey, Integer> {
public PedestrianTargetIdProcessor() {
......@@ -20,7 +20,7 @@ public class PedestrianTargetIdProcessor extends Processor<TimestepPedestrianIdD
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
// No initialization needed
}
}
package org.vadere.simulator.projects.dataprocessing_mtp;
import java.util.*;
import java.util.LinkedList;
import java.util.stream.Stream;
import org.vadere.simulator.control.SimulationState;
......@@ -36,7 +36,7 @@ public class PedestrianVelocityProcessor extends Processor<TimestepPedestrianIdD
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesVelocityProcessor attVelProc = (AttributesVelocityProcessor) attributes;
this.pedPosProc =
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import java.util.Map;
import org.vadere.simulator.control.SimulationState;
import org.vadere.util.geometry.shapes.VPoint;
import org.vadere.util.geometry.shapes.VRectangle;
import java.util.Map;
public class PedestrianWaitingEndTimeProcessor extends Processor<PedestrianIdDataKey, Double> {
private VRectangle waitingArea;
......@@ -29,7 +29,7 @@ public class PedestrianWaitingEndTimeProcessor extends Processor<PedestrianIdDat
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesPedestrianWaitingEndTimeProcessor att = (AttributesPedestrianWaitingEndTimeProcessor) attributes;
this.waitingArea = att.getWaitingArea();
}
......
package org.vadere.simulator.projects.dataprocessing_mtp;
import java.util.Map;
import org.vadere.simulator.control.SimulationState;
import org.vadere.util.geometry.shapes.VPoint;
import org.vadere.util.geometry.shapes.VRectangle;
import java.util.Map;
public class PedestrianWaitingTimeProcessor extends Processor<PedestrianIdDataKey, Double> {
private double lastSimTime;
private VRectangle waitingArea;
......@@ -36,7 +36,7 @@ public class PedestrianWaitingTimeProcessor extends Processor<PedestrianIdDataKe
}
@Override
void init(final AttributesProcessor attributes, final ProcessorManager manager) {
public void init(final AttributesProcessor attributes, final ProcessorManager manager) {
AttributesPedestrianWaitingTimeProcessor att = (AttributesPedestrianWaitingTimeProcessor) attributes;
this.waitingArea = att.getWaitingArea();
}
......
......@@ -81,7 +81,7 @@ public abstract class Processor<K extends Comparable<K>, V> {
public void postLoop(final SimulationState state) { }
abstract void init(final AttributesProcessor attributes, final ProcessorManager manager);
public abstract void init(final AttributesProcessor attributes, final ProcessorManager manager);
public String[] toStrings(final K key) {
return new String[] { this.hasValue(key) ? this.getValue(key).toString() : "NaN" };
......
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