added a possibility to print the array of middle points for each contact,...

added a possibility to print the array of middle points for each contact, attribute is adjustable over json

VadereSimulator/src/org/vadere/simulator/projects/dataprocessing/datakey/PedestriansNearbyData.java

 package org.vadere.simulator.projects.dataprocessing.datakey;
 
 import org.vadere.state.scenario.DynamicElement;
+import org.vadere.util.geometry.shapes.VPoint;
 
-public class PedestriansNearbyData {
+import java.util.ArrayList;
+import java.util.List;
 
-	public static final PedestriansNearbyData noOverLap = new PedestriansNearbyData();
+public class PedestriansNearbyData {
 
 	private final int pedId1;
 	private final int pedId2;
 	private int durationTimesteps;
 	private int startTimestep;
+	private List<VPoint> trajectory;
+	private boolean printTrajectory;
 
 
 
-	private PedestriansNearbyData() {
+
+	/*private PedestriansNearbyData() {
 		this.pedId1 = -1;
 		this.pedId2 = -1;
 		this.durationTimesteps = 1;
 		this.startTimestep = 1;
-	}
+		this.trajectory = new ArrayList<>();
+	}*/
 
 	public int getStartTimestep() {
 		return startTimestep;
 	}
 
-	public PedestriansNearbyData(int ped1, int ped2, final int durationTimesteps, int startTimestep){
+	public PedestriansNearbyData(int ped1, int ped2, final int durationTimesteps, int startTimestep, List<VPoint> contactTrajectory, boolean printTrajectory){
 		this.pedId1 = Math.min(ped1, ped2);
 		this.pedId2 = Math.max(ped1, ped2);
 		this.durationTimesteps = durationTimesteps;
 		this.startTimestep = startTimestep;
+		this.trajectory = contactTrajectory;
+		this.printTrajectory = printTrajectory;
 	}
 
 	public int getPedId1() {
@@ -43,13 +51,37 @@ public class PedestriansNearbyData {
 		return durationTimesteps;
 	}
 
-	public PedestriansNearbyData getDataWithIncrementedDuration(int increment) {
-		return new PedestriansNearbyData(getPedId1(), getPedId2(), getDurationTimesteps() + increment, getStartTimestep());
+	public List<VPoint> getTrajectory() {
+		return trajectory;
+	}
+	public void addToContactTrajectory(VPoint point) {
+		trajectory.add(point);
+	}
+	public void addToContactTrajectory(List<VPoint> points) {
+		trajectory.addAll(points);
+	}
+
+	public PedestriansNearbyData getUpdatedData(PedestriansNearbyData newData, int sampleEveryNthStep) {
+		List<VPoint> traj = getTrajectory();
+		traj.addAll(newData.getTrajectory());
+		return new PedestriansNearbyData(getPedId1(), getPedId2(), getDurationTimesteps() + sampleEveryNthStep, getStartTimestep(),traj, printTrajectory);
 	}
 
 
 	public String[] toStrings(){
-		return new String[]{Integer.toString(durationTimesteps)};
+		if (!printTrajectory) {
+			return new String[]{Integer.toString(durationTimesteps)};
+		}
+		StringBuilder ret = new StringBuilder();
+		List<VPoint> traj = getTrajectory();
+		for (int i = 0; i < traj.size(); i++) {
+			VPoint p = traj.get(i);
+			ret.append(p.x).append(" ").append(p.y).append("\n");
+			if (i != traj.size() -1) {
+				ret.append("- - - - ");
+			}
+		}
+		return new String[]{Integer.toString(durationTimesteps), ret.toString()};
 	}
 
 }

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

@@ -5,7 +5,6 @@ import org.vadere.simulator.control.simulation.SimulationState;
 import org.vadere.simulator.projects.dataprocessing.ProcessorManager;
 import org.vadere.simulator.projects.dataprocessing.datakey.PedestriansNearbyData;
 import org.vadere.simulator.projects.dataprocessing.datakey.TimestepPedestriansNearbyIdKey;
-import org.vadere.state.attributes.processor.AttributesNumberOverlapsProcessor;
 import org.vadere.state.attributes.processor.AttributesPedestrianNearbyProcessor;
 import org.vadere.state.scenario.DynamicElement;
 import org.vadere.state.scenario.Pedestrian;
@@ -26,10 +25,11 @@ public class PedestriansNearbyProcessor extends DataProcessor<TimestepPedestrian
     private int sampleEveryNthStep;
     private int allowedAbsenceTimestepsIfContactReturns;
     private int minTimespanOfContactTimesteps;
+    private boolean printContacTrajectories;
 
 
     public PedestriansNearbyProcessor() {
-        super("durationTimesteps");
+        super("durationTimesteps", "xCoord-Contact", "yCoord-Contact");
         setAttributes(new AttributesPedestrianNearbyProcessor());
     }
 
@@ -48,7 +48,11 @@ public class PedestriansNearbyProcessor extends DataProcessor<TimestepPedestrian
             List<PedestriansNearbyData> pedsNearby = dynElemNneighbours
                     .parallelStream()
                     .filter(p -> ped.getId() != p.getId())
-                    .map(p -> new PedestriansNearbyData(ped.getId(), p.getId(), sampleEveryNthStep, timeStep))
+                    .map(p -> {
+                        VPoint pointOfContact = new VPoint(ped.getPosition().getX() - p.getPosition().getX(), ped.getPosition().getY() - p.getPosition().getY());
+                        List<VPoint> trajectory = new ArrayList<>();
+                        trajectory.add(pointOfContact);
+                        return new PedestriansNearbyData(ped.getId(), p.getId(), sampleEveryNthStep, timeStep, trajectory, printContacTrajectories);})
                     .collect(Collectors.toList());
             pedsNearby.forEach(o -> this.putValue(new TimestepPedestriansNearbyIdKey(timeStep, o.getPedId1(), o.getPedId2()), o));
         }
@@ -78,7 +82,7 @@ public class PedestriansNearbyProcessor extends DataProcessor<TimestepPedestrian
             if (key.isAccountedForBy(currentVal)) {
                 return;
             } else if (key.isContinuationOf(currentVal, allowedAbsenceTimestepsIfContactReturns)) {
-                super.putValue(alreadyExisting, currentVal.getDataWithIncrementedDuration(sampleEveryNthStep));
+                super.putValue(alreadyExisting, currentVal.getUpdatedData(value, sampleEveryNthStep));
                 return;
             }
         }
@@ -93,6 +97,7 @@ public class PedestriansNearbyProcessor extends DataProcessor<TimestepPedestrian
         sampleEveryNthStep = att.getSampleEveryNthStep();
         allowedAbsenceTimestepsIfContactReturns = att.getAllowedAbsenceTimestepsIfContactReturns();
         minTimespanOfContactTimesteps = att.getMinTimespanOfContactTimesteps();
+        printContacTrajectories = att.getPrintContactTrajectories();
     }
 
     private List<DynamicElement> getDynElementsAtPosition(final Topography topography, VPoint sourcePosition, double radius) {

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

@@ -10,6 +10,7 @@ public class AttributesPedestrianNearbyProcessor extends AttributesProcessor {
     private int sampleEveryNthStep = 1;
     private int allowedAbsenceTimestepsIfContactReturns = 0;
     private int minTimespanOfContactTimesteps = 1;
+    private boolean printContactTrajectories = false;
 
     public double getMaxDistanceForANearbyPedestrian() {
         return maxDistanceForANearbyPedestrian;
@@ -26,4 +27,8 @@ public class AttributesPedestrianNearbyProcessor extends AttributesProcessor {
     public int getMinTimespanOfContactTimesteps() {
         return minTimespanOfContactTimesteps;
     }
+
+    public boolean getPrintContactTrajectories() {
+        return printContactTrajectories;
+    }
 }