Various Fixes & Improvements

examples/classifier/EMClustering.java

@@ -39,13 +39,13 @@ public class EMClustering extends BasicPacketClassifier {
 		try {
 			clusterer.clusterInstance(instance);
 		} catch (Exception e) {
-			System.out.println("Anomaly Detected on Packet: "+origin.getTextualRepresentation());
+			System.out.println("EM: Anomaly Detected on Packet: "+origin.getTextualRepresentation());
 		}
 	}
 
 	@Override
 	public long getClassificationStart() {
-		return 10000;
+		return 3600000;
 	}
 
 }

examples/classifier/HierarchicalClustering.java

@@ -41,13 +41,13 @@ public class HierarchicalClustering extends BasicPacketClassifier {
 		try {
 			clusterer.clusterInstance(instance);
 		} catch (Exception e) {
-			System.out.println("Anomaly Detected on Packet: "+origin.getTextualRepresentation());
+			System.out.println("HC: Anomaly Detected on Packet: "+origin.getTextualRepresentation());
 		}
 	}
 
 	@Override
 	public long getClassificationStart() {
-		return 10000;
+		return 3600000;
 	}
 
 }

examples/classifier/KMeansClustering.java

@@ -52,12 +52,12 @@ public class KMeansClustering extends BasicPacketClassifier {
 		try {
 			clusterer.clusterInstance(instance);
 		} catch (Exception e) {
-			System.out.println("Anomaly Detected on Packet: "+origin.getTextualRepresentation());
+			System.out.println("KM: Anomaly Detected on Packet: "+origin.getTextualRepresentation());
 		}
 	}
 
 	@Override
 	public long getClassificationStart() {
-		return 10000;
+		return 3600000;
 	}
 }

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

@@ -25,6 +25,7 @@ public class Manipulation_RandomMove implements NetworkManipulationAlgorithm {
 		 * Visible devices of the model, to select one which should be moved
 		 */
 		Collection<SmartDevice> devices = controller.getNetworkController().getVisibleSmartDevices();
+		if(devices.isEmpty())return;
 		/**
 		 * Iterator for the devices
 		 */

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/simpleImplementation/SimplePacket.java

@@ -64,7 +64,7 @@ public class SimplePacket extends Packet {
 		String destName = destination == null ? "null" : destination.getOwner().getName();
 		String srcName = source == null ? "null" : source.getOwner().getName();
 			
-		return "[SimplePacket:" + payload + " time-" + timestamp + ";source:" + srcName + ";dest:"
+		return "[SimplePacket:" + payload + " time:" + timestamp + ";source:" + srcName + ";dest:"
 				+ destName + "]";
 	}
 

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/view/menuBar/MenuBarNetworkExamples.java

@@ -172,6 +172,8 @@ public class MenuBarNetworkExamples extends JMenu{
 	 * Test package collectors
 	 */
 	private void testPackageCollection() {
+		if(networkController.getSmartDevices().size()<3)
+			return;
 		simulationController.addAlgorithm(new Manipulation_RandomMove(), controller);
 	    PacketCollector collector = new PacketCollector();
 	    simulationController.getSimulationManager().getPacketCollectionManager().addPacketCollector(collector);