Skip to content

Commit 621ea5f

Browse files
committed
doc: showcases: fixed parameter names, factual info, and typos
1 parent f56e0a0 commit 621ea5f

File tree

15 files changed

+35
-36
lines changed

15 files changed

+35
-36
lines changed

showcases/measurement/flow/omnetpp.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ abstract = true
9797
*.client*.measurementLayer.measurementStarter[1].flowName = "BG"
9898
*.client*.measurementLayer.measurementStarter[1].packetFilter = expr(has(udp) && udp.srcPort == 1000)
9999
*.client*.measurementLayer.measurementStarter[*].measure = "elapsedTime or queueingTime"
100-
*.client*.measurementLayer.measurementRecorder[*].typename = ""
100+
*.client*.measurementLayer.measurementMaker[*].typename = ""
101101

102-
*.server*.measurementLayer.measurementRecorder[0].flowName = "VID or BG"
103-
*.server*.measurementLayer.measurementRecorder[*].measure = "elapsedTime or queueingTime"
102+
*.server*.measurementLayer.measurementMaker[0].flowName = "VID or BG"
103+
*.server*.measurementLayer.measurementMaker[*].measure = "elapsedTime or queueingTime"
104104
*.server*.measurementLayer.measurementStarter[*].typename = ""

showcases/mobility/basic/doc/index.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ Some of these mobility models are introduced by the following example simulation
9595
LinearMobility
9696
~~~~~~~~~~~~~~
9797

98-
The :ned:`LinearMobility` module describes linear motion with a constant speed or
99-
constant acceleration. As such, it has parameters for speed and starting angle.
98+
The :ned:`LinearMobility` module describes linear motion with a constant speed.
99+
As such, it has parameters for speed and starting heading.
100100
The model also has parameters for initial positioning (:par:`initialX`,
101101
:par:`initialY`, :par:`initialZ`), which, by default, are random
102102
values inside the constraint area.
@@ -108,8 +108,8 @@ The configuration in omnetpp.ini is the following:
108108
:start-at: *.host[*].mobility.typename = "LinearMobility"
109109
:end-at: speed
110110

111-
We leave the angle parameter on its default value, which is
112-
a random value.
111+
We leave the :par:`initialMovementHeading` parameter on its default value,
112+
which is a random value.
113113

114114
The following video shows the motion of the nodes:
115115

showcases/mobility/combining/doc/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ You can take a look at the ``Superpositioning1`` configuration in omnetpp.ini:
159159
160160
The :par:`numElements` parameter defines the number of mobility submodules,
161161
which are contained in a submodule vector named :par:`element`.
162-
Therefore, instead of :par:`mobility.typeName = XY`, the mobility
163-
submodules can be referenced with :par:`mobility.element[0].typeName = XY`.
162+
Therefore, instead of :par:`mobility.typename = XY`, the mobility
163+
submodules can be referenced with :par:`mobility.element[0].typename = XY`.
164164
This is also visible if we take a look at the inside of ``host[0]``'s
165165
mobility submodule:
166166

showcases/routing/manet/ManetProtocolsShowcase.ned

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package inet.showcases.routing.manet;
33
import inet.networklayer.configurator.ipv4.Ipv4NetworkConfigurator;
44
import inet.node.inet.ManetRouter;
55
import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211RadioMedium;
6-
import inet.physicallayer.wireless.ieee80211.packetlevel.Ieee80211ScalarRadioMedium;
76
import inet.visualizer.canvas.integrated.IntegratedMultiCanvasVisualizer;
87

98

@@ -111,7 +110,7 @@ network ManetprotocolsShowcaseB
111110
destination: ManetRouter {
112111
@display("p=292,80");
113112
}
114-
radioMedium: Ieee80211ScalarRadioMedium {
113+
radioMedium: Ieee80211RadioMedium {
115114
@display("p=38,28");
116115
}
117116
configurator: Ipv4NetworkConfigurator {

showcases/routing/manet/doc/index.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ Configuration and Results
203203
This section contains the configuration and results for the three
204204
simulations, which demonstrate the MANET routing protocols ``AODV``,
205205
``DSDV`` and ``GPSR``. The AODV and DSDV simulations use the
206-
``ManetRoutingProtocolsShowcaseA`` network, which features moving hosts.
207-
The GPSR simulation uses the ``ManetRoutingProtocolsShowcaseB`` network,
206+
``ManetprotocolsShowcaseB`` network, which features moving hosts.
207+
The GPSR simulation uses the ``ManetprotocolsShowcaseA`` network,
208208
featuring stationary hosts. The networks are defined in
209209
:download:`ManetProtocolsShowcase.ned <../ManetProtocolsShowcase.ned>`.
210210
Both networks contain hosts of the type :ned:`ManetRouter` (an extension of
@@ -241,7 +241,7 @@ AODV
241241

242242
The example simulation featuring AODV is defined in the :ned:`Aodv`
243243
configuration in :download:`omnetpp.ini <../omnetpp.ini>`. This
244-
configuration uses the ``ManetProtocolShowcaseB`` network. The network
244+
configuration uses the ``ManetprotocolsShowcaseB`` network. The network
245245
looks like the following:
246246

247247
.. figure:: media/networkA.png
@@ -329,12 +329,12 @@ leading to ``destination``. When the route is established in ``source``,
329329
it sends the ping request packet, which gets to the destination. The
330330
ping reply packet gets back to ``source`` on the reverse path.
331331

332-
When source sends the next ping request packet, ``host6`` has already
332+
When source sends the next ping request packet, ``node6`` has already
333333
moved out of range of ``destination``. The ping packet gets to
334-
``host6``, but can't get to ``destination`` (``host6`` tries to transmit
335-
the packet a few times, but it doesn't get an ACK). So ``host6``
334+
``node6``, but can't get to ``destination`` (``node6`` tries to transmit
335+
the packet a few times, but it doesn't get an ACK). So ``node6``
336336
broadcasts an ``AodvRerr`` message, indicating that the link no longer
337-
works. When the RERR gets back to ``host1``, it initiates route discovery
337+
works. When the RERR gets back to ``node1``, it initiates route discovery
338338
by broadcasting an RREQ message. When a new route is discovered
339339
(``source``->``node1``->``destination``), the ping traffic can continue.
340340

@@ -350,7 +350,7 @@ DSDV
350350
The example simulation featuring DSDV is defined in the :ned:`Dsdv`
351351
configuration in :download:`omnetpp.ini <../omnetpp.ini>`. Just like
352352
the AODV configuration, this one uses the
353-
``ManetRoutingProtocolsShowcaseB`` network. The mobility settings are
353+
``ManetprotocolsShowcaseB`` network. The mobility settings are
354354
also the same as in the AODV simulation. The ping app in ``source`` will
355355
send a ping request every second.
356356

showcases/tsn/timesynchronization/clockdrift/doc/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ simulation time. Also, we need to explicitly tell the relevant modules (here,
145145
the UDP apps and ``switch1``'s queue) to use the clock module in the host,
146146
otherwise, they would use the global simulation time by default.
147147

148-
We set the :par:`nominalTickLenght` parameter of all oscillators to 10ns, which is a typical value for
148+
We set the :par:`nominalTickLength` parameter of all oscillators to 10ns, which is a typical value for
149149
real-world clocks. To be able to represent 1 PPM clock drift, we set fs simulation time accuracy (10ns / 10^6 = 10fs).
150150

151151
Here are the drifts (time differences) over time:

showcases/tsn/trafficshaping/creditbasedshaper/doc/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ To conveniently incorporate a credit-based shaper into a network interface, it
6464
can be added as a submodule to an :ned:`Ieee8021qTimeAwareShaper`. The
6565
:ned:`Ieee8021qTimeAwareShaper` module supports a configurable number of traffic
6666
classes, pre-existing queues for each class, and can be enabled for Ethernet
67-
interfaces by setting the :par:`enableEgressTrafficShaping` parameter in the
67+
interfaces by setting the :par:`hasEgressTrafficShaping` parameter in the
6868
network node to ``true``. To utilize a credit-based shaper, the
6969
``transmissionSelectionAlgorithm`` submodule of the time-aware shaper can be
7070
overridden accordingly. As an example, here is a time-aware shaper module that
@@ -129,7 +129,7 @@ Within the client, our goal is to classify packets originating from the two
129129
packet sources into two traffic classes: `best effort` and
130130
`video`. To achieve this, we activate IEEE 802.1 stream
131131
identification and stream encoding functionalities by setting the
132-
:par:`hasOutgoingStreams` parameter in the switch to ``true``. We proceed by configuring the stream
132+
:par:`hasOutgoingStreams` parameter in the client to ``true``. We proceed by configuring the stream
133133
identifier module within the bridging layer; this module is responsible for
134134
associating outgoing packets with named streams based on their UDP destination
135135
ports. Following this, the stream encoder sets the Priority Code Point (PCP) number on the packets according to

showcases/tsn/trafficshaping/timeawareshaper/doc/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Visualizing Gate Schedules
7474

7575
The configured gate schedules can be visualized with the :ned:`GateScheduleVisualizer` module. It displays a gate schedule in time, as a colored bar near the network node containing the gate, on the top-level canvas (by default, to the right). The horizontal axis of the bar is time, and the current time is indicated by a dashed vertical line in the center. The gate schedule is displayed as color-coded blocks on the bar. Green blocks signify the open, and red blocks the closed gate state. The blocks move to the right with simulation time, so that the current time is in the center, the past is to the left, and the future is to the right. Thus, the visualization shows if the gate is currently open or closed, and when it will change state in the future.
7676

77-
The visualization can be enabled by setting the visualizer's :par:`displayGates` parameter to ``true``. By default, it displays all gates in the network, but this can be narrowed down with the
77+
The visualization can be enabled by setting the visualizer's :par:`displayGateSchedules` parameter to ``true``. By default, it displays all gates in the network, but this can be narrowed down with the
7878
:par:`gateFilter` parameter.
7979

8080
For example, two gates in the same interface are visualized on the image below:

showcases/visualizer/canvas/mobility/doc/index.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ About the Visualizer
2020
In INET, the mobility of nodes can be visualized by :ned:`MobilityVisualizer`
2121
module (included in the network as part of :ned:`IntegratedCanvasVisualizer`). By
2222
default, mobility visualization is enabled; it can be disabled by
23-
setting :par:`displayMovements` parameter to false.
23+
setting :par:`displayMobility` parameter to false.
2424

2525
By default, all mobilities are considered for the visualization. This
2626
selection can be narrowed with the visualizer's :par:`moduleFilter`
@@ -37,9 +37,9 @@ The visualizer has several important features:
3737
movement's direction. The arrow's length is proportional to the
3838
node's speed.
3939
- **Orientation Arc**: Node orientation is represented by an arc whose
40-
size is specified by the :par:`orientationArcSize` parameter. This value
40+
size is specified by the :par:`orientationPieSize` parameter. This value
4141
is the relative size of the arc compared to a full circle. The arc's
42-
default value is 0.25, i.e. a quarter of a circle.
42+
default value is 0.2, i.e. a fifth of a circle.
4343

4444
These features are disabled by default; they can be enabled by setting
4545
the visualizer's :par:`displayMovementTrails`, :par:`displayVelocities` and

showcases/visualizer/canvas/packetdrop/doc/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ are visualized. This selection can be narrowed with the :par:`nodeFilter`,
3131
(The :par:`packetFilter` can filter for packet properties, such as name, fields, chunks, protocol headers, etc.)
3232
Additionally, use the :par:`detailsFilter` parameter to filter for packet drop reasons.
3333

34-
The :par:`packetFormat` parameter is a format string and specifies the text displayed with the packet drop animation.
34+
The :par:`labelFormat` parameter is a format string and specifies the text displayed with the packet drop animation.
3535
By default, the dropped packet's name is displayed.
3636
The format string can contain the following directives:
3737

0 commit comments

Comments
 (0)