Corrected logging in SocialGroupMovementModel

src/de/tud/kom/p2psim/impl/common/DefaultMonitor.java

@@ -208,13 +208,11 @@ public class DefaultMonitor implements MonitorComponent, EventHandler,
 	public void close() {
 		if (this.isMonitoring && analyzers.size() != 0) {
 			try {
-				output.write("*******************************************************\n");
-				output.write("# Monitoring results \n");
-				output.newLine();
+				output.write(Time.getFormattedTime() + ": DefaultMonitor closing, stop all analyzers.. \n");			
 				for (Analyzer analyzer : analyzers) {
 					analyzer.stop(output);
 				}
-				output.write("*******************************************************\n");
+				output.write("[DefaultMonitor] Stopped. \n");
 				output.close();
 			} catch (IOException e) {
 				throw new AssertionError();

src/de/tud/kom/p2psim/impl/topology/component/DefaultTopologyComponent.java

@@ -32,8 +32,6 @@ import de.tud.kom.p2psim.api.topology.placement.PlacementModel;
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.IAttractionPoint;
 
-
-
 /**
  * Default implementation of a {@link TopologyComponent}.
  *
@@ -100,18 +98,16 @@ public class DefaultTopologyComponent extends AbstractTopologyComponent {
 
 	@Override
 	public double getMovementSpeed() {
-		
+			
 		try {
 			if (currentMovementSpeed == -1) {
-				this.currentMovementSpeed  = movementModel.getMovementSpeedDistribution().calculateSpeed();				
-			}
+				this.currentMovementSpeed  = movementModel.getMovementSpeedDistribution().calculateSpeed();	
+			}			
 		}
 		catch (UnsupportedOperationException e) {
-			if (currentMovementSpeed == -1) {
-				calcRandomMovementSpeed();
-			}
+			calcRandomMovementSpeed();			
 		}		
-		
+			
 		return this.currentMovementSpeed;
 	}
 
@@ -135,8 +131,7 @@ public class DefaultTopologyComponent extends AbstractTopologyComponent {
 	public Set<IAttractionPoint> getAllAttractionPoints() {
 		return movementModel.getAllAttractionPoints();
 	}	
-	
-	
+		
 	public static class Factory implements TopologyComponentFactory {
 				
 		@Override

src/de/tud/kom/p2psim/impl/topology/movement/local/AbstractLocalMovementStrategy.java

@@ -40,9 +40,6 @@ public abstract class AbstractLocalMovementStrategy implements
 	private double scaleFactor = 1;
 
 	public double getMovementSpeed(SimLocationActuator ms) {
-		/*
-		 * FIXME BR: why exactly is only the maxSpeed considered here?
-		 */
 		return ms.getMovementSpeed() * scaleFactor;
 	}
 

src/de/tud/kom/p2psim/impl/topology/movement/modularosm/SocialGroupMovementModel.java

@@ -39,6 +39,7 @@ import de.tudarmstadt.maki.simonstrator.api.Binder;
 import de.tudarmstadt.maki.simonstrator.api.Event;
 import de.tudarmstadt.maki.simonstrator.api.Monitor;
 import de.tudarmstadt.maki.simonstrator.api.Time;
+import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
 import de.tudarmstadt.maki.simonstrator.api.component.sensor.location.IAttractionPoint;
 
 /**
@@ -227,8 +228,8 @@ public class SocialGroupMovementModel extends ModularMovementModel {
 		
 		if (either.hasLeft()) {
 			ms.updateCurrentLocation(either.getLeft());
-			if(!checkBoundaries(ms.getRealPosition())) {
-				System.err.println("Social Group Movement Model: Host moved outside of simulated area!");
+			if(!checkBoundaries(ms.getRealPosition())) {				
+				Monitor.log(getClass(), Level.WARN, "Host " + ms.getHost().toString()  +" moved outside of simulated area! Desination: " + destination, ms);	
 			}				
 		} 
 		else {