Merge branch 'develop' of https://gitlab.lrz.de/vadere/vadere into develop

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/OutputPresets.java

 package org.vadere.simulator.projects.dataprocessing;
 
+import org.vadere.simulator.projects.dataprocessing.store.DataProcessorStore;
 import org.vadere.simulator.projects.dataprocessing.store.OutputDefinitionStore;
 import org.vadere.simulator.projects.dataprocessing.store.OutputFileStore;
-import org.vadere.simulator.projects.dataprocessing.store.DataProcessorStore;
+import org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor;
 
 import java.util.Arrays;
 
@@ -12,40 +13,73 @@ import java.util.Arrays;
  */
 
 public final class OutputPresets {
-    private static OutputPresets instance;
-    private final OutputDefinitionStore outputDefinition;
 
-    private OutputPresets() {
-        this.outputDefinition = new OutputDefinitionStore();
+//	private final DataProcessorFactory dataProcessorFactory;
+//	private final OutputFileFactory outputFileFactory;
+
+	public OutputPresets(){
+//		dataProcessorFactory = DataProcessorFactory.instance();
+//		outputFileFactory = OutputFileFactory.instance();
+	}
+
+    public OutputDefinitionStore buildDefault() {
+		OutputDefinitionStore defaultPreset = new OutputDefinitionStore();
 
         DataProcessorStore processor1 = new DataProcessorStore();
         processor1.setType("org.vadere.simulator.projects.dataprocessing.processor.PedestrianPositionProcessor");
         processor1.setId(1);
-        this.outputDefinition.addProcessor(processor1);
+		defaultPreset.addProcessor(processor1);
 
         DataProcessorStore processor2 = new DataProcessorStore();
         processor2.setType("org.vadere.simulator.projects.dataprocessing.processor.PedestrianTargetIdProcessor");
         processor2.setId(2);
-        this.outputDefinition.addProcessor(processor2);
+		defaultPreset.addProcessor(processor2);
 
         OutputFileStore outputFile = new OutputFileStore();
         outputFile.setType("org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOutputFile");
         outputFile.setFilename(DataProcessingJsonManager.TRAJECTORIES_FILENAME);
         outputFile.setProcessors(Arrays.asList(1, 2));
-        this.outputDefinition.addOutputFile(outputFile);
+		defaultPreset.addOutputFile(outputFile);
 
-        this.outputDefinition.setTimestamped(true);
-    }
+		defaultPreset.setTimestamped(true);
 
-    public static OutputDefinitionStore getOutputDefinition() {
-        return getInstance().outputDefinition;
+		return defaultPreset;
     }
 
-    public static OutputPresets getInstance() {
-        if (instance == null) {
-            instance = new OutputPresets();
-        }
+    public OutputDefinitionStore withOverlapProcessor(){
+		OutputDefinitionStore store = buildDefault();
+		DataProcessorStore processor3 = new DataProcessorStore();
+		processor3.setType("org.vadere.simulator.projects.dataprocessing.processor.PedestrianOverlapProcessor");
+		processor3.setId(3);
+		store.addProcessor(processor3);
 
-        return instance;
+		DataProcessorStore processor4 = new DataProcessorStore();
+		AttributesNumberOverlapsProcessor attr4 = new AttributesNumberOverlapsProcessor();
+		attr4.setPedestrianOverlapProcessorId(3);
+		processor4.setType("org.vadere.simulator.projects.dataprocessing.processor.NumberOverlapsProcessor");
+		processor4.setId(4);
+		processor4.setAttributesType("org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor");
+		processor4.setAttributes(attr4);
+		store.addProcessor(processor4);
+
+		OutputFileStore outputFilePedOverlap = new OutputFileStore();
+		outputFilePedOverlap.setType("org.vadere.simulator.projects.dataprocessing.outputfile.TimestepPedestrianIdOverlapOutputFile");
+		outputFilePedOverlap.setFilename("overlaps.csv");
+		outputFilePedOverlap.setProcessors(Arrays.asList(3));
+		store.addOutputFile(outputFilePedOverlap);
+
+		OutputFileStore outputFileOverlapCount = new OutputFileStore();
+		outputFileOverlapCount.setType("org.vadere.simulator.projects.dataprocessing.outputfile.NoDataKeyOutputFile");
+		outputFileOverlapCount.setFilename("overlapCount.txt");
+		outputFileOverlapCount.setProcessors(Arrays.asList(4));
+		store.addOutputFile(outputFileOverlapCount);
+
+		return store;
+	}
+
+	// create default Scenario File with overlap processors added automatically.
+    public static OutputDefinitionStore getOutputDefinition() {
+        return new OutputPresets().withOverlapProcessor();
     }
+
 }