Fixes RandomMove bias towards topLeft corner

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/Main.java

@@ -1,19 +1,27 @@
 package de.tu_darmstadt.tk.SmartHomeNetworkSim;
 
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Map.Entry;
+
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.SettingsController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.NetworkController;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.SimulationController;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionPerformance;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.ConnectionPrecision;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Model;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Packet;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.PacketCollector;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Port;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Protocol;
-import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SimulationManager;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.protocols.MQTT_protocol;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimpleLink;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.Manipulation_RandomMove;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimpleProtocol;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.view.MainFrame;
 
@@ -38,13 +46,19 @@ public class Main {
 	 */
 	static Controller controller;
 	
+	/**
+	 * Controller for editing the network
+	 */
 	static NetworkController c;
 	
+	/**
+	 * Controller for configuration of the program
+	 */
 	static SettingsController conf;
 	/**
-	 * SimulationManager which runs the simulation
+	 * SimulationController for running the simulation
 	 */
-	static SimulationManager sim;
+	static SimulationController sim;
 	
 	/**
 	 * Starts the program
@@ -55,6 +69,7 @@ public class Main {
 		controller = new Controller(m);
 		c = controller.getNetworkController();
 		conf = controller.getSettingsController();
+		sim = controller.getSimulationController();
 	    //initializeTest();
 	    initializeMQTTTest();
 	    v = new MainFrame(controller);
@@ -62,6 +77,60 @@ public class Main {
 	    for(int i=0; i<10; i++)
 	    	m.getSim().simulateTimeIntervall(0+50*i, 50);
 	    */
+	    //testPackageCollection();
+	    
+	}
+	
+	/**
+	 * Test package collectors
+	 */
+	@SuppressWarnings("unused")
+	private static void testPackageCollection() {
+		sim.addAlgorithm(new Manipulation_RandomMove(), controller);
+	    PacketCollector collector = new PacketCollector();
+	    sim.getSimulationManager().getPacketCollectionManager().addPacketCollector(collector);
+	    
+	    System.out.println("Collector 0-500 - nothing collected:");
+	    sim.getSimulationManager().simulateTimeIntervall(0, 500);
+	    HashMap<Link, LinkedList<Packet>> map = collector.getPackets();
+	    for(Entry<Link, LinkedList<Packet>> e:map.entrySet()){
+	    	System.out.println("Link: "+e.getKey().getName());
+	    	for(Packet p : e.getValue())
+	    		System.out.println(p.getTextualRepresentation());
+	    }
+	    
+	    System.out.println("");
+	    System.out.println("");
+	    Iterator<SmartDevice> it = c.getSmartDevices().iterator();
+	    it.next();
+	    
+	    SmartDevice d = it.next();
+	    collector.addDevice(d);
+	    SmartDevice f = it.next();
+	    collector.addDevice(f);
+	    System.out.println("Collector 500-1000 - "+d.getName()+" & "+f.getName()+" collected:");
+	    sim.getSimulationManager().simulateTimeIntervall(500, 500);
+	    map = collector.getPackets();
+	    for(Entry<Link, LinkedList<Packet>> e:map.entrySet()){
+	    	System.out.println("Link: "+e.getKey().getName());
+	    	for(Packet p : e.getValue())
+	    		System.out.println(p.getTextualRepresentation());
+	    }
+
+	    System.out.println("");
+	    System.out.println("");
+	    
+	    Link l = c.getLinks().iterator().next();
+	    collector.addLink(l);
+	    System.out.println("Collector 2000-3000 - "+l+" collected:");
+	    sim.getSimulationManager().simulateTimeIntervall(1000, 500);
+	    map = collector.getPackets();
+	    for(Entry<Link, LinkedList<Packet>> e:map.entrySet()){
+	    	System.out.println("Link: "+e.getKey().getName());
+	    	for(Packet p : e.getValue())
+	    		System.out.println(p.getTextualRepresentation());
+	    }
+	    sim.resetSimulation();
 	}
 	
 	/**

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/simpleImplementation/SimpleManipulation.java → src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/simpleImplementation/Manipulation_RandomMove.java

@@ -2,6 +2,7 @@ package de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation;
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.Random;
 
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.control.Controller;
 import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.NetworkManipulationAlgorithm;
@@ -12,8 +13,12 @@ import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
  *
  * @author Andreas T. Meyer-Berg
  */
-public class SimpleManipulation implements NetworkManipulationAlgorithm {
-
+public class Manipulation_RandomMove implements NetworkManipulationAlgorithm {
+	/**
+	 * Random number generator
+	 */
+	private Random rand = new Random();
+	
 	@Override
 	public void runAlgorithm(Controller controller, long currentTimeStep) {
 		/**
@@ -31,15 +36,15 @@ public class SimpleManipulation implements NetworkManipulationAlgorithm {
 		/**
 		 * Index of the randomly selected device
 		 */
-		int deviceNumber = (int)Math.round(devices.size() * Math.random());
-		for(int i = 0; i< deviceNumber && it.hasNext(); i++){
+		int deviceNumber = rand.nextInt(devices.size());
+		for(int i = 0; i <= deviceNumber && it.hasNext(); i++){
 			move = it.next();
 		}
 		/**
 		 * Move device randomly up to 5 pixels in x and y direction
 		 */
 		if(move != null){
-			controller.getNetworkController().moveSmartDevice(move,(int)(move.getX()+Math.random()*10-5), (int)(move.getY()+Math.random()*10-5), move.getZ());
+			controller.getNetworkController().moveSmartDevice(move,(int)(move.getX()+rand.nextInt(11)-5), (int)(move.getY()+rand.nextInt(11)-5), move.getZ());
 			controller.getNetworkController().validateDevicePosition();
 		}
 		/**