Merge branch 'master' into 'nr/master-debug'

Merge Master into nr/master-debug



See merge request !23

src/de/tud/kom/p2psim/impl/topology/views/DefaultLink.java

@@ -22,6 +22,7 @@ package de.tud.kom.p2psim.impl.topology.views;
 
 import de.tud.kom.p2psim.api.linklayer.mac.Link;
 import de.tud.kom.p2psim.api.linklayer.mac.MacAddress;
+import de.tudarmstadt.maki.simonstrator.api.Rate;
 
 /**
  * A very basic Link-Implementation. The idea behind a link is that the Link
@@ -60,7 +61,7 @@ public class DefaultLink implements Link {
 	 * @param isConnected
 	 * @param dropProbability
 	 * @param bandwidth
-	 *            in byte/s
+	 *            in bit/s, see {@link Rate}
 	 * @param latency
 	 * @param mtu
 	 */

src/de/tud/kom/p2psim/impl/topology/views/FiveGTopologyView.java

@@ -119,6 +119,7 @@ public class FiveGTopologyView extends AbstractTopologyView<CellLink> {
 	 */
 	public FiveGTopologyView(PhyType phy) {
 		super(phy, true);
+		setHasRealLinkLayer(false);
 	}
 
 	@XMLConfigurableConstructor({ "phy" })
@@ -194,13 +195,6 @@ public class FiveGTopologyView extends AbstractTopologyView<CellLink> {
 			link.setLinkData(database.getEntryFor(segId, link.isCloudlet()),
 					null);
 		}
-
-		if (link.getSegmentId() != segId || (link.supportsAccessPoints()
-				&& link.getApSegmentId() != apSegId)) {
-			// Update
-			link.setLinkData(database.getEntryFor(segId, link.isCloudlet()),
-					database.getEntryFor(apSegId, link.isCloudlet()));
-		}
 	}
 
 	@Override

src/de/tud/kom/p2psim/impl/topology/views/RangedTopologyView.java

@@ -100,7 +100,7 @@ public class RangedTopologyView extends AbstractTopologyView<RangedLink> {
 	public RangedTopologyView(PhyType phy, double range) {
 		super(phy, true);
 		this.range = range;
-
+		setHasRealLinkLayer(true);
 		LiveMonitoring.addProgressValueIfNotThere(new DijkstraMonitor());
 	}
 

src/de/tud/kom/p2psim/impl/topology/views/VisualizationTopologyView.java

@@ -680,4 +680,9 @@ public class VisualizationTopologyView extends JFrame implements TopologyView,
 		throw new NotSupportedException();
 	}
 
+	@Override
+	public boolean hasRealLinkLayer() {
+		throw new NotSupportedException();
+	}
+
 }

src/de/tud/kom/p2psim/impl/topology/views/fiveg/StaticSegmentDatabase.java

@@ -23,6 +23,7 @@ package de.tud.kom.p2psim.impl.topology.views.fiveg;
 import java.util.Random;
 
 import de.tudarmstadt.maki.simonstrator.api.Randoms;
+import de.tudarmstadt.maki.simonstrator.api.Rate;
 import de.tudarmstadt.maki.simonstrator.api.Time;
 
 /**
@@ -39,6 +40,14 @@ public class StaticSegmentDatabase extends AbstractGridBasedTopologyDatabase {
 
 	private long latencyVariance = 50 * Time.MILLISECOND;
 
+	private long bandwidthUpload = 1 * Rate.Mbit_s;
+
+	private long bandwidthDownload = 16 * Rate.Mbit_s;
+
+	private long cloudletBandwidthUpload = 4 * Rate.Mbit_s;
+
+	private long cloudletBandwidthDownload = 16 * Rate.Mbit_s;
+
 	private long cloudletLatency = 50 * Time.MILLISECOND;
 
 	private long cloudletLatencyVariance = 10 * Time.MILLISECOND;
@@ -56,13 +65,14 @@ public class StaticSegmentDatabase extends AbstractGridBasedTopologyDatabase {
 					* (long) (rnd.nextDouble() * cloudletLatencyVariance);
 			assert latency > 0;
 			return new StaticEntry(segmentID, dropProbability, dropProbability,
-					latency, latency, 1000000, 1000000);
+					latency, latency, cloudletBandwidthUpload,
+					cloudletBandwidthDownload);
 		} else {
 			long latency = this.latency + (rnd.nextBoolean() ? +1 : -1)
 					* (long) (rnd.nextDouble() * latencyVariance);
 			assert latency > 0;
 			return new StaticEntry(segmentID, dropProbability, dropProbability,
-					latency, latency, 1000000, 1000000);
+					latency, latency, bandwidthUpload, bandwidthDownload);
 		}
 	}