Merge branch '177-generalize-pedestriandensitycountingprocessor' into 'master'

Resolve "AreaDensityCountingProcessor"

Closes #177

See merge request !62

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

@@ -54,8 +54,19 @@ public class ProcessorManager {
 		return this.processorMap.getOrDefault(id, null);
 	}
 
-	public MeasurementArea getMeasurementArea(int measurementAreaId){
-		return topography.getMeasurementArea(measurementAreaId);
+	public MeasurementArea getMeasurementArea(int measurementAreaId, boolean requireRectangular){
+
+		MeasurementArea measurementArea = topography.getMeasurementArea(measurementAreaId);
+
+		if (measurementArea == null){
+			throw new RuntimeException(String.format("MeasurementArea with index %d does not exist.", measurementAreaId));
+		}
+
+		if (requireRectangular && !measurementArea.isRectangular()) {
+			throw new RuntimeException(String.format("Measurement area for %d is required to be rectangular", measurementAreaId));
+		}
+
+		return measurementArea;
 	}
 
 	public MainModel getMainModel() {

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDataProcessor.java

@@ -22,12 +22,7 @@ public abstract class AreaDataProcessor<V> extends DataProcessor<TimestepKey, V>
     public void init(final ProcessorManager manager) {
         super.init(manager);
         AttributesAreaProcessor att = (AttributesAreaProcessor) this.getAttributes();
-        this.measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId());
-        if (measurementArea == null)
-            throw new RuntimeException(String.format("MeasurementArea with index %d does not exist.", att.getMeasurementAreaId()));
-        if (!measurementArea.isRectangular())
-            throw new RuntimeException("DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas.");
-
+        this.measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId(), false);
     }
 
     public MeasurementArea getMeasurementArea() {

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityCountingProcessor.java

+package org.vadere.simulator.projects.dataprocessing.processor;
+
+import org.vadere.simulator.control.SimulationState;
+import org.vadere.simulator.projects.dataprocessing.datakey.TimestepKey;
+import org.vadere.state.attributes.processor.AttributesAreaDensityCountingProcessor;
+import org.vadere.state.attributes.processor.AttributesProcessor;
+import org.vadere.state.scenario.Pedestrian;
+
+import java.util.Collection;
+
+import org.vadere.annotation.factories.dataprocessors.DataProcessorClass;
+
+/**
+ * @author Daniel Lehmberg
+ * Processor counts number of pedestrians in a measurement area of any shape.
+ */
+@DataProcessorClass(label = "AreaDensityCountingProcessor")
+public class AreaDensityCountingProcessor extends AreaDataProcessor<Integer> {
+
+    public AreaDensityCountingProcessor() {
+        super("areaDensityCounting");
+        setAttributes(new AttributesAreaDensityCountingProcessor());
+    }
+
+    @Override
+    protected void doUpdate(final SimulationState state) {
+        int step = state.getStep();
+
+        int pedCount = 0;
+        Collection<Pedestrian> pedestrians = state.getTopography().getPedestrianDynamicElements().getElements();
+
+        for (Pedestrian p : pedestrians) {
+            if(this.getMeasurementArea().getShape().contains(p.getPosition())){
+                pedCount++;
+            }
+        }
+
+        this.putValue(new TimestepKey(step), pedCount);
+    }
+
+    @Override
+    public AttributesProcessor getAttributes() {
+        if(super.getAttributes() == null) {
+            setAttributes(new AttributesAreaDensityCountingProcessor());
+        }
+        return super.getAttributes();
+    }
+}

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiAlgorithm.java

@@ -35,27 +35,27 @@ public class AreaDensityVoronoiAlgorithm extends AreaDensityAlgorithm {
         // compute everything
         List<Face> faces = generateFaces(state);
 
-	    double area = 0.0;
-	    int pedCount = 0;
+        double area = 0.0;
+        int pedCount = 0;
 
         for (Face face : faces) {
             if (this.measurementArea.contains(face.getSite())) {
-	            area += face.computeArea();
-	            pedCount++;
+                area += face.computeArea();
+                pedCount++;
             }
         }
         return pedCount > 0 ? pedCount / area : 0;
     }
 
-	private List<Face> generateFaces(@NotNull final SimulationState state) {
-		VoronoiDiagram voronoiDiagram = new VoronoiDiagram(this.voronoiArea);
+    private List<Face> generateFaces(@NotNull final SimulationState state) {
+        VoronoiDiagram voronoiDiagram = new VoronoiDiagram(this.voronoiArea);
 
-		// convert pedestrians to positions
-		List<VPoint> pedestrianPositions = Agent.getPositions(state.getTopography().getElements(Agent.class));
-		voronoiDiagram.computeVoronoiDiagram(pedestrianPositions);
+        // convert pedestrians to positions
+        List<VPoint> pedestrianPositions = Agent.getPositions(state.getTopography().getElements(Agent.class));
+        voronoiDiagram.computeVoronoiDiagram(pedestrianPositions);
 
-		// compute everything
-		List<Face> faces = voronoiDiagram.getFaces();
-		return faces == null ? Collections.emptyList() : faces;
-	}
+        // compute everything
+        List<Face> faces = voronoiDiagram.getFaces();
+        return faces == null ? Collections.emptyList() : faces;
+    }
 }

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiProcessor.java

@@ -26,15 +26,12 @@ public class AreaDensityVoronoiProcessor extends AreaDensityProcessor implements
     @Override
     public void init(final ProcessorManager manager) {
         super.init(manager);
-
         AttributesAreaDensityVoronoiProcessor att = (AttributesAreaDensityVoronoiProcessor) this.getAttributes();
-        MeasurementArea measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId());
-        if (measurementArea == null)
-            throw new RuntimeException(String.format("MeasurementArea with index %d does not exist.", att.getMeasurementAreaId()));
-        if (!measurementArea.isRectangular())
-            throw new RuntimeException("DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas.");
 
-        this.setAlgorithm(new AreaDensityVoronoiAlgorithm(this.getMeasurementArea(), measurementArea));
+        MeasurementArea measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId(), true);
+        MeasurementArea measurementVoronoiArea = manager.getMeasurementArea(att.getVoronoiMeasurementAreaId(), true);
+
+        this.setAlgorithm(new AreaDensityVoronoiAlgorithm(measurementVoronoiArea, measurementArea));
     }
 
     @Override

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/AreaSpeedProcessor.java

@@ -43,7 +43,8 @@ public class AreaSpeedProcessor extends AreaDataProcessor<Double> {
             final int pedId = entry.getKey().getPedestrianId();
             final VPoint pos = entry.getValue();
 
-            if (getMeasurementArea().asVRectangle().contains(pos)) {
+            //getMeasurementArea from AreaDataProcessor
+            if (this.getMeasurementArea().getShape().contains(pos)) {
                 sumVelocities += this.pedVelProc.getValue(new TimestepPedestrianIdKey(step, pedId));
                 pedCount++;
             }

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramBProcessor.java

@@ -53,11 +53,7 @@ public class FundamentalDiagramBProcessor extends DataProcessor<PedestrianIdKey,
 		super.init(manager);
 		AttributesFundamentalDiagramBProcessor att = (AttributesFundamentalDiagramBProcessor) this.getAttributes();
 		pedestrianTrajectoryProcessor = (PedestrianTrajectoryProcessor) manager.getProcessor(att.getPedestrianTrajectoryProcessorId());
-		measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId());
-		if (measurementArea == null)
-			throw new RuntimeException(String.format("MeasurementArea with index %d does not exist.", att.getMeasurementAreaId()));
-		if (!measurementArea.isRectangular())
-			throw new RuntimeException("DataProcessor only supports Rectangular measurement areas.");
+		measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId(), false);
 		measurementAreaVRec = measurementArea.asVRectangle();
 	}
 

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramCProcessor.java

@@ -42,13 +42,10 @@ public class FundamentalDiagramCProcessor extends AreaDataProcessor<Pair<Double,
 	@Override
 	public void init(final ProcessorManager manager) {
 		super.init(manager);
+
 		AttributesFundamentalDiagramCProcessor att = (AttributesFundamentalDiagramCProcessor) this.getAttributes();
-		measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId());
+		measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId(), true);
 		pedestrianVelocityProcessor = (APedestrianVelocityProcessor) manager.getProcessor(att.getPedestrianVelocityProcessorId());
-		if (measurementArea == null)
-			throw new RuntimeException(String.format("MeasurementArea with index %d does not exist.", att.getMeasurementAreaId()));
-		if (!measurementArea.isRectangular())
-			throw new RuntimeException("DataProcessor only supports Rectangular measurement areas.");
 		measurementAreaVRec = measurementArea.asVRectangle();
 	}
 

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramDProcessor.java

@@ -42,12 +42,8 @@ public class FundamentalDiagramDProcessor extends AreaDataProcessor<Pair<Double,
 		super.init(manager);
 		AttributesFundamentalDiagramDProcessor att = (AttributesFundamentalDiagramDProcessor) this.getAttributes();
 		pedestrianVelocityProcessor = (APedestrianVelocityProcessor) manager.getProcessor(att.getPedestrianVelocityProcessorId());
-		MeasurementArea measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId());
-		MeasurementArea voronoiMeasurementArea = manager.getMeasurementArea(att.getVoronoiMeasurementAreaId());
-		if (measurementArea == null || voronoiMeasurementArea == null)
-			throw new RuntimeException(String.format("MeasurementArea with index %d does not exist.", att.getMeasurementAreaId()));
-		if (!measurementArea.isRectangular() || !voronoiMeasurementArea.isRectangular())
-			throw new RuntimeException("DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas.");
+		MeasurementArea measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId(), true);
+		MeasurementArea voronoiMeasurementArea = manager.getMeasurementArea(att.getVoronoiMeasurementAreaId(), true);
 
 		integralVoronoiAlgorithm = new IntegralVoronoiAlgorithm(
 				key -> pedestrianVelocityProcessor.getValue(key),

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/FundamentalDiagramEProcessor.java

@@ -33,12 +33,8 @@ public class FundamentalDiagramEProcessor extends AreaDataProcessor<Pair<Double,
 		super.init(manager);
 		AttributesFundamentalDiagramEProcessor att = (AttributesFundamentalDiagramEProcessor) this.getAttributes();
 		pedestrianVelocityProcessor = (APedestrianVelocityProcessor) manager.getProcessor(att.getPedestrianVelocityProcessorId());
-		MeasurementArea measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId());
-		MeasurementArea voronoiMeasurementArea = manager.getMeasurementArea(att.getVoronoiMeasurementAreaId());
-		if (measurementArea == null || voronoiMeasurementArea == null)
-			throw new RuntimeException(String.format("MeasurementArea with index %d does not exist.", att.getMeasurementAreaId()));
-		if (!measurementArea.isRectangular() || !voronoiMeasurementArea.isRectangular())
-			throw new RuntimeException("DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas.");
+		MeasurementArea measurementArea = manager.getMeasurementArea(att.getMeasurementAreaId(), true);
+		MeasurementArea voronoiMeasurementArea = manager.getMeasurementArea(att.getVoronoiMeasurementAreaId(), true);
 
 		sumVoronoiAlgorithm = new SumVoronoiAlgorithm(
 				key -> pedestrianVelocityProcessor.getValue(key),

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianCrossingTimeProcessor.java

@@ -81,11 +81,7 @@ public class PedestrianCrossingTimeProcessor extends DataProcessor<PedestrianIdK
 	public void init(final ProcessorManager manager) {
 		super.init(manager);
 		AttributesCrossingTimeProcessor att = (AttributesCrossingTimeProcessor) this.getAttributes();
-		this.measurementArea  = manager.getMeasurementArea(att.getMeasurementAreaId());
-		if (measurementArea == null)
-			throw new RuntimeException(String.format("MeasurementArea with index %d does not exist.", att.getMeasurementAreaId()));
-		if (!measurementArea.isRectangular())
-			throw new RuntimeException("DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas.");
+		this.measurementArea  = manager.getMeasurementArea(att.getMeasurementAreaId(), true);
 		measurementAreaVRec = measurementArea.asVRectangle();
 
 	}

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianDensityCountingProcessor.java

@@ -7,7 +7,8 @@ import org.vadere.state.attributes.processor.AttributesProcessor;
 
 /**
  * @author Mario Teixeira Parente
- *
+ * This processor counts the density for each pedestrian (density per pedestrian id) by counting pedestrians that are
+ * in 'radius'. To count pedestrians in a measurement area look at AreaDensityCountingProcessor.
  */
 @DataProcessorClass()
 public class PedestrianDensityCountingProcessor extends PedestrianDensityProcessor {

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingEndTimeProcessor.java

@@ -47,11 +47,7 @@ public class PedestrianWaitingEndTimeProcessor extends DataProcessor<PedestrianI
 	public void init(final ProcessorManager manager) {
 		super.init(manager);
 		AttributesPedestrianWaitingEndTimeProcessor att = (AttributesPedestrianWaitingEndTimeProcessor) this.getAttributes();
-		this.waitingArea = manager.getMeasurementArea(att.getWaitingAreaId());
-		if (waitingArea == null )
-			throw new RuntimeException(String.format("MeasurementArea with index %d does not exist.", att.getWaitingAreaId()));
-		if (!waitingArea.isRectangular())
-			throw new RuntimeException("DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas.");
+		this.waitingArea = manager.getMeasurementArea(att.getWaitingAreaId(), true);
 		waitingAreaVRec = waitingArea.asVRectangle();
 	}
 

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingTimeProcessor.java

@@ -54,11 +54,7 @@ public class PedestrianWaitingTimeProcessor extends DataProcessor<PedestrianIdKe
 	public void init(final ProcessorManager manager) {
 		super.init(manager);
 		AttributesPedestrianWaitingTimeProcessor att = (AttributesPedestrianWaitingTimeProcessor) this.getAttributes();
-		this.waitingArea  = manager.getMeasurementArea(att.getWaitingAreaId());
-		if (waitingArea == null)
-			throw new RuntimeException(String.format("MeasurementArea with index %d does not exist.", att.getWaitingAreaId()));
-		if (!waitingArea.isRectangular())
-			throw new RuntimeException("DataProcessor and IntegralVoronoiAlgorithm only supports Rectangular measurement areas.");
+		this.waitingArea  = manager.getMeasurementArea(att.getWaitingAreaId(), true);
 		waitingAreaRec = waitingArea.asVRectangle();
 		this.lastSimTime = 0.0;
 	}

VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/AreaDensityVoronoiProcessorTestEnv.java

@@ -36,7 +36,8 @@ public class AreaDensityVoronoiProcessorTestEnv extends ProcessorTestEnv<Timeste
 		attr.setMeasurementAreaId(42);
 		MeasurementArea measurementArea = new MeasurementArea(
 				new AttributesMeasurementArea(42, new VRectangle(0, 0, 16, 16)));
-		Mockito.when(manager.getMeasurementArea(42)).thenReturn(measurementArea);
+		Mockito.when(manager.getMeasurementArea(42, false)).thenReturn(measurementArea);
+		Mockito.when(manager.getMeasurementArea(42, true)).thenReturn(measurementArea);
 
 	}
 

VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/AreaSpeedProcessorTestEnv.java

@@ -40,7 +40,7 @@ public class AreaSpeedProcessorTestEnv extends ProcessorTestEnv<TimestepKey, Dou
 		attr.setMeasurementAreaId(99);
 		MeasurementArea measurementArea = new MeasurementArea(
 				new AttributesMeasurementArea(99, new VRectangle(0, 0, 4, 5)));
-		Mockito.when(manager.getMeasurementArea(99)).thenReturn(measurementArea);
+		Mockito.when(manager.getMeasurementArea(99, false)).thenReturn(measurementArea);
 	}
 
 	@Override

VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingEndTimeProcessorTestEnv.java

@@ -26,7 +26,7 @@ public class PedestrianWaitingEndTimeProcessorTestEnv extends ProcessorTestEnv<P
 		attr.setWaitingAreaId(42);
 		MeasurementArea measurementArea = new MeasurementArea(
 				new AttributesMeasurementArea(42, new VRectangle(0, 0, 16, 16)));
-		Mockito.when(manager.getMeasurementArea(42)).thenReturn(measurementArea);
+		Mockito.when(manager.getMeasurementArea(42, true)).thenReturn(measurementArea);
 	}
 
 	@Override

VadereSimulator/tests/org/vadere/simulator/projects/dataprocessing/processor/PedestrianWaitingTimeProcessorTestEnv.java

@@ -32,7 +32,7 @@ public class PedestrianWaitingTimeProcessorTestEnv extends ProcessorTestEnv<Pede
 		attr.setWaitingAreaId(42);
 		MeasurementArea measurementArea = new MeasurementArea(
 				new AttributesMeasurementArea(42, new VRectangle(0, 0, 2, 5)));
-		Mockito.when(manager.getMeasurementArea(42)).thenReturn(measurementArea);
+		Mockito.when(manager.getMeasurementArea(42, true)).thenReturn(measurementArea);
 	}
 
 	@Override

VadereState/src/org/vadere/state/attributes/processor/AttributesAreaDensityCountingProcessor.java

+package org.vadere.state.attributes.processor;
+
+/**
+ * @author Daniel Lehmberg
+ */
+
+public class AttributesAreaDensityCountingProcessor extends AttributesAreaProcessor {
+
+}

VadereState/src/org/vadere/state/attributes/processor/AttributesAreaProcessor.java

@@ -2,6 +2,7 @@ package org.vadere.state.attributes.processor;
 
 /**
  * @author Mario Teixeira Parente
+ * @author Stefan Schuhbäck (major update)
  */
 
 public class AttributesAreaProcessor extends AttributesProcessor {