Made code review with Bene and removed corresponding TODO comments.

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

@@ -251,39 +251,10 @@ public class OSMBehaviorController {
         makeStep(pedestrian1, topography, pedestrian1.getDurationNextStep());
         makeStep(pedestrian2, topography, pedestrian2.getDurationNextStep());
 
-        // TODO Clarify with Bene if "stepDuration" should also be set
-        //   and if "pedestrian2.timeOfNextStep()" should be also called.
+        // TODO The experiment showed that speed decreased (to half of free-flow velocity).
+        //   Therefore, use "pedestrian.getDurationNextStep() * 2".
         pedestrian1.setTimeOfNextStep(pedestrian1.getTimeOfNextStep() + pedestrian1.getDurationNextStep());
         pedestrian2.setTimeOfNextStep(pedestrian2.getTimeOfNextStep() + pedestrian2.getDurationNextStep());
     }
 
-    // TODO Remove debug method.
-    private void printDebugInfos(PedestrianOSM pedestrian1, PedestrianOSM pedestrian2) {
-        PedestrianOSM[] pedestrians = new PedestrianOSM[] { pedestrian1, pedestrian2 };
-
-        for (int i = 0; i < pedestrians.length; i++) {
-            PedestrianOSM currentPed = pedestrians[i];
-
-            System.out.println(String.format("Position %d: %s", currentPed.getId(), currentPed.getPosition()));
-            System.out.println(String.format("Trajectory %d: %s", currentPed.getId(), currentPed.getFootSteps()));
-
-            LinkedList<FootStep> currentFootsteps = currentPed.getFootSteps().getFootSteps();
-
-            if (currentFootsteps.size() >= 2) {
-                for (i = 1; i < currentFootsteps.size(); i++) {
-                    FootStep previousFootstep = currentFootsteps.get(i - 1);
-                    FootStep currentFootstep = currentFootsteps.get(i);
-
-                    if (previousFootstep.getEndTime() > currentFootstep.getStartTime()) {
-                        System.out.println(String.format("  Assertion failed (at index %d): previousEndTime > currentStartTime", i));
-                        System.out.println(String.format("  %.2f -> %.2f (positions: %s -> %s)",
-                                previousFootstep.getEndTime(), currentFootstep.getStartTime(),
-                                previousFootstep.getEnd(), currentFootstep.getStart()
-                        ));
-                    }
-                }
-            }
-        }
-    }
-
 }

VadereSimulator/src/org/vadere/simulator/models/osm/updateScheme/UpdateSchemeEventDriven.java

@@ -59,7 +59,6 @@ public class UpdateSchemeEventDriven implements UpdateSchemeOSM {
 				pedestrian.setTimeOfNextStep(currentTimeInSec);
 			}
 
-			// TODO Make a code review with Bene here and check if everything works as expected.
 			if (pedestrian.getSalientBehavior() == SalientBehavior.TARGET_ORIENTED) {
 				// this can cause problems if the pedestrian desired speed is 0 (see speed adjuster)
 				pedestrian.updateNextPosition();