v2.4 updates

src/de/tud/kom/p2psim/impl/analyzer/metric/output/MetricOutputSiS.java

@@ -110,7 +110,7 @@ public class MetricOutputSiS extends AbstractOutput {
 			if (mv.isValid()) {
 				return value;
 			}
-			return Double.NaN;
+			throw new InformationNotAvailableException();
 		}
 
 		@Override

src/de/tud/kom/p2psim/impl/common/DefaultHost.java

@@ -32,6 +32,7 @@ import de.tud.kom.p2psim.api.network.SimNetworkComponent;
 import de.tud.kom.p2psim.api.topology.TopologyComponent;
 import de.tudarmstadt.maki.simonstrator.api.Monitor;
 import de.tudarmstadt.maki.simonstrator.api.Monitor.Level;
+import de.tudarmstadt.maki.simonstrator.api.common.graph.INodeID;
 import de.tudarmstadt.maki.simonstrator.api.component.ComponentNotAvailableException;
 import de.tudarmstadt.maki.simonstrator.api.component.HostComponent;
 import de.tudarmstadt.maki.simonstrator.api.component.transport.TransportComponent;
@@ -128,10 +129,19 @@ public class DefaultHost implements SimHost {
 		return transportComponent;
 	}
 
+	/**
+	 * @deprecated use getId instead (and the value() method)
+	 */
 	@Override
+	@Deprecated
 	public long getHostId() {
 		return uniqueHostId;
 	}
+	
+	@Override
+	public INodeID getId() {
+		return INodeID.get(uniqueHostId);
+	}
 
 	/*
 	 * "Old Host"

src/de/tud/kom/p2psim/impl/topology/DefaultTopologyComponent.java

@@ -447,8 +447,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
 			// Add all (online?) nodes
 			for (MacLayer mac : topoView.getAllMacs()) {
 				if (!onlyOnline || mac.isOnline()) {
-					INode node = currentView.createNode(INodeID.get(mac
-							.getNetId()));
+					INode node = currentView.createNode(mac.getHost().getId());
 					node.setProperty(SiSTypes.PHY_LOCATION,
 							topoView.getPosition(mac.getMacAddress()));
 					currentView.addElement(node);
@@ -461,17 +460,17 @@ public class DefaultTopologyComponent implements TopologyComponent {
 					// Consider all nodes as potential neighbors
 					for (MacLayer neighborMac : topoView.getAllMacs()) {
 						// create, but do NOT add the node object
-						INode neighbor = currentView.createNode(INodeID
-								.get(neighborMac.getNetId()));
+						INode neighbor = currentView.createNode(neighborMac
+								.getHost().getId());
 						// only online nodes (already in graph)
 						if (!onlyOnline
 								|| currentView.containsNode(neighbor.getId())) {
 							// Distance?
 							if (topoView.getDistance(mac.getMacAddress(),
 									neighborMac.getMacAddress()) <= distance) {
-								IEdge edge = currentView.createEdge(
-										INodeID.get(mac.getNetId()),
-										INodeID.get(neighborMac.getNetId()));
+								IEdge edge = currentView.createEdge(mac
+										.getHost().getId(), neighborMac
+										.getHost().getId());
 								currentView.addElement(edge);
 							}
 						}
@@ -485,14 +484,14 @@ public class DefaultTopologyComponent implements TopologyComponent {
 							.getMacAddress());
 					for (MacAddress neighborMac : neighbors) {
 						// create, but do NOT add the node object
-						INode neighbor = currentView.createNode(INodeID
-								.get(topoView.getMac(neighborMac).getNetId()));
+						INode neighbor = currentView.createNode(topoView
+								.getMac(neighborMac).getHost().getId());
 						// only online nodes (already in graph)
 						if (!onlyOnline
 								|| currentView.containsNode(neighbor.getId())) {
-							IEdge edge = currentView.createEdge(INodeID.get(mac
-									.getNetId()), INodeID.get(topoView.getMac(
-									neighborMac).getNetId()));
+							IEdge edge = currentView.createEdge(mac.getHost()
+									.getId(), topoView.getMac(neighborMac)
+									.getHost().getId());
 							currentView.addElement(edge);
 							edge.setProperty(SiSTypes.PHY_DISTANCE, topoView
 									.getDistance(mac.getMacAddress(),
@@ -508,8 +507,7 @@ public class DefaultTopologyComponent implements TopologyComponent {
 		public INode getOwnNode(SimHost ownHost) {
 			MacLayer mac = ownHost.getLinkLayer().getMac(phy);
 			if (!onlyOnline || mac.isOnline()) {
-				return currentView.createNode(INodeID.get(ownHost
-						.getLinkLayer().getMac(phy).getNetId()));
+				return currentView.createNode(ownHost.getId());
 			}
 			return null;
 		}

src/de/tud/kom/p2psim/impl/topology/TopologyFactory.java

@@ -124,7 +124,7 @@ public class TopologyFactory implements HostComponentFactory {
 		}
 		Monitor.log(TopologyFactory.class, Level.INFO, 
 				"Topology Component for Host %s created. Placement: %s, Movement: %s", 
-				pHost.getHostId(), placement, movement);
+				host.getHostId(), placement, movement);
 		return toCo;
 	}