Bugfix in movement model

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

@@ -207,7 +207,7 @@ public class DefaultHost implements SimHost {
 	@Override
 	public String toString() {
 		StringBuffer sb = new StringBuffer();
-		sb.append("Host {");
+		sb.append("Host " + this.getId().value()  +" {");
 		sb.append("GroupID=");
 		if (this.properties != null)
 			sb.append(this.properties.getGroupID());

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

@@ -132,13 +132,6 @@ public class SocialGroupMovementModel extends ModularMovementModel {
 						groupAttractionAssignment.updateTargetAttractionPoint(ms, assignment);
 					}		
 				}
-//				//attractionAssigment.addComponent(ms);
-//				if(placeNodesAtAP) {
-//					IAttractionPoint assignment = attractionAssigment.getAssignment(ms);
-//					ms.updateCurrentLocation(this.addOffset(new PositionVector(assignment),
-//							(assignment.hasRadius() ? Math.max(assignment.getRadius(), 25.0) : 25.0)));	
-//					attractionAssigment.updateTargetAttractionPoint(ms, assignment);
-//				}								
 			}
 						
 			setTimeBetweenMoveOperations(timeBetweenMoveOperation);
@@ -209,16 +202,9 @@ public class SocialGroupMovementModel extends ModularMovementModel {
 			}
 			else {
 				throw new UnsupportedOperationException("SimLocationActuator " + host + " is neither in a group nor a single node");
-			}
-	
-			// TODO maybe remodel the group movement to do a whole group?
-			
+			}			
 		}
-		
-	
-		// TODO Move each group
-		
-		
+				
 		Event.scheduleWithDelay(timeBetweenMoveOperation, this, null, EVENT_MOVE);
 	}
 		

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

@@ -137,8 +137,7 @@ public abstract class AbstractGroupForming implements IGroupFormingBehavior {
 
 		for(SimLocationActuator host : movementModel.getAllLocationActuators()) {
 			stayDuration.put(host.getHost().getId(), new Tuple<Long, Long>(0L, Time.getCurrentTime()));			
-		}
-				
+		}				
 		
 		if(!enableGroups) {
 			return;
@@ -187,9 +186,7 @@ public abstract class AbstractGroupForming implements IGroupFormingBehavior {
 		if(maxGroupSize == minGroupSize) 
 			return minGroupSize;
 		else {
-			// int groupsize = (int) Math.max(1, rand.nextGaussian() * 0.93 + 2.76);
 			int groupsize = rand.nextInt(maxGroupSize - minGroupSize + 1) + minGroupSize;
-			//System.out.println("[AbstractGroupForming] Group Size: " + groupsize + " ("+minGroupSize+"/"+maxGroupSize+")");
 			return groupsize;
 		}
 		//return rand.nextInt(maxGroupSize - minGroupSize) + minGroupSize;
@@ -214,8 +211,7 @@ public abstract class AbstractGroupForming implements IGroupFormingBehavior {
 		if(targetDestination.hasRadius()) {
 			destination = movementModel.addOffset(destination, targetDestination.getRadius() / 3); 
 		}
-		
-				
+						
 		group.setDestination(destination);
 		setGroupMeetingPoint(group);
 
@@ -229,7 +225,7 @@ public abstract class AbstractGroupForming implements IGroupFormingBehavior {
 				groupCon.removeLeftGroupAtTimeEntry(member);
 			}
 		}
-		
+			
 		groupCon.addGroup(group);
 		
 		// Inform analyzer of new group

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

@@ -26,6 +26,7 @@ import java.util.LinkedList;
 import de.tud.kom.p2psim.api.topology.movement.SimLocationActuator;
 import de.tud.kom.p2psim.api.topology.movement.local.LocalMovementStrategy;
 import de.tud.kom.p2psim.impl.topology.movement.modularosm.ISocialGroupMovementAnalyzer;
+import de.tud.kom.p2psim.impl.topology.movement.modularosm.attraction.AttractionPoint;
 import de.tud.kom.p2psim.impl.topology.movement.modularosm.attraction.BasicAttractionPoint;
 import de.tud.kom.p2psim.impl.topology.movement.modularosm.attraction.hostcount.HostAtAttractionPointCounter;
 import de.tud.kom.p2psim.impl.topology.movement.modularosm.groups.SocialMovementGroup;
@@ -179,8 +180,9 @@ public class DefaultGroupForming extends AbstractGroupForming {
 			if (either.hasLeft()) {
 				// Do nothing
 			}
-			else if(leader.getCurrentTargetAttractionPoint() instanceof BasicAttractionPoint) {
-				// do nothing, only intermediate AP				
+			else if(leader.getCurrentTargetAttractionPoint() instanceof BasicAttractionPoint && !(leader.getCurrentTargetAttractionPoint() instanceof AttractionPoint) ) {
+				// do nothing, only intermediate AP		
+				transition.reachedAttractionPoint(leader, leader.getCurrentTargetAttractionPoint());
 			}
 			else {
 				transition.reachedAttractionPoint(leader, leader.getCurrentTargetAttractionPoint());