Adds PrecisionLink

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/ImportConfiguration.java

@@ -40,6 +40,7 @@ public class ImportConfiguration {
 		standardProtocols.add(SimpleProtocol.class);
 		
 		standardLinks.add(SimpleLink.class);
+		standardLinks.add(PrecisionLink.class);
 		
 		standardSmartDevices.add(SmartDevice.class);
 		

src/main/java/de/tu_darmstadt/tk/SmartHomeNetworkSim/core/PrecisionLink.java

@@ -0,0 +1,164 @@
+package de.tu_darmstadt.tk.SmartHomeNetworkSim.core;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Connection;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Link;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.Packet;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.SmartDevice;
+import de.tu_darmstadt.tk.SmartHomeNetworkSim.core.util.PacketComparator;
+
+import java.util.ArrayList;
+
+/**
+ * Simple Implementation of {@link Link}, which allows connection of multiple
+ * devices, with an more precise calculation than {@link de.tu_darmstadt.tk.SmartHomeNetworkSim.core.simpleImplementation.SimpleLink}
+ *
+ * @author Andreas T. Meyer-Berg
+ */
+public class PrecisionLink implements Link {
+
+	/**
+	 * Name of the connection
+	 */
+	private String name;
+
+	/**
+	 * Devices connected by this Link
+	 */
+	private ArrayList<SmartDevice> devices;
+
+	/**
+	 * Connections running via this Link
+	 */
+	private ArrayList<Connection> connections;
+	/**
+	 * List of packages to store packages sent during simulation intervals, or
+	 * after termination
+	 */
+	private LinkedList<Packet> packets;
+	
+	/**
+	 * whether the status changed during the last simulation step
+	 */
+	private boolean statusChanged;
+
+	/**
+	 * Initializes a simple Link with name and an empty devices list.
+	 * 
+	 * @param name
+	 *            Name the Link should have
+	 */
+	public PrecisionLink(String name) {
+		this.name = name;
+		this.devices = new ArrayList<SmartDevice>();
+		this.packets = new LinkedList<Packet>();
+		this.connections = new ArrayList<Connection>();
+	}
+	
+	/**
+	 * Initializes a simple Link with default name and an empty devices list.
+	 * 
+	 * @param name
+	 *            Name the Link should have
+	 */
+	public PrecisionLink() {
+		this.name = "link name";
+		this.devices = new ArrayList<SmartDevice>();
+		this.packets = new LinkedList<Packet>();
+		this.connections = new ArrayList<Connection>();
+	}
+
+	/**
+	 * Returns the name of this Link
+	 * 
+	 * @return name of this Link
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Sets the name of this Link
+	 * 
+	 * @param name
+	 *            the name to set
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Returns the device that are part of this connection
+	 * 
+	 * @return the devices of this Link
+	 */
+	public Collection<SmartDevice> getDevices() {
+		return devices;
+	}
+
+	/**
+	 * Adds the SmartDevice to this Link
+	 * 
+	 * @param device
+	 *            the devices to add
+	 */
+	public void addDevice(SmartDevice device) {
+		this.devices.add(device);
+	}
+
+	/**
+	 * Remove SmartDevice from this Link
+	 * 
+	 * @param device
+	 *            the device to remove
+	 */
+	public void removeDevice(SmartDevice device) {
+		this.devices.remove(device);
+	}
+
+	@Override
+	public void simulateTimeInterval(long startTime, long duration) {
+		packets.clear();
+		statusChanged = false;
+		for (Connection c : connections) {
+			if (c.getLink() != this)
+				continue;
+			// Simulate just if source and link match
+			if ((c.getStatus() == Connection.ACTIVE || c.getStatus() == Connection.HALTED))
+				packets.addAll(c.simulateTimeInterval(startTime, duration));
+			else if (c.getStatus() == Connection.FINISHED
+					|| c.getStatus() == Connection.TERMINATED)
+				//Produce Termination packages
+				packets.addAll(c.getTerminationPackages(startTime));
+			statusChanged|=c.getStatusChanged();
+		}
+		packets.sort(new PacketComparator());
+	}
+
+	@Override
+	public Collection<Packet> getPackets() {
+		return packets;
+	}
+
+	@Override
+	public Collection<Connection> getConnections() {
+		return connections;
+	}
+
+	@Override
+	public void addConnection(Connection connection) {
+		connections.add(connection);
+	}
+
+	@Override
+	public void removeConnection(Connection connection) {
+		connections.remove(connection);
+	}
+
+	@Override
+	public boolean getStatusChanged() {
+		return statusChanged;
+	}
+}

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

@@ -133,6 +133,9 @@ public class SimpleLink implements Link {
 				packets.addAll(c.getTerminationPackages(startTime));
 			statusChanged|=c.getStatusChanged();
 		}
+		/**
+		 * Unsorted Packets from multiple sorted Connections
+		 */
 	}
 
 	@Override