Browse Source

Fixes labels not being assigned

Andreas T. Meyer-Berg 4 years ago
parent
commit
06251973cd

+ 2 - 1
examples/classifier/BasicPacketClassifier.java

@@ -288,6 +288,7 @@ public abstract class BasicPacketClassifier implements PacketSniffer {
 				 * Packet which should be checked
 				 */
 				Packet packet = (Packet) itPacket.next();
+
 				start = Math.min(start, packet.getTimestamp());
 				end = Math.max(end, packet.getTimestamp());
 				/**
@@ -313,7 +314,7 @@ public abstract class BasicPacketClassifier implements PacketSniffer {
 		int n = tp+tn+fp+fn;
 		if(n!=0) {
 			System.out.println(getAlgoName()+" Performance: ["+start+"ms, "+end+"ms]");
-			System.out.println("n: ");
+			System.out.println("n: "+n);
 			System.out.println("TP: "+tp);
 			System.out.println("FP: "+fp);
 			System.out.println("TN: "+tn);

+ 1 - 0
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/ConnectionPerformance.java

@@ -113,6 +113,7 @@ public class ConnectionPerformance implements Connection {
 	
 	@Override
 	public Collection<Packet> encapsulatePackages(Collection<Packet> packets) {
+		packets.forEach(p->p.setLabel(label));
 		return packets;
 	}
 

+ 1 - 1
src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/Port.java

@@ -338,7 +338,7 @@ public class Port implements Schedulable {
 
 	@Override
 	public void simulateEvent(long time) {
-		if(connection==null || connection.getProtocol()==null || connection.getLink()==null)
+		if(connection==null || connection.getProtocol()==null || connection.getLink()==null || owner == null)
 			return;
 		
 		/**