Bugfix, now random locations are completely within the world dimensions

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

@@ -103,13 +103,19 @@ public class RandomAttractionGenerator implements IAttractionGenerator {
 			
 			if(c < 20)
 			{
+				// if not within the world dimensions, directly go back to calculation
+				if(posVec.getX() + radius > worldDimension.getX() || posVec.getY() + radius > worldDimension.getY()
+							|| posVec.getX() - radius < 0 || posVec.getY() - radius < 0) {
+					i--;
+					c++;
+					continue create;
+				}				
+				
 				for (AttractionPoint ap : result) {					
 					// if this point is closer than the given minimum distance to another point, or the radii of the points would overlap, 
 					// or if the radius would exceed the simulation area
 					// then discard this attraction point and create a new one
-					if(posVec.distanceTo(ap) < minimumDistance || (posVec.distanceTo(ap) - radius - ap.getRadius()) < 0 
-							|| posVec.getX() + radius > worldDimension.getX() || posVec.getY() + radius > worldDimension.getY()
-							|| posVec.getX() - radius < 0 || posVec.getY() - radius < 0) {
+					if(posVec.distanceTo(ap) < minimumDistance || (posVec.distanceTo(ap) - radius - ap.getRadius()) < 0 ) {
 						i--;
 						c++;
 						continue create;