showcases: use Ieee80211RadioMedium instead of e.g. Ieee80211ScalarRa…

…dioMedium
inet-framework · Jan 23, 2025 · fffa491 · fffa491
1 parent d16cd15
commit fffa491
Show file tree

Hide file tree

Showing 30 changed files with 84 additions and 103 deletions.
diff --git a/showcases/general/pcaprecording/PcapRecordingShowcase.ned b/showcases/general/pcaprecording/PcapRecordingShowcase.ned
@@ -5,9 +5,10 @@ import inet.node.ethernet.Eth100M;
 import inet.node.inet.AdhocHost;
 import inet.node.inet.Router;
 import inet.node.inet.StandardHost;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer;
 
+
 network PcapRecordingShowcase
 {
     @display("bgb=1214,400");
@@ -18,7 +19,7 @@ network PcapRecordingShowcase
         visualizer: IntegratedMultiCanvasVisualizer {
             @display("p=87,130");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=86,192");
         }
         host1: AdhocHost {

diff --git a/showcases/routing/manet/ManetProtocolsShowcase.ned b/showcases/routing/manet/ManetProtocolsShowcase.ned
@@ -2,9 +2,11 @@ package inet.showcases.routing.manet;
 
 import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.ManetRouter;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer;
 
+
 network ManetprotocolsShowcaseA
 {
     parameters:
@@ -22,7 +24,7 @@ network ManetprotocolsShowcaseA
         @figure[tree6](type=image; image="showcases/tree"; pos=0,0; transform=scale(0.1),translate(1050,600));
         @figure[tree7](type=image; image="showcases/tree"; pos=0,0; transform=scale(0.1),translate(1170,620));
     submodules:
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=100,100");
         }
         visualizer: IntegratedMultiCanvasVisualizer {

diff --git a/showcases/routing/manet/doc/index.rst b/showcases/routing/manet/doc/index.rst
@@ -209,14 +209,15 @@ featuring stationary hosts. The networks are defined in
 :download:`ManetProtocolsShowcase.ned <../ManetProtocolsShowcase.ned>`.
 Both networks contain hosts of the type :ned:`ManetRouter` (an extension of
 :ned:`WirelessHost`), whose routing module type is configurable. Just as
-:ned:`WirelessHost`, it uses :ned:`Ieee80211ScalarRadio` by default. It also
+:ned:`WirelessHost`, it uses :ned:`Ieee80211Radio` with the scalar 
+analog model by default. It also
 has IP forwarding enabled, and its management module is set to
 :ned:`Ieee80211MgmtAdhoc`. In the network, there is a source host named
 ``source``, a destination host named ``destination``, and a number of
 other hosts, which are named ``node1`` up to ``node10`` (their numbers
 vary in the different networks). In addition to mobile nodes, both
-networks contain an :ned:`Ieee80211ScalarRadioMedium`, an
 :ned:`Ipv4NetworkConfigurator`, and an :ned:`IntegratedMultiVisualizer`
+networks contain an :ned:`Ieee80211RadioMedium`, an
 module. The nodes' default PHY model (IEEE 802.11) will suffice because
 we're focusing on the routing protocols.
 

diff --git a/showcases/visualizer/canvas/datalinkactivity/DatalinkVisualizerShowcase.ned b/showcases/visualizer/canvas/datalinkactivity/DatalinkVisualizerShowcase.ned
@@ -10,7 +10,7 @@ import inet.node.ethernet.Eth100M;
 import inet.node.ethernet.EthernetSwitch;
 import inet.node.inet.AdhocHost;
 import inet.node.inet.StandardHost;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer;
 import inet.visualizer.common.DataLinkVisualizer;
@@ -50,7 +50,7 @@ network DataLinkVisualizerEnablingWirelessShowcase
             parameters:
                 @display("p=100,120");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             parameters:
                 @display("p=100,190");
         }
@@ -74,7 +74,7 @@ network DataLinkVisualizerActivityLevelShowcase
             parameters:
                 @display("p=100,120");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             parameters:
                 @display("p=100,190");
         }
@@ -152,7 +152,7 @@ network DataLinkVisualizerMobileShowcase
         configurator: Ipv4NetworkConfigurator {
             @display("p=70,150");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=70,250");
         }
         destination: AodvRouter {

diff --git a/showcases/visualizer/canvas/ieee80211/Ieee80211VisualizationShowcase.ned b/showcases/visualizer/canvas/ieee80211/Ieee80211VisualizationShowcase.ned
@@ -4,7 +4,7 @@ import inet.environment.common.PhysicalEnvironment;
 import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.WirelessHost;
 import inet.node.wireless.AccessPoint;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 
 
@@ -24,7 +24,7 @@ network Ieee80211VisualizationDisplayingAssociationsShowcase
         visualizer: IntegratedCanvasVisualizer {
             @display("p=409,78");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=408,123");
         }
 }
@@ -37,7 +37,7 @@ network Ieee80211VisualizationAdvancedFeaturesShowcase
             parameters:
                 @display("p=100,50");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             parameters:
                 @display("p=99,111");
         }
@@ -93,7 +93,7 @@ network Ieee80211VisualizationVisualizingHandoverShowcase
         visualizer: IntegratedCanvasVisualizer {
             @display("p=203,344");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=317,346");
         }
         wirelessHost: WirelessHost {
@@ -109,7 +109,7 @@ network Ieee80211VisualizationSignalLevelsShowcase
             parameters:
                 @display("p=100,50");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             parameters:
                 @display("p=99,111");
         }

diff --git a/showcases/visualizer/canvas/instrumentfigures/InstrumentShowcase.ned b/showcases/visualizer/canvas/instrumentfigures/InstrumentShowcase.ned
@@ -6,9 +6,10 @@ package inet.showcases.visualizer.canvas.instrumentfigures;
 
 import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.AdhocHost;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 
+
 network InstrumentShowcase
 {
     @display("bgb=900,500");
@@ -41,7 +42,7 @@ network InstrumentShowcase
         configurator: Ipv4NetworkConfigurator {
             @display("p=62,41");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=61,110");
         }
         visualizer: IntegratedCanvasVisualizer {

diff --git a/showcases/visualizer/canvas/packetdrop/PacketDropVisualizationShowcase.ned b/showcases/visualizer/canvas/packetdrop/PacketDropVisualizationShowcase.ned
@@ -10,7 +10,7 @@ import inet.node.inet.Router;
 import inet.node.inet.StandardHost;
 import inet.node.inet.WirelessHost;
 import inet.node.wireless.AccessPoint;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 
 
@@ -39,7 +39,7 @@ network PacketDropQueueOverflowShowcase
         visualizer: IntegratedCanvasVisualizer {
             @display("p=267,37");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=465,37");
         }
     connections:
@@ -55,7 +55,7 @@ network PacketDropArpResolutionFailedShowcase
             parameters:
                 @display("p=100,50");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             parameters:
                 @display("p=100,150");
         }
@@ -76,7 +76,7 @@ network PacketDropMacRetryLimitReachedShowcase
             parameters:
                 @display("p=100,50");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             parameters:
                 @display("p=100,150");
         }

diff --git a/showcases/visualizer/canvas/physicallinkactivity/PhysicallinkVisualizerShowcase.ned b/showcases/visualizer/canvas/physicallinkactivity/PhysicallinkVisualizerShowcase.ned
@@ -8,7 +8,7 @@ import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.AdhocHost;
 import inet.node.inet.WirelessHost;
 import inet.node.wireless.AccessPoint;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 import inet.visualizer.common.PhysicalLinkVisualizer;
 
@@ -24,7 +24,7 @@ network PhysicalLinkVisualizerEnablingShowcase
             parameters:
                 @display("p=100,150");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             parameters:
                 @display("p=100,250");
         }
@@ -49,7 +49,7 @@ network PhysicalLinkVisualizerFilteringShowcase
             parameters:
                 @display("p=100,150");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             parameters:
                 @display("p=100,250");
         }
@@ -77,7 +77,7 @@ network PhysicalLinkVisualizerMobileShowcase
         configurator: Ipv4NetworkConfigurator {
             @display("p=100,150");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=100,250");
         }
         host1: AdhocHost {

diff --git a/showcases/visualizer/canvas/spectrum/SpectrumShowcase.ned b/showcases/visualizer/canvas/spectrum/SpectrumShowcase.ned
@@ -4,7 +4,7 @@ import inet.environment.common.PhysicalEnvironment;
 import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.AdhocHost;
 import inet.node.wireless.Probe;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211DimensionalRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 
 
@@ -30,7 +30,7 @@ network SpectrumShowcaseSpectrumFigureSpectrogramNetwork
         visualizer: IntegratedCanvasVisualizer {
             @display("p=75,125");
         }
-        radioMedium: Ieee80211DimensionalRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=75,184");
         }
         physicalEnvironment: PhysicalEnvironment {
@@ -63,7 +63,7 @@ network SpectrumShowcasePowerDensityMapNetwork
         visualizer: IntegratedCanvasVisualizer {
             @display("p=75,125");
         }
-        radioMedium: Ieee80211DimensionalRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=74,184");
         }
         physicalEnvironment: PhysicalEnvironment {

diff --git a/showcases/visualizer/canvas/statistic/StatisticVisualizationShowcase.ned b/showcases/visualizer/canvas/statistic/StatisticVisualizationShowcase.ned
@@ -2,19 +2,18 @@ package inet.showcases.visualizer.canvas.statistic;
 
 import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.AdhocHost;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 
 
-
 network StatisticVisualizationPingRttShowcase
 {
     @display("bgb=400,244");
     submodules:
         configurator: Ipv4NetworkConfigurator {
             @display("p=69,40");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=68,99");
         }
         visualizer: IntegratedCanvasVisualizer {
@@ -41,7 +40,7 @@ network StatisticVisualizationPacketErrorRateShowcase
             parameters:
                 @display("p=64.256,180.72");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             parameters:
                 @display("p=62.247997,287.14398");
         }

diff --git a/showcases/visualizer/canvas/styling/StylingShowcase.ned b/showcases/visualizer/canvas/styling/StylingShowcase.ned
@@ -7,7 +7,7 @@ import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.AdhocHost;
 import inet.node.inet.WirelessHost;
 import inet.node.wireless.AccessPoint;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 
 
@@ -27,7 +27,7 @@ network StylingShowcase
         configurator: Ipv4NetworkConfigurator {
             @display("p=50,100");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=50,150");
         }
 }
@@ -48,7 +48,7 @@ network AnnotationShowcase
         configurator: Ipv4NetworkConfigurator {
             @display("p=50,100");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=50,150");
         }
         accessPoint: AccessPoint {

diff --git a/showcases/visualizer/canvas/submoduleinfo/SubmoduleInformationVisualizationShowcase.ned b/showcases/visualizer/canvas/submoduleinfo/SubmoduleInformationVisualizationShowcase.ned
@@ -2,9 +2,10 @@ package inet.showcases.visualizer.canvas.submoduleinfo;
 
 import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.AdhocHost;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 
+
 network SubmoduleInformationVisualizationShowcase
 {
     submodules:
@@ -14,7 +15,7 @@ network SubmoduleInformationVisualizationShowcase
         configurator: Ipv4NetworkConfigurator {
             @display("p=100,200");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=100,300");
         }
         source: AdhocHost {

diff --git a/showcases/visualizer/canvas/transportpathactivity/TransportPathVisualizerShowcase.ned b/showcases/visualizer/canvas/transportpathactivity/TransportPathVisualizerShowcase.ned
@@ -10,7 +10,7 @@ import inet.node.ethernet.EthernetSwitch;
 import inet.node.inet.AdhocHost;
 import inet.node.inet.Router;
 import inet.node.inet.StandardHost;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 import inet.visualizer.common.TransportRouteVisualizer;
 
@@ -45,7 +45,7 @@ network TransportPathVisualizerSimpleWirelessShowcase
         configurator: Ipv4NetworkConfigurator {
             @display("p=80,120");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=80,190");
         }
         source: AdhocHost {

diff --git a/showcases/visualizer/osg/earth/EarthVisualizationShowcase.ned b/showcases/visualizer/osg/earth/EarthVisualizationShowcase.ned
@@ -4,9 +4,10 @@ import inet.common.geometry.common.IGeographicCoordinateSystem;
 import inet.environment.common.PhysicalEnvironment;
 import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.AdhocHost;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.common.IntegratedVisualizer;
 
+
 network EarthVisualizationShowcase
 {
     submodules:
@@ -49,7 +50,7 @@ network EarthVisualization3 extends EarthVisualizationShowcase
         configurator: Ipv4NetworkConfigurator {
             @display("p=259,150");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=258,50");
         }
 }
diff --git a/showcases/wireless/aggregation/AggregationShowcase.ned b/showcases/wireless/aggregation/AggregationShowcase.ned
@@ -2,7 +2,7 @@ package inet.showcases.wireless.aggregation;
 
 import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
 import inet.node.inet.AdhocHost;
-import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
+import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
 import inet.visualizer.canvas.integrated.IntegratedCanvasVisualizer;
 
 
@@ -13,7 +13,7 @@ network AggregationShowcase
         configurator: Ipv4NetworkConfigurator {
             @display("p=50,50");
         }
-        radioMedium: Ieee80211ScalarRadioMedium {
+        radioMedium: Ieee80211RadioMedium {
             @display("p=50,100");
         }
         visualizer: IntegratedCanvasVisualizer {