Random Generators now call the AP monitors

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

@@ -134,7 +134,10 @@ public class RandomAttractionGenerator implements IAttractionGenerator {
 		}
 		
 		attractionPoints.clear();
-		attractionPoints.addAll(result);
+		
+		for (AttractionPoint ap : result) {
+			addAttractionPoint(ap);
+		}
 	}
 
 	private PositionVector createPosVec() {

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

@@ -134,7 +134,7 @@ public class RandomDynamicAttractionGenerator implements IAttractionGenerator {
 			
 			for(int i = 0; i < deltaAP; i++) {
 				int random = rand.nextInt(attractionPoints.size());
-				attractionPoints.remove(random);
+				removeAttractionPoint(attractionPoints.get(random));
 			}			
 			return;
 		}
@@ -146,7 +146,7 @@ public class RandomDynamicAttractionGenerator implements IAttractionGenerator {
 			for(int i = 0; i < deltaAP; i++) {
 				AttractionPoint newAP = createAttractionPoint();
 				scheduleDynamicEvent(newAP);
-				attractionPoints.add(newAP);
+				addAttractionPoint(newAP);
 			}
 		}		
 	}