Skip to content

Commit

Permalink
todo review
Browse files Browse the repository at this point in the history
  • Loading branch information
adamgeorge309 committed Jan 29, 2025
1 parent 5f7012e commit 1cb7aa2
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
2 changes: 1 addition & 1 deletion showcases/visualizer/canvas/ieee80211/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ interfaces of all nodes are considered.

Furthermore, the visualization takes the signal strength of the various Wifi networks into account,
indicating it with the number of levels in the Wifi icon. The visualizer's :par:`minPower` and :par:`maxPower`
parameter can configure the indicated power levels.
parameters control the range of indicated power levels.

Basic use
---------
Expand Down
2 changes: 1 addition & 1 deletion showcases/visualizer/canvas/packetdrop/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The format string can contain the following directives:
- `%r`: drop reason number
- `%s`: drop reason string

Here are some reasons packets can be dropped:
Here are some reasons for which packets can be dropped:

.. For example, packets can be dropped for the following reasons:
Expand Down
13 changes: 6 additions & 7 deletions showcases/wireless/analogmodel/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The transmission, propagation, and reception process is as follows:
- The analog model submodule of the radio medium module applies attenuation (potentially in a space, time, and frequency-dependent way).
- The receiver module gets a physical representation of the signal and the calculated signal-to-noise-and-interference-ratio (SNIR) from the radio medium module.

The different types of transmitter, receivers and radio mediums each have a :par:`signalAnalogRepresentation` parameter
The different types of transmitters, receivers and radio mediums each have a :par:`signalAnalogRepresentation` parameter
to select one of the analog models.

INET contains the following analog model types, presented in the order of increasing complexity:
Expand Down Expand Up @@ -63,7 +63,7 @@ Here are some of radio types available in INET:

- :ned:`GenericRadio`: simple radio model with parameters for bitrate, header length and preamble duration; contains :ned:`GenericTransmitter` and :ned:`GenericReceiver`
- :ned:`ApskRadio`: a hypotetical radio that uses one of the well-known modulations without utilizing techniques such as forward error correction, interleaving, or spreading; contains :ned:`ApskTransmitter` and :ned:`ApskReceiver`
- :ned:`Ieee80211Radio`: Wifi radio; contains :ned:`Ieee80211Transmitter`, :ned:`Ieee80211Receiver`, and :ned:`Ieee80211Mac`
- :ned:`Ieee80211Radio`: Wifi radio; contains :ned:`Ieee80211Transmitter` and :ned:`Ieee80211Receiver`.

Unit Disk Model
---------------
Expand Down Expand Up @@ -165,8 +165,7 @@ spectra are not supported by this model (and result in an error).
:align: center
:width: 60%

INET supports the scalar analog model in radio and radio medium modules for all available wireless technologies,
such as IEEE 802.11, 802.15.4 and the generic :ned:`ApskRadio`.
INET supports the scalar analog model in several radio and radio medium modules, such as IEEE 802.11, 802.15.4 and the generic :ned:`ApskRadio`.

The scalar model is more realistic than the unit disk model but also more computationally intensive.
It can't simulate partially overlapping spectra, only completely overlapping or not overlapping at all.
Expand All @@ -176,7 +175,7 @@ error modeling is needed.
.. note:: In showcases and tutorials, the scalar model is the most commonly used, it's a kind of arbitrary default. When a less complex model is adequate in a showcase or tutorial, the unit disk model is used; when a more complex one is needed, the dimensional is chosen.

Example: SNIR and Packet Error Rate vs. Distance
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

In the example simulation, an :ned:`AdhocHost` sends UDP packets to another. The source host is stationary,
the destination host moves away from the source host. As the distance increases between them,
Expand Down Expand Up @@ -288,8 +287,8 @@ The dimensional transmitters in INET use the API to create transmissions. For ex

.. note:: The dimensional transmitters in INET select the most optimal representation for the signal, depending on the gains parameters (described later). For example, if the parameters describe a flat signal, they'll use a boxcar function (in 1D or 2D, whether the signal is flat in one or two dimensions). If the gains parameters describe a complex function, they'll use the generic interpolated function; the gains parameter string actually maps to the samples and the types of interpolation between them.

All radios in INET, such as IEEE 802.11, narrowband and ultra-wideband 802.15.4,
and APSK radio support the dimensional analog model (the 802.15.4 ultra-wideband version only supports the dimensional model).
Several radios in INET, such as IEEE 802.11, narrowband and ultra-wideband 802.15.4,
and APSK radio support the dimensional analog model.

The signal shapes in frequency and time can be defined with the :par:`frequencyGains`
and :par:`timeGains` parameters of transmitter modules. Here is an example signal spectrum definition:
Expand Down
8 changes: 4 additions & 4 deletions showcases/wireless/coexistence/doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ simulation to work. Most of the time, one could just use RadioMedium with its
default parameters (with the exception of setting the analog signal representation
type to dimensional when simulating CTI).

For our simulation, we'll use :ned:`RadioMedium`. Since we'll have two different
protocols, the analog model and the background noise of the radio medium and the
protocol specific radios need to match (the analog model needs to be dimensional).
For our simulation, we'll use :ned:`RadioMedium`, because we'll have two different
protocols. The analog model and the background noise of the radio medium and the
protocol specific radios need to be dimensional.
We'll set just these two parameters, and leave the others on default.

In INET, different types of radio modules (e.g. 802.11 and 802.15.4) can detect
Expand Down Expand Up @@ -175,7 +175,7 @@ The simulation is defined in the ``Coexistence`` configuration in
:download:`omnetpp.ini <../omnetpp.ini>`. The radio medium module in the network
is a :ned:`RadioMedium`. It is configured to use the :ned:`DimensionalMediumAnalogModel`.
The background noise type is set to :ned:`IsotropicDimensionalBackgroundNoise`,
with a spectral power density of -113 dBmW/MHz. Here is the radio medium configuration in
with a power spectral density of -113 dBmW/MHz. Here is the radio medium configuration in
:download:`omnetpp.ini <../omnetpp.ini>`:

.. literalinclude:: ../omnetpp.ini
Expand Down

0 comments on commit 1cb7aa2

Please sign in to comment.