Commit 7abc786b authored by Mario Teixeira Parente's avatar Mario Teixeira Parente
Browse files

Rename 'Processor' base class to 'DataProcessor'

parent a2e6a08b
......@@ -9,7 +9,7 @@ import org.vadere.state.scenario.Pedestrian;
import java.util.Collection;
import java.util.Collections;
public class EvacuationTimeProcessor extends Processor<NoDataKey, Double> {
public class EvacuationTimeProcessor extends DataProcessor<NoDataKey, Double> {
private PedestrianEvacuationTimeProcessor pedEvacTimeProc;
public EvacuationTimeProcessor() {
......
......@@ -8,7 +8,7 @@ import org.vadere.state.attributes.processor.AttributesMeanPedestrianEvacuationT
import java.util.List;
import java.util.stream.Collectors;
public class MeanPedestrianEvacuationTimeProcessor extends Processor<NoDataKey, Double> {
public class MeanPedestrianEvacuationTimeProcessor extends DataProcessor<NoDataKey, Double> {
private PedestrianEvacuationTimeProcessor pedEvacTimeProc;
public MeanPedestrianEvacuationTimeProcessor() {
......
......@@ -6,7 +6,7 @@ import org.vadere.simulator.projects.dataprocessing.datakey.TimestepPedestrianId
import org.vadere.state.attributes.processor.AttributesPedestrianDensityProcessor;
import org.vadere.state.scenario.Pedestrian;
public abstract class PedestrianDensityProcessor extends Processor<TimestepPedestrianIdDataKey, Double> {
public abstract class PedestrianDensityProcessor extends DataProcessor<TimestepPedestrianIdDataKey, Double> {
private PedestrianPositionProcessor pedPosProc;
private IPointDensityAlgorithm densAlg;
......
......@@ -7,7 +7,7 @@ import org.vadere.state.scenario.Pedestrian;
import java.util.Collection;
public class PedestrianEndTimeProcessor extends Processor<PedestrianIdDataKey, Double> {
public class PedestrianEndTimeProcessor extends DataProcessor<PedestrianIdDataKey, Double> {
public PedestrianEndTimeProcessor() {
super("tend");
}
......
......@@ -6,7 +6,7 @@ import org.vadere.simulator.projects.dataprocessing.datakey.PedestrianIdDataKey;
import org.vadere.state.attributes.processor.AttributesPedestrianEvacuationTimeProcessor;
import org.vadere.state.scenario.Pedestrian;
public class PedestrianEvacuationTimeProcessor extends Processor<PedestrianIdDataKey, Double> {
public class PedestrianEvacuationTimeProcessor extends DataProcessor<PedestrianIdDataKey, Double> {
private PedestrianStartTimeProcessor pedStTimeProc;
public PedestrianEvacuationTimeProcessor() {
......
......@@ -8,7 +8,7 @@ import org.vadere.state.attributes.processor.AttributesPedestrianFlowProcessor;
import java.util.Set;
import java.util.stream.Collectors;
public class PedestrianFlowProcessor extends Processor<TimestepPedestrianIdDataKey, Double> {
public class PedestrianFlowProcessor extends DataProcessor<TimestepPedestrianIdDataKey, Double> {
private PedestrianVelocityProcessor pedVelProc;
private PedestrianDensityProcessor pedDensProc;
......
......@@ -9,7 +9,7 @@ import org.vadere.util.geometry.shapes.VPoint;
import java.util.Map;
public class PedestrianLastPositionProcessor extends Processor<PedestrianIdDataKey, VPoint> {
public class PedestrianLastPositionProcessor extends DataProcessor<PedestrianIdDataKey, VPoint> {
private PedestrianPositionProcessor pedPosProc;
public PedestrianLastPositionProcessor() {
......
......@@ -9,7 +9,7 @@ import org.vadere.state.scenario.Pedestrian;
import java.util.Collection;
public class PedestrianOSMStrideLengthProcessor extends Processor<TimestepPedestrianIdDataKey, Double> {
public class PedestrianOSMStrideLengthProcessor extends DataProcessor<TimestepPedestrianIdDataKey, Double> {
private OptimalStepsModel osm;
public PedestrianOSMStrideLengthProcessor() {
......
......@@ -8,7 +8,7 @@ import org.vadere.util.geometry.shapes.VPoint;
import java.util.Map;
public class PedestrianOverlapProcessor extends Processor<TimestepPedestrianIdDataKey, Integer> {
public class PedestrianOverlapProcessor extends DataProcessor<TimestepPedestrianIdDataKey, Integer> {
private double pedRadius;
public PedestrianOverlapProcessor() {
......
......@@ -11,7 +11,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.stream.Collectors;
public class PedestrianPositionProcessor extends Processor<TimestepPedestrianIdDataKey, VPoint> {
public class PedestrianPositionProcessor extends DataProcessor<TimestepPedestrianIdDataKey, VPoint> {
public PedestrianPositionProcessor() {
super("x", "y");
......
......@@ -7,7 +7,7 @@ import org.vadere.state.scenario.Pedestrian;
import java.util.Collection;
public class PedestrianSourceIdProcessor extends Processor<PedestrianIdDataKey, Integer> {
public class PedestrianSourceIdProcessor extends DataProcessor<PedestrianIdDataKey, Integer> {
public PedestrianSourceIdProcessor() {
super("sid");
......
......@@ -7,7 +7,7 @@ import org.vadere.state.scenario.Pedestrian;
import java.util.Set;
public class PedestrianStartTimeProcessor extends Processor<PedestrianIdDataKey, Double> {
public class PedestrianStartTimeProcessor extends DataProcessor<PedestrianIdDataKey, Double> {
public PedestrianStartTimeProcessor() {
super("tstart");
......
......@@ -7,7 +7,7 @@ import org.vadere.state.scenario.Pedestrian;
import java.util.Collection;
public class PedestrianTargetIdProcessor extends Processor<TimestepPedestrianIdDataKey, Integer> {
public class PedestrianTargetIdProcessor extends DataProcessor<TimestepPedestrianIdDataKey, Integer> {
public PedestrianTargetIdProcessor() {
super("tid");
......
......@@ -10,7 +10,7 @@ import org.vadere.util.geometry.shapes.VPoint;
import java.util.LinkedList;
import java.util.stream.Stream;
public class PedestrianVelocityProcessor extends Processor<TimestepPedestrianIdDataKey, Double> {
public class PedestrianVelocityProcessor extends DataProcessor<TimestepPedestrianIdDataKey, Double> {
private PedestrianPositionProcessor pedPosProc;
private int backSteps;
......
......@@ -9,7 +9,7 @@ import org.vadere.util.geometry.shapes.VRectangle;
import java.util.Map;
public class PedestrianWaitingEndTimeProcessor extends Processor<PedestrianIdDataKey, Double> {
public class PedestrianWaitingEndTimeProcessor extends DataProcessor<PedestrianIdDataKey, Double> {
private VRectangle waitingArea;
public PedestrianWaitingEndTimeProcessor() {
......
......@@ -9,7 +9,7 @@ import org.vadere.util.geometry.shapes.VRectangle;
import java.util.Map;
public class PedestrianWaitingTimeProcessor extends Processor<PedestrianIdDataKey, Double> {
public class PedestrianWaitingTimeProcessor extends DataProcessor<PedestrianIdDataKey, Double> {
private double lastSimTime;
private VRectangle waitingArea;
......
......@@ -2,13 +2,13 @@ package org.vadere.simulator.projects.dataprocessing.store;
import org.vadere.state.attributes.processor.AttributesProcessor;
public class ProcessorStore {
public class DataProcessorStore {
private String type;
private int id;
private String attributesType;
private AttributesProcessor attributes;
public ProcessorStore() {
public DataProcessorStore() {
this.type = "";
this.id = 0;
this.attributesType = "";
......
......@@ -8,7 +8,7 @@ import java.util.Map;
public class OutputDefinitionStore {
private List<OutputFileStore> files;
private List<ProcessorStore> processors;
private List<DataProcessorStore> processors;
private Map<String, AttributesProcessor> attributes;
public OutputDefinitionStore() {
......@@ -20,7 +20,7 @@ public class OutputDefinitionStore {
this.files.add(file);
}
public void addProcessor(ProcessorStore processor) {
public void addProcessor(DataProcessorStore processor) {
this.processors.add(processor);
}
......
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