In "OSMBehaviorController", fixed severe bug in method "findSwapCandidate()"...

In "OSMBehaviorController", fixed severe bug in method "findSwapCandidate()" and added TODO comment to write unit tests

VadereSimulator/src/org/vadere/simulator/models/osm/OSMBehaviorController.java

@@ -134,19 +134,25 @@ public class OSMBehaviorController {
         }
     }
 
+    // TODO: Write unit tests for the critical methods below!
     @Nullable
     public PedestrianOSM findSwapCandidate(PedestrianOSM pedestrian, Topography topography) {
+        // Agents with no targets don't want to swap places.
+        if (pedestrian.hasNextTarget() == false) {
+            return null;
+        }
 
         List<Pedestrian> closestPedestrians = getClosestPedestriansWhichAreCloserToTarget(pedestrian, topography);
 
         if (closestPedestrians.size() > 0) {
             for (Pedestrian closestPedestrian : closestPedestrians) {
-		    	if(pedestrian.hasNextTarget()) {
+                if (closestPedestrian.hasNextTarget()) {
                     boolean closestPedIsCooperative = closestPedestrian.getSelfCategory() == SelfCategory.COOPERATIVE;
                     boolean targetOrientationDiffers = false;
 
-				    // TODO: Use "pedestrian.getTargetGradient()" instead of "calculateAngleBetweenTargets()".
-				    double angleInRadian = calculateAngleBetweenTargets(pedestrian, closestPedestrian, topography);
+                    // TODO: Make both options configurable in JSON file.
+                    // double angleInRadian = calculateAngleBetweenTargets(pedestrian, closestPedestrian, topography);
+                    double angleInRadian = calculateAngleBetweenTargetGradients(pedestrian, (PedestrianOSM)closestPedestrian);
 
                     if (angleInRadian == -1 || Math.toDegrees(angleInRadian) > pedestrian.getAttributes().getTargetOrientationAngleThreshold()) {
                         targetOrientationDiffers = true;
@@ -156,12 +162,10 @@ public class OSMBehaviorController {
                         return (PedestrianOSM)closestPedestrian;
                     }
                 } else {
-		    		if(!closestPedestrian.hasNextTarget()) {
                     return (PedestrianOSM)closestPedestrian;
                 }
             }
         }
-	    }
 
         return null;
     }

VadereSimulator/src/org/vadere/simulator/models/potential/fields/PotentialFieldTargetGrid.java

@@ -46,7 +46,7 @@ public class PotentialFieldTargetGrid extends PotentialFieldTarget implements IP
     public Vector2D getTargetPotentialGradient(VPoint pos, Agent ped) {
         double[] gradient = { 0.0, 0.0 };
 
-        if (ped.getNextTargetId() > -1) {
+        if (ped.hasNextTarget()) {
             InterpolationUtil.getGradientMollified(getCellGrids().get(ped.getNextTargetId()), new double[]{pos.getX(), pos.getY()}, gradient, 0.1);
         }