Monitoring for Group Forming

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

@@ -186,8 +186,6 @@ public class ModularMovementModelViz extends JComponent
 			}
 		}
 				
-		//<Variable name="GRAPHHOPPER_BLOCKED_AREAS" value="51.813680,8.783510,51.806795,8.804239;51.821036,8.771151,51.814987, 8.779090;" /> 
-		
 		if(this.movementModel.getLocalMovementStrategy() instanceof RealWorldStreetsMovement) {
 			RealWorldStreetsMovement mov = (RealWorldStreetsMovement) this.movementModel.getLocalMovementStrategy();
 			
@@ -210,40 +208,6 @@ public class ModularMovementModelViz extends JComponent
 			}
 			
 		}		
-		
-//		g2.setColor(Color.black);			
-//		g2.setColor(new Color(1f, 0f, 0f, 0.5f));
-//		PositionVector p1 = GPSCalculation.transformGPSWindowToOwnWorld(51.813680, 8.783510);
-//		PositionVector p2 = GPSCalculation.transformGPSWindowToOwnWorld(51.806795, 8.804239);
-//					
-//		g2.fillRect(VisualizationInjector.scaleValue(p1.getX()), VisualizationInjector.scaleValue(p1.getY()), 
-//				VisualizationInjector.scaleValue(p2.getX()) - VisualizationInjector.scaleValue(p1.getX()), 
-//				VisualizationInjector.scaleValue(p2.getY())- VisualizationInjector.scaleValue(p1.getY()));
-//		
-//		p1 = GPSCalculation.transformGPSWindowToOwnWorld(51.821036, 8.771151);
-//		p2 = GPSCalculation.transformGPSWindowToOwnWorld(51.814987, 8.779090);
-//
-//		g2.fillRect(VisualizationInjector.scaleValue(p1.getX()), VisualizationInjector.scaleValue(p1.getY()), 
-//				VisualizationInjector.scaleValue(p2.getX() - p1.getX()), 
-//				VisualizationInjector.scaleValue(p2.getY() - p1.getY()));
-//		
-//				
-//		p1 = GPSCalculation.transformGPSWindowToOwnWorld(51.792919, 8.785700);
-//		p2 = GPSCalculation.transformGPSWindowToOwnWorld(51.789575, 8.799222);
-//				
-//		g2.fillRect(VisualizationInjector.scaleValue(p1.getX()), VisualizationInjector.scaleValue(p1.getY()), 
-//				VisualizationInjector.scaleValue(p2.getX()) - VisualizationInjector.scaleValue(p1.getX()), 
-//				VisualizationInjector.scaleValue(p2.getY())- VisualizationInjector.scaleValue(p1.getY()));
-		
-		//		
-//		for (PointList pointList : paths) {
-//			for (GHPoint3D temp : pointList) {
-//				PositionVector p = RealWorldStreetsMovement.transformGPSWindowToOwnWorld(temp.getLat(), temp.getLon());
-//				
-//				g2.fillOval(VisualizationInjector.scaleValue(p.getX()) - 2, VisualizationInjector.scaleValue(p.getY()) - 2, 4,4  );
-//			}
-//		}
-		
 	}
 
 	@Override

src/de/tud/kom/p2psim/impl/topology/movement/modularosm/groups/groupforming/AbstractGroupForming.java

@@ -145,8 +145,8 @@ public abstract class AbstractGroupForming implements IGroupFormingBehavior {
 		}
 				
 		for(int g = 0; g < maxNumberOfGroups; g++) {			
-			long delay = Math.max(Time.MINUTE, (long) ((rand.nextDouble() * (Time.MINUTE * 30) + Time.MINUTE)));										
-			//System.out.println("("+g+") Init Group Formation Time " + Time.getFormattedTime(delay) );
+			long delay = Math.max(Time.MINUTE, (long) ((groupFormationSetupDelay + rand.nextGaussian() * groupFormationSetupDelay )));	
+			Monitor.log(this.getClass(), Monitor.Level.INFO, "Group: "+g+" Initial Group Formation Time",  Time.getFormattedTime(delay));
 								
 			Event.scheduleWithDelay(delay, new EventHandler() {			
 				@Override