Explorar o código

Merge branch 'master' of git@git.tk.informatik.tu-darmstadt.de:andreas.meyer-berg/SmartHomeNetworkSim.git

Andreas T. Meyer-Berg %!s(int64=5) %!d(string=hai) anos
pai
achega
f5e47e081a

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

@@ -59,7 +59,7 @@ public class ConnectionPrecision extends ConnectionPerformance {
 		/**
 		 * Sorted Tree (Sorted by next trigger time)
 		 */
-		java.util.TreeSet<Port> portTree = new TreeSet<Port>(new PortComparator());
+		TreeSet<Port> portTree = new TreeSet<Port>(new PortComparator());
 		portTree.addAll(participants);
 
 		/**

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

@@ -1,5 +1,7 @@
 package de.tu_darmstadt.tk.SmartHomeNetworkSim.core;
 
+import java.util.Random;
+
 /**
  * Representation of connection EndPoints, which allows configuration of timings
  * and if it reacts to incoming traffic or even triggers new connections.
@@ -71,12 +73,12 @@ public class Port {
 	 * @param portNumber Number of the Port
 	 */
 	public Port(SmartDevice device, short portNumber){
-		status = CLOSED;
+		status = SENDING;
 		owner = device;
 		connection = null;
-		triggerInterval = 1000;
+		setTriggerInterval(new Random().nextInt(1000)+1);
 		lastTrigger = 0;
-		jitter = 0;
+		setTriggerInterval(new Random().nextInt(5)+1);
 		responseTime = 3;
 		this.portNumber = portNumber;
 	}