Create subpackages in package dataprocessing to get better clarity

parent 6b6d4d7c
{
"files": [ {
"type": "org.vadere.simulator.projects.dataprocessing.TimestepPedestrianIdOutputFile",
"type": "org.vadere.simulator.projects.dataprocessing.outputfiles.TimestepPedestrianIdOutputFile",
"filename": "output_ts_pid.txt",
"processors": [ 1, 2, 3, 5, 13, 14, 17 ],
"separator": ";"
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianIdOutputFile",
"type": "org.vadere.simulator.projects.dataprocessing.outputfiles.PedestrianIdOutputFile",
"filename": "output_pid.txt",
"processors": [ 4, 8, 9, 10, 15, 16 ]
}, {
"type": "org.vadere.simulator.projects.dataprocessing.TimestepOutputFile",
"type": "org.vadere.simulator.projects.dataprocessing.outputfiles.TimestepOutputFile",
"filename": "output_ts.txt",
"processors": [ 6, 7 ]
}, {
"type": "org.vadere.simulator.projects.dataprocessing.NoDataKeyOutputFile",
"type": "org.vadere.simulator.projects.dataprocessing.outputfiles.NoDataKeyOutputFile",
"filename": "output_nokey.txt",
"processors": [ 11, 12 ]
}, {
"type": "org.vadere.simulator.projects.dataprocessing.TimestepPedestrianIdOutputFile",
"type": "org.vadere.simulator.projects.dataprocessing.outputfiles.TimestepPedestrianIdOutputFile",
"filename": "postvis.trajectories",
"processors": [ 1, 18 ]
} ],
"processors": [ {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianPositionProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianPositionProcessor",
"id": 1
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianVelocityProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianVelocityProcessor",
"id": 2
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianDensityCountingProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianDensityCountingProcessor",
"id": 3
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianLastPositionProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianLastPositionProcessor",
"id": 4
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianDensityGaussianProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianDensityGaussianProcessor",
"id": 5
}, {
"type": "org.vadere.simulator.projects.dataprocessing.AreaDensityVoronoiProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.AreaDensityVoronoiProcessor",
"id": 6
}, {
"type": "org.vadere.simulator.projects.dataprocessing.AreaSpeedProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.AreaSpeedProcessor",
"id": 7
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianStartTimeProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianStartTimeProcessor",
"id": 8
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianEndTimeProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianEndTimeProcessor",
"id": 9
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianEvacuationTimeProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianEvacuationTimeProcessor",
"id": 10
}, {
"type": "org.vadere.simulator.projects.dataprocessing.MeanPedestrianEvacuationTimeProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.MeanPedestrianEvacuationTimeProcessor",
"id": 11
}, {
"type": "org.vadere.simulator.projects.dataprocessing.EvacuationTimeProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.EvacuationTimeProcessor",
"id": 12
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianFlowProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianFlowProcessor",
"id": 13
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianOverlapProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianOverlapProcessor",
"id": 14
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianWaitingTimeProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianWaitingTimeProcessor",
"id": 15
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianWaitingEndTimeProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianWaitingEndTimeProcessor",
"id": 16
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianOSMStrideLengthProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianOSMStrideLengthProcessor",
"id": 17
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianTargetIdProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianTargetIdProcessor",
"id": 18
}, {
"type": "org.vadere.simulator.projects.dataprocessing.PedestrianSourceIdProcessor",
"type": "org.vadere.simulator.projects.dataprocessing.processors.PedestrianSourceIdProcessor",
"id": 19
} ],
"attributes": {
......
......@@ -2,8 +2,8 @@ package org.vadere.gui.projectview.utils;
import org.vadere.simulator.models.MainModel;
import org.vadere.simulator.models.Model;
import org.vadere.simulator.projects.dataprocessing.OutputFile;
import org.vadere.simulator.projects.dataprocessing.Processor;
import org.vadere.simulator.projects.dataprocessing.outputfiles.OutputFile;
import org.vadere.simulator.projects.dataprocessing.processors.Processor;
import org.vadere.state.attributes.Attributes;
import org.vadere.state.attributes.models.AttributesOSM;
......
......@@ -7,6 +7,10 @@ import com.fasterxml.jackson.databind.ObjectWriter;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.vadere.simulator.projects.dataprocessing.outputfiles.OutputFile;
import org.vadere.simulator.projects.dataprocessing.processors.Processor;
import org.vadere.simulator.projects.dataprocessing.stores.OutputFileStore;
import org.vadere.simulator.projects.dataprocessing.stores.ProcessorStore;
import org.vadere.simulator.projects.io.JsonConverter;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.util.reflection.DynamicClassInstantiator;
......
package org.vadere.simulator.projects.dataprocessing;
import org.vadere.simulator.projects.dataprocessing.stores.OutputDefinitionStore;
import org.vadere.simulator.projects.dataprocessing.stores.OutputFileStore;
import org.vadere.simulator.projects.dataprocessing.stores.ProcessorStore;
import java.util.Arrays;
public final class OutputPresets {
......@@ -10,17 +14,17 @@ public final class OutputPresets {
this.outputDefinition = new OutputDefinitionStore();
ProcessorStore processor1 = new ProcessorStore();
processor1.setType("org.vadere.simulator.projects.dataprocessing.PedestrianPositionProcessor");
processor1.setType("org.vadere.simulator.projects.dataprocessing.processors.PedestrianPositionProcessor");
processor1.setId(1);
this.outputDefinition.addProcessor(processor1);
ProcessorStore processor2 = new ProcessorStore();
processor2.setType("org.vadere.simulator.projects.dataprocessing.PedestrianTargetIdProcessor");
processor2.setType("org.vadere.simulator.projects.dataprocessing.processors.PedestrianTargetIdProcessor");
processor2.setId(2);
this.outputDefinition.addProcessor(processor2);
OutputFileStore outputFile = new OutputFileStore();
outputFile.setType("org.vadere.simulator.projects.dataprocessing.TimestepPedestrianIdOutputFile");
outputFile.setType("org.vadere.simulator.projects.dataprocessing.outputfiles.TimestepPedestrianIdOutputFile");
outputFile.setFilename(DataProcessingJsonManager.TRAJECTORIES_FILENAME);
outputFile.setProcessors(Arrays.asList(1, 2));
this.outputDefinition.addOutputFile(outputFile);
......
......@@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.JsonNode;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.models.Model;
import org.vadere.simulator.projects.dataprocessing.outputfiles.OutputFile;
import org.vadere.simulator.projects.dataprocessing.processors.Processor;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.util.io.IOUtils;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.datakeys;
public final class NoDataKey implements Comparable<NoDataKey> {
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.datakeys;
public class PedestrianIdDataKey implements Comparable<PedestrianIdDataKey> {
private final int pedestrianId;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.datakeys;
public class TimestepDataKey implements Comparable<TimestepDataKey> {
private final int timestep;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.datakeys;
public class TimestepPedestrianIdDataKey implements Comparable<TimestepPedestrianIdDataKey> {
private final int timestep;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.outputfiles;
import org.vadere.simulator.projects.dataprocessing.datakeys.NoDataKey;
public class NoDataKeyOutputFile extends OutputFile<NoDataKey> {
public NoDataKeyOutputFile() {
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.outputfiles;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.processors.Processor;
import java.io.FileWriter;
import java.io.IOException;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.outputfiles;
import org.vadere.simulator.projects.dataprocessing.datakeys.PedestrianIdDataKey;
public class PedestrianIdOutputFile extends OutputFile<PedestrianIdDataKey> {
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.outputfiles;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepDataKey;
public class TimestepOutputFile extends OutputFile<TimestepDataKey> {
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.outputfiles;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepPedestrianIdDataKey;
public class TimestepPedestrianIdOutputFile extends OutputFile<TimestepPedestrianIdDataKey> {
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
public abstract class AreaDensityAlgorithm implements IAreaDensityAlgorithm {
private String name;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepDataKey;
public abstract class AreaDensityProcessor extends AreaProcessor<Double> {
private IAreaDensityAlgorithm densAlg;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.control.SimulationState;
import org.vadere.state.scenario.Agent;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesAreaDensityVoronoiProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepDataKey;
import org.vadere.state.attributes.processors.AttributesAreaProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.util.geometry.shapes.VRectangle;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Map;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.PedestrianIdDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepDataKey;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepPedestrianIdDataKey;
import org.vadere.state.attributes.processors.AttributesAreaSpeedProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.util.geometry.shapes.VPoint;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Collection;
import java.util.Collections;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.NoDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesEvacuationTimeProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.control.SimulationState;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.control.SimulationState;
import org.vadere.util.geometry.shapes.VPoint;
......
package org.vadere.simulator.projects.dataprocessing;
import java.util.List;
import java.util.stream.Collectors;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.NoDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesMeanPedestrianEvacuationTimeProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
import java.util.List;
import java.util.stream.Collectors;
public class MeanPedestrianEvacuationTimeProcessor extends Processor<NoDataKey, Double> {
private PedestrianEvacuationTimeProcessor pedEvacTimeProc;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesPedestrianDensityCountingProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesPedestrianDensityGaussianProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepPedestrianIdDataKey;
import org.vadere.state.attributes.processors.AttributesPedestrianDensityProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Collection;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.PedestrianIdDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.PedestrianIdDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesPedestrianEvacuationTimeProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Set;
import java.util.stream.Collectors;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepPedestrianIdDataKey;
import org.vadere.state.attributes.processors.AttributesPedestrianFlowProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Map;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.PedestrianIdDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepPedestrianIdDataKey;
import org.vadere.state.attributes.processors.AttributesPedestrianLastPositionProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.util.geometry.shapes.VPoint;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
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.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepPedestrianIdDataKey;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Map;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepPedestrianIdDataKey;
import org.vadere.state.attributes.processors.AttributesPedestrianOverlapProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.util.geometry.shapes.VPoint;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.PedestrianIdDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepDataKey;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepPedestrianIdDataKey;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.util.geometry.shapes.VPoint;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Collection;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.PedestrianIdDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Set;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.PedestrianIdDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Collection;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepPedestrianIdDataKey;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.LinkedList;
import java.util.stream.Stream;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.simulator.projects.dataprocessing.datakeys.TimestepPedestrianIdDataKey;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.state.attributes.processors.AttributesVelocityProcessor;
import org.vadere.state.scenario.Pedestrian;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Map;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.PedestrianIdDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesPedestrianWaitingEndTimeProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor;
import org.vadere.util.geometry.shapes.VPoint;
......
package org.vadere.simulator.projects.dataprocessing;
package org.vadere.simulator.projects.dataprocessing.processors;
import java.util.Map;
import org.vadere.simulator.control.SimulationState;
import org.vadere.simulator.projects.dataprocessing.datakeys.PedestrianIdDataKey;
import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
import org.vadere.state.attributes.processors.AttributesPedestrianWaitingTimeProcessor;
import org.vadere.state.attributes.processors.AttributesProcessor