From 59246fb83df3f469131a0d172f1234427a3bec5f Mon Sep 17 00:00:00 2001 From: Eduardo Almeida Date: Mon, 2 Oct 2023 23:21:24 +0100 Subject: [PATCH] Fix spelling typos --- CHANGES.md | 9 +++- RELEASE_NOTES.md | 2 +- doc/manual/source/utilities.rst | 4 +- examples/wireless/wifi-spatial-reuse.cc | 2 +- src/aodv/model/aodv-packet.h | 2 +- src/core/model/wall-clock-synchronizer.cc | 2 +- src/core/test/int64x64-test-suite.cc | 16 +++---- src/dsr/model/dsr-options.cc | 2 +- .../examples/realtime-fd2fd-onoff.cc | 4 +- src/internet-apps/model/dhcp-header.cc | 22 ++++----- src/internet/doc/tcp.rst | 2 +- src/internet/model/arp-l3-protocol.cc | 2 +- src/lr-wpan/doc/lr-wpan.rst | 10 ++-- src/lte/doc/source/lte-testing.rst | 2 +- src/lte/examples/lena-simple-epc-backhaul.cc | 2 +- src/lte/examples/lena-simple-epc.cc | 5 +- src/lte/helper/emu-epc-helper.cc | 7 +-- src/lte/helper/emu-epc-helper.h | 7 +-- src/lte/helper/epc-helper.cc | 7 +-- src/lte/helper/epc-helper.h | 7 +-- src/lte/helper/point-to-point-epc-helper.cc | 9 ++-- src/lte/helper/point-to-point-epc-helper.h | 9 ++-- .../helper/radio-bearer-stats-connector.cc | 5 +- src/lte/helper/radio-bearer-stats-connector.h | 5 +- .../model/a2-a4-rsrq-handover-algorithm.cc | 8 ++-- src/lte/model/a2-a4-rsrq-handover-algorithm.h | 8 ++-- src/lte/model/epc-enb-application.h | 5 +- src/lte/model/fdbet-ff-mac-scheduler.cc | 24 +++++----- src/lte/model/fdbet-ff-mac-scheduler.h | 8 ++-- src/lte/model/lte-anr.cc | 8 ++-- src/lte/model/lte-anr.h | 8 ++-- src/lte/model/lte-enb-rrc.cc | 16 ++++--- src/lte/model/lte-enb-rrc.h | 13 ++--- src/lte/model/lte-radio-bearer-tag.h | 2 +- src/lte/model/lte-rlc-am-header.h | 2 +- src/lte/model/lte-ue-rrc.h | 2 +- src/lte/model/pf-ff-mac-scheduler.cc | 24 +++++----- src/lte/model/pf-ff-mac-scheduler.h | 8 ++-- .../simple-ue-component-carrier-manager.cc | 2 +- src/lte/model/tdbet-ff-mac-scheduler.cc | 24 +++++----- src/lte/model/tdbet-ff-mac-scheduler.h | 8 ++-- src/lte/test/epc-test-run-time.pl | 2 +- src/lte/test/lte-ffr-simple.cc | 4 +- src/lte/test/lte-ffr-simple.h | 4 +- src/lte/test/lte-simple-helper.cc | 3 +- src/lte/test/lte-simple-helper.h | 3 +- src/lte/test/lte-test-entities.cc | 34 +++++++------- src/lte/test/lte-test-frequency-reuse.cc | 36 +++++++------- src/lte/test/lte-test-interference-fr.cc | 6 +-- src/lte/test/lte-test-interference-fr.h | 6 +-- src/lte/test/lte-test-rr-ff-mac-scheduler.cc | 4 +- src/lte/test/lte-test-run-time.pl | 2 +- .../test/lte-test-spectrum-value-helper.cc | 2 +- src/lte/test/lte-test-ue-phy.h | 3 +- src/lte/test/lte-test-uplink-power-control.cc | 24 +++++----- src/lte/test/test-epc-tft-classifier.cc | 5 +- src/lte/test/test-lte-x2-handover-measures.cc | 5 +- src/mesh/model/mesh-point-device.cc | 6 +-- .../reference-point-group-mobility-example.cc | 2 +- src/mobility/helper/ns2-mobility-helper.cc | 2 +- src/network/utils/queue-size.cc | 36 +++++++------- src/network/utils/queue-size.h | 36 +++++++------- src/propagation/doc/propagation.rst | 2 +- .../model/channel-condition-model.cc | 6 +-- src/spectrum/test/two-ray-splm-test-suite.cc | 2 +- src/traffic-control/doc/fq-cobalt.rst | 2 +- .../examples/codel-vs-pfifo-asymmetric.cc | 2 +- src/traffic-control/model/codel-queue-disc.cc | 5 +- src/traffic-control/model/codel-queue-disc.h | 5 +- src/uan/model/uan-mac-rc.h | 2 +- src/wifi/doc/source/wifi-design.rst | 2 +- src/wifi/examples/reference/bianchi11ax.py | 20 ++++---- src/wimax/model/bs-net-device.h | 2 +- src/wimax/model/wimax-net-device.h | 18 +++---- utils/bench-scheduler.cc | 4 +- utils/codespell-ignored-lines | 43 +++++++++++++++++ utils/codespell-ignored-words | 47 ++----------------- utils/tests/README.md | 2 +- 78 files changed, 365 insertions(+), 338 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 73d262a7b..fddd2c207 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,6 +20,11 @@ Changes from ns-3.40 to ns-3-dev ### Changes to existing API +* The spelling of the following files, classes, functions, constants, defines and enumerated values was corrected; this will affect existing users who were using them with the misspelling. + * (lte) Struct member `fdbetsFlowPerf_t::lastTtiBytesTrasmitted` in file `fdbet-ff-mac-scheduler.h` was renamed `fdbetsFlowPerf_t::lastTtiBytesTransmitted`. + * (lte) Struct member `tdbetsFlowPerf_t::lastTtiBytesTrasmitted` in file `tdbet-ff-mac-scheduler.h` was renamed `fdbetsFlowPerf_t::lastTtiBytesTransmitted`. + * (lte) Struct member `pfsFlowPerf_t::lastTtiBytesTrasmitted` in file `pf-ff-mac-scheduler.h` was renamed `fdbetsFlowPerf_t::lastTtiBytesTransmitted`. + ### Changes to build system ### Changed behavior @@ -59,7 +64,7 @@ Changes from ns-3.38 to ns-3.39 ### New API -* (lr-wpan) Added support for orphan scans. Orphan scans can now be performed using the existing `LrWpanMac::MlmeScanRequest`; This orphan scan use the added orphan notification commands and coordinator realigment commands. Usage is shown in added `lr-wpan-orphan-scan.cc` example and in the `TestOrphanScan` included in `lr-wpan-mac-test.cc`. +* (lr-wpan) Added support for orphan scans. Orphan scans can now be performed using the existing `LrWpanMac::MlmeScanRequest`; This orphan scan use the added orphan notification commands and coordinator realignment commands. Usage is shown in added `lr-wpan-orphan-scan.cc` example and in the `TestOrphanScan` included in `lr-wpan-mac-test.cc`. * (network) Added `Mac64Address::ConvertToInt`. Converts a Mac64Address object to a uint64_t. * (network) Added `Mac16Address::ConvertToInt`. Converts a Mac16Address object to a uint16_t. * (network) Added `Mac16Address::Mac16Address(uint16t addr)` and `Mac16Address::Mac64Address(uint64t addr)` constructors. @@ -500,7 +505,7 @@ Changes from ns-3.30 to ns-3.31 * (as reported above) previously the `Config::Connect` and `Config::Set` families of functions would fail silently if the attribute or trace source didn't exist on the path given (typically due to spelling errors). Now those functions will throw a fatal error. If you need the old behavior use the new `...FailSafe ()` variants. * Attempting to deserialize an enum name which wasn't registered with `MakeEnumChecker` now causes a fatal error, rather failing silently. (This can be triggered by setting an enum Attribute from a StringValue.) * As a result of the above API changes in `MobilityBuildingInfo` and `BuildingsHelper` classes, a building aware pathloss models, e.g., `HybridBuildingsPropagationLossModel` is now able to accurately compute the pathloss for a node moving in and out of buildings in a simulation. See [issue 80](https://gitlab.com/nsnam/ns-3-dev/issues/80) for discussion. -* The implementation of the **Wi-Fi channel access** functions has been improved to make them more conformant to the IEEE 802.11-2016 standard. Concerning the DCF, the backoff procedure is no longer invoked when a packet is queued for transmission and the medium has not been idle for a DIFS, but it is invoked if the medium is busy or does not remain idle for a DIFS after the packet has been queued. Concerning the EDCAF, tranmissions are now correctly aligned at slot boundaries. +* The implementation of the **Wi-Fi channel access** functions has been improved to make them more conformant to the IEEE 802.11-2016 standard. Concerning the DCF, the backoff procedure is no longer invoked when a packet is queued for transmission and the medium has not been idle for a DIFS, but it is invoked if the medium is busy or does not remain idle for a DIFS after the packet has been queued. Concerning the EDCAF, transmissions are now correctly aligned at slot boundaries. * Various wifi physical layer behavior around channel occupancy calculation, phy state calculation, and handling different channel widths has been updated. Changes from ns-3.29 to ns-3.30 diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 2eb54bb0d..02f488230 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1273,7 +1273,7 @@ This release has been tested on the following platforms: - Bug 2587 - tcp: Avoid overflow in htcp.cc - Bug 2590 - traffic-control: Minor enhancements in red-queue-disc{.h, .cc} - Bug 2591 - wifi: 802.11e Block Ack cannot be enabled on HT/VHT stations -- Bug 2594 - wifi: vht-wifi-network very low throughtput at MCS 6, 160 MHz, SGI +- Bug 2594 - wifi: vht-wifi-network very low throughput at MCS 6, 160 MHz, SGI - Bug 2596 - network: EthernetTrailer::GetFcs() should be const - Bug 2601 - wifi: HT stations should use 40 MHz width if configured 80 or 160z - Bug 2604 - wifi: QosData frames separation with Block Ack enabled diff --git a/doc/manual/source/utilities.rst b/doc/manual/source/utilities.rst index 491e58da1..bc2705131 100644 --- a/doc/manual/source/utilities.rst +++ b/doc/manual/source/utilities.rst @@ -94,10 +94,10 @@ Command-line Arguments Program Options: --all: use all schedulers [false] - --cal: use CalendarSheduler [false] + --cal: use CalendarScheduler [false] --calrev: reverse ordering in the CalendarScheduler [false] --heap: use HeapScheduler [false] - --list: use ListSheduler [false] + --list: use ListScheduler [false] --map: use MapScheduler (default) [true] --pri: use PriorityQueue [false] --debug: enable debugging output [false] diff --git a/examples/wireless/wifi-spatial-reuse.cc b/examples/wireless/wifi-spatial-reuse.cc index efcdcfa17..d373b0ba7 100644 --- a/examples/wireless/wifi-spatial-reuse.cc +++ b/examples/wireless/wifi-spatial-reuse.cc @@ -34,7 +34,7 @@ // // STA1 is continuously transmitting data to AP1, while STA2 is continuously sending data to AP2. // Each STA has configurable traffic loads (inter packet interval and packet size). -// It is also possible to configure TX power per node as well as their CCA-ED tresholds. +// It is also possible to configure TX power per node as well as their CCA-ED thresholds. // OBSS_PD spatial reuse feature can be enabled (default) or disabled, and the OBSS_PD // threshold can be set as well (default: -72 dBm). // A simple Friis path loss model is used and a constant PHY rate is considered. diff --git a/src/aodv/model/aodv-packet.h b/src/aodv/model/aodv-packet.h index 47ad243cf..029012207 100644 --- a/src/aodv/model/aodv-packet.h +++ b/src/aodv/model/aodv-packet.h @@ -485,7 +485,7 @@ class RrepHeader : public Header */ void SetPrefixSize(uint8_t sz); /** - * \brief Set the pefix size + * \brief Set the prefix size * \return the prefix size */ uint8_t GetPrefixSize() const; diff --git a/src/core/model/wall-clock-synchronizer.cc b/src/core/model/wall-clock-synchronizer.cc index 0f1d386f7..f11b84ee2 100644 --- a/src/core/model/wall-clock-synchronizer.cc +++ b/src/core/model/wall-clock-synchronizer.cc @@ -128,7 +128,7 @@ WallClockSynchronizer::DoGetDrift(uint64_t ns) // then subtract the current real time in normalized nanoseconds we just got // from the normalized simulation time in nanoseconds that is passed in as // the parameter ns. We return an integer difference, but in reality all of - // the mechanisms that cause wall-clock to simuator time drift cause events + // the mechanisms that cause wall-clock to simulator time drift cause events // to be late. That means that the wall-clock will be higher than the // simulation time and drift will be positive. I would be astonished to // see a negative drift, but the possibility is admitted for other diff --git a/src/core/test/int64x64-test-suite.cc b/src/core/test/int64x64-test-suite.cc index cf9933bb8..dd691477e 100644 --- a/src/core/test/int64x64-test-suite.cc +++ b/src/core/test/int64x64-test-suite.cc @@ -485,7 +485,7 @@ Int64x64ArithmeticTestCase::DoRun() const int64x64_t zero(0, 0); const int64x64_t one(1, 0); const int64x64_t two(2, 0); - const int64x64_t thre(3, 0); + const int64x64_t three(3, 0); std::cout << std::endl; std::cout << GetParent()->GetName() << " Arithmetic: " << GetName() << std::endl; @@ -497,14 +497,14 @@ Int64x64ArithmeticTestCase::DoRun() Check(3, one - two, -one); Check(4, one - (-one), two); Check(5, (-one) - (-two), one); - Check(6, (-one) - two, -thre); + Check(6, (-one) - two, -three); Check(7, zero + zero, zero); Check(8, zero + one, one); Check(9, one + one, two); - Check(10, one + two, thre); + Check(10, one + two, three); Check(11, one + (-one), zero); - Check(12, (-one) + (-two), -thre); + Check(12, (-one) + (-two), -three); Check(13, (-one) + two, one); Check(14, zero * zero, zero); @@ -514,7 +514,7 @@ Int64x64ArithmeticTestCase::DoRun() Check(18, one * (-one), -one); Check(19, (-one) * (-one), one); - Check(20, (two * thre) / thre, two); + Check(20, (two * three) / three, two); // NOLINTEND(misc-redundant-expression) const int64x64_t frac = int64x64_t(0, 0xc000000000000000ULL); // 0.75 @@ -526,7 +526,7 @@ Int64x64ArithmeticTestCase::DoRun() const int64x64_t zerof = zero + frac; const int64x64_t onef = one + frac; const int64x64_t twof = two + frac; - const int64x64_t thref = thre + frac; + const int64x64_t thref = three + frac; // NOLINTBEGIN(misc-redundant-expression) Check(23, zerof, frac); @@ -559,11 +559,11 @@ Int64x64ArithmeticTestCase::DoRun() // NOLINTEND(misc-redundant-expression) // Multiplication followed by division is exact: - Check(46, (two * thre) / thre, two); + Check(46, (two * three) / three, two); Check(47, (twof * thref) / thref, twof); // Division followed by multiplication loses a bit or two: - Check(48, (two / thre) * thre, two, 2 * tol1); + Check(48, (two / three) * three, two, 2 * tol1); Check(49, (twof / thref) * thref, twof, 3 * tol1); // The example below shows that we really do not lose diff --git a/src/dsr/model/dsr-options.cc b/src/dsr/model/dsr-options.cc index 8dd292c80..fcf7c9770 100644 --- a/src/dsr/model/dsr-options.cc +++ b/src/dsr/model/dsr-options.cc @@ -1759,7 +1759,7 @@ DsrOptionAckReq::Process(Ptr packet, DsrOptionAckReqHeader ackReq; p->RemoveHeader(ackReq); /* - * Get the node with ip address and get the dsr extension and reoute cache objects + * Get the node with ip address and get the dsr extension and route cache objects */ Ptr node = GetNodeWithAddress(ipv4Address); Ptr dsr = node->GetObject(); diff --git a/src/fd-net-device/examples/realtime-fd2fd-onoff.cc b/src/fd-net-device/examples/realtime-fd2fd-onoff.cc index 19f3fa64e..2d35cffaa 100644 --- a/src/fd-net-device/examples/realtime-fd2fd-onoff.cc +++ b/src/fd-net-device/examples/realtime-fd2fd-onoff.cc @@ -28,10 +28,10 @@ // | fd-net-device |--------------| fd-net-device | // +----------------+ +----------------+ // -// This example is aimed at measuring the thoughput of the FdNetDevice +// This example is aimed at measuring the throughput of the FdNetDevice // in a pure simulation. For this purpose two FdNetDevices, attached to // different nodes but in a same simulation, are connected using a socket pair. -// TCP traffic is sent at a saturating data rate. Then the thoughput can +// TCP traffic is sent at a saturating data rate. Then the throughput can // be obtained from the generated .pcap files. // // Steps to run the experiment: diff --git a/src/internet-apps/model/dhcp-header.cc b/src/internet-apps/model/dhcp-header.cc index df9d5a603..c7cac11a8 100644 --- a/src/internet-apps/model/dhcp-header.cc +++ b/src/internet-apps/model/dhcp-header.cc @@ -383,8 +383,8 @@ uint32_t DhcpHeader::Deserialize(Buffer::Iterator start) { uint32_t len; - uint32_t clen = start.GetSize(); - if (clen < 240) + uint32_t cLen = start.GetSize(); + if (cLen < 240) { NS_LOG_WARN("Malformed Packet"); return 0; @@ -416,7 +416,7 @@ DhcpHeader::Deserialize(Buffer::Iterator start) bool loop = true; do { - if (len + 1 <= clen) + if (len + 1 <= cLen) { option = i.ReadU8(); len += 1; @@ -429,7 +429,7 @@ DhcpHeader::Deserialize(Buffer::Iterator start) switch (option) { case OP_MASK: - if (len + 5 < clen) + if (len + 5 < cLen) { i.ReadU8(); m_mask = i.ReadNtohU32(); @@ -442,7 +442,7 @@ DhcpHeader::Deserialize(Buffer::Iterator start) } break; case OP_ROUTE: - if (len + 5 < clen) + if (len + 5 < cLen) { i.ReadU8(); ReadFrom(i, m_route); @@ -455,7 +455,7 @@ DhcpHeader::Deserialize(Buffer::Iterator start) } break; case OP_MSGTYPE: - if (len + 2 < clen) + if (len + 2 < cLen) { i.ReadU8(); m_op = (i.ReadU8() - 1); @@ -468,7 +468,7 @@ DhcpHeader::Deserialize(Buffer::Iterator start) } break; case OP_SERVID: - if (len + 5 < clen) + if (len + 5 < cLen) { i.ReadU8(); ReadFrom(i, m_dhcps); @@ -481,7 +481,7 @@ DhcpHeader::Deserialize(Buffer::Iterator start) } break; case OP_ADDREQ: - if (len + 5 < clen) + if (len + 5 < cLen) { i.ReadU8(); ReadFrom(i, m_req); @@ -494,7 +494,7 @@ DhcpHeader::Deserialize(Buffer::Iterator start) } break; case OP_LEASE: - if (len + 5 < clen) + if (len + 5 < cLen) { i.ReadU8(); m_lease = i.ReadNtohU32(); @@ -507,7 +507,7 @@ DhcpHeader::Deserialize(Buffer::Iterator start) } break; case OP_RENEW: - if (len + 5 < clen) + if (len + 5 < cLen) { i.ReadU8(); m_renew = i.ReadNtohU32(); @@ -520,7 +520,7 @@ DhcpHeader::Deserialize(Buffer::Iterator start) } break; case OP_REBIND: - if (len + 5 < clen) + if (len + 5 < cLen) { i.ReadU8(); m_rebind = i.ReadNtohU32(); diff --git a/src/internet/doc/tcp.rst b/src/internet/doc/tcp.rst index bb4a1ca52..5515f816b 100644 --- a/src/internet/doc/tcp.rst +++ b/src/internet/doc/tcp.rst @@ -1596,7 +1596,7 @@ SACK based loss recovery is used when sender and receiver support SACK options. In the case when SACK options are disabled, the NewReno modification handles the recovery. -At the start of recovery phase the congestion window is reduced diffently for +At the start of recovery phase the congestion window is reduced differently for NewReno and SACK based recovery. For NewReno the reduction is done as given below: .. math:: cWnd = ssThresh diff --git a/src/internet/model/arp-l3-protocol.cc b/src/internet/model/arp-l3-protocol.cc index 40de28e9e..e9831d25a 100644 --- a/src/internet/model/arp-l3-protocol.cc +++ b/src/internet/model/arp-l3-protocol.cc @@ -191,7 +191,7 @@ ArpL3Protocol::Receive(Ptr device, // // If we're connected to a real world network, then some of the fields sizes // in an ARP packet can vary in ways not seen in simulations. We need to be - // able to detect ARP packets with headers we don't recongnize and not process + // able to detect ARP packets with headers we don't recognize and not process // them instead of crashing. The ArpHeader will return 0 if it can't deal // with the received header. // diff --git a/src/lr-wpan/doc/lr-wpan.rst b/src/lr-wpan/doc/lr-wpan.rst index 192a15f2d..e56dd7494 100644 --- a/src/lr-wpan/doc/lr-wpan.rst +++ b/src/lr-wpan/doc/lr-wpan.rst @@ -232,10 +232,10 @@ The receiver sensitivity can be changed to different values using ``SetRxSensiti | <--------------------------------------->| Acceptable sensitivity range -The example ``lr-wpan-per-plot.cc` shows that at given Rx sensitiviy, packets are dropped regardless of their theoretical error probability. +The example ``lr-wpan-per-plot.cc` shows that at given Rx sensitivity, packets are dropped regardless of their theoretical error probability. This program outputs a file named ``802.15.4-per-vs-rxSignal.plt``. Loading this file into gnuplot yields a file ``802.15.4-per-vs-rsSignal.eps``, which can -be converted to pdf or other formats. Packet payload size, Tx power and Rx sensitivity can be configurated. +be converted to pdf or other formats. Packet payload size, Tx power and Rx sensitivity can be configured. The point where the blue line crosses with the PER indicates the Rx sensitivity. The default output is shown below. .. _fig-802-15-4-per-sens: @@ -301,7 +301,7 @@ in the upper-layer notification callback, which can contain either the pseudo-ad the long address (64 bit) of the sender. Note also that RFC 4944 or RFC 6282 are the RFCs defining the IPv6 address compression formats -(HC1 and IPHC respectively). It is defintely not a good idea to either mix devices using different +(HC1 and IPHC respectively). It is definitely not a good idea to either mix devices using different pseudo-address format or compression types in the same network. This point is further discussed in the ``sixlowpan`` module documentation. @@ -393,8 +393,8 @@ The program outputs a file named ``802.15.4-psr-distance.plt``. Loading this file into gnuplot yields a file ``802.15.4-psr-distance.eps``, which can be converted to pdf or other formats. The following image shows the output of multiple runs using different Rx sensitivity values. A higher Rx sensitivity (lower dBm) results -in a increased communication distance but also makes the radio suceptible to more interference from -surronding devices. +in a increased communication distance but also makes the radio susceptible to more interference from +surrounding devices. .. _fig-802-15-4-psr-distance: diff --git a/src/lte/doc/source/lte-testing.rst b/src/lte/doc/source/lte-testing.rst index a8b0a635a..08dd6f832 100644 --- a/src/lte/doc/source/lte-testing.rst +++ b/src/lte/doc/source/lte-testing.rst @@ -947,7 +947,7 @@ where :math:`P_s^i` is the probability of receiving with success the HARQ block \mathrm{T_{test-2}} = 0.0 \times 1 + 0.752 \times 2 + 0.248 \times 3 = 2.248 -The expected throughput is calculted by counting the number of transmission slots available during the simulation (e.g., the number of TTIs) and the size of the TB in the simulation, in detail: +The expected throughput is calculated by counting the number of transmission slots available during the simulation (e.g., the number of TTIs) and the size of the TB in the simulation, in detail: .. math:: diff --git a/src/lte/examples/lena-simple-epc-backhaul.cc b/src/lte/examples/lena-simple-epc-backhaul.cc index 2353098aa..58270c3f8 100644 --- a/src/lte/examples/lena-simple-epc-backhaul.cc +++ b/src/lte/examples/lena-simple-epc-backhaul.cc @@ -14,7 +14,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Authors: Manuel Requena + * Author: Manuel Requena */ #include "ns3/applications-module.h" diff --git a/src/lte/examples/lena-simple-epc.cc b/src/lte/examples/lena-simple-epc.cc index f2480fd57..4c64d60a0 100644 --- a/src/lte/examples/lena-simple-epc.cc +++ b/src/lte/examples/lena-simple-epc.cc @@ -14,8 +14,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Authors: Jaume Nin - * Manuel Requena + * Authors: + * Jaume Nin + * Manuel Requena */ #include "ns3/applications-module.h" diff --git a/src/lte/helper/emu-epc-helper.cc b/src/lte/helper/emu-epc-helper.cc index 18c51817d..21e873b35 100644 --- a/src/lte/helper/emu-epc-helper.cc +++ b/src/lte/helper/emu-epc-helper.cc @@ -14,9 +14,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Jaume Nin - * Nicola Baldo - * Manuel Requena + * Authors: + * Jaume Nin + * Nicola Baldo + * Manuel Requena */ #include "emu-epc-helper.h" diff --git a/src/lte/helper/emu-epc-helper.h b/src/lte/helper/emu-epc-helper.h index 5e2dc4daa..0b97420d3 100644 --- a/src/lte/helper/emu-epc-helper.h +++ b/src/lte/helper/emu-epc-helper.h @@ -14,9 +14,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Jaume Nin - * Nicola Baldo - * Manuel Requena + * Authors: + * Jaume Nin + * Nicola Baldo + * Manuel Requena */ #ifndef EMU_EPC_HELPER_H diff --git a/src/lte/helper/epc-helper.cc b/src/lte/helper/epc-helper.cc index 7e95db508..4d29cf7da 100644 --- a/src/lte/helper/epc-helper.cc +++ b/src/lte/helper/epc-helper.cc @@ -14,9 +14,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Jaume Nin - * Nicola Baldo - * Manuel Requena + * Authors: + * Jaume Nin + * Nicola Baldo + * Manuel Requena */ #include "epc-helper.h" diff --git a/src/lte/helper/epc-helper.h b/src/lte/helper/epc-helper.h index 451c81686..245eb6eb0 100644 --- a/src/lte/helper/epc-helper.h +++ b/src/lte/helper/epc-helper.h @@ -14,9 +14,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Jaume Nin - * Nicola Baldo - * Manuel Requena + * Authors: + * Jaume Nin + * Nicola Baldo + * Manuel Requena */ #ifndef EPC_HELPER_H diff --git a/src/lte/helper/point-to-point-epc-helper.cc b/src/lte/helper/point-to-point-epc-helper.cc index a5ed68ce7..c8efc26bf 100644 --- a/src/lte/helper/point-to-point-epc-helper.cc +++ b/src/lte/helper/point-to-point-epc-helper.cc @@ -14,10 +14,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Jaume Nin - * Nicola Baldo - * Manuel Requena - * (most of the code refactored to no-backhaul-epc-helper.cc) + * Authors: + * Jaume Nin + * Nicola Baldo + * Manuel Requena + * (most of the code refactored to no-backhaul-epc-helper.cc) */ #include "point-to-point-epc-helper.h" diff --git a/src/lte/helper/point-to-point-epc-helper.h b/src/lte/helper/point-to-point-epc-helper.h index 8c7f041c9..0480cc1c4 100644 --- a/src/lte/helper/point-to-point-epc-helper.h +++ b/src/lte/helper/point-to-point-epc-helper.h @@ -14,10 +14,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Jaume Nin - * Nicola Baldo - * Manuel Requena - * (most of the code refactored to no-backhaul-epc-helper.h) + * Authors: + * Jaume Nin + * Nicola Baldo + * Manuel Requena + * (most of the code refactored to no-backhaul-epc-helper.h) */ #ifndef POINT_TO_POINT_EPC_HELPER_H diff --git a/src/lte/helper/radio-bearer-stats-connector.cc b/src/lte/helper/radio-bearer-stats-connector.cc index 42d073c23..e3e371e2d 100644 --- a/src/lte/helper/radio-bearer-stats-connector.cc +++ b/src/lte/helper/radio-bearer-stats-connector.cc @@ -14,8 +14,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Authors: Nicola Baldo - * Manuel Requena + * Authors: + * Nicola Baldo + * Manuel Requena */ #include "radio-bearer-stats-connector.h" diff --git a/src/lte/helper/radio-bearer-stats-connector.h b/src/lte/helper/radio-bearer-stats-connector.h index 95b48bfcc..53aa3754f 100644 --- a/src/lte/helper/radio-bearer-stats-connector.h +++ b/src/lte/helper/radio-bearer-stats-connector.h @@ -14,8 +14,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Authors: Nicola Baldo - * Manuel Requena + * Authors: + * Nicola Baldo + * Manuel Requena */ #ifndef RADIO_BEARER_STATS_CONNECTOR_H diff --git a/src/lte/model/a2-a4-rsrq-handover-algorithm.cc b/src/lte/model/a2-a4-rsrq-handover-algorithm.cc index 46b0012c4..f3a0d2e0f 100644 --- a/src/lte/model/a2-a4-rsrq-handover-algorithm.cc +++ b/src/lte/model/a2-a4-rsrq-handover-algorithm.cc @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Original work authors (from lte-enb-rrc.cc): - * - Nicola Baldo - * - Marco Miozzo - * - Manuel Requena + * Nicola Baldo + * Marco Miozzo + * Manuel Requena * * Converted to handover algorithm interface by: - * - Budiarto Herman + * Budiarto Herman */ #include "a2-a4-rsrq-handover-algorithm.h" diff --git a/src/lte/model/a2-a4-rsrq-handover-algorithm.h b/src/lte/model/a2-a4-rsrq-handover-algorithm.h index e45885b7c..316c987c2 100644 --- a/src/lte/model/a2-a4-rsrq-handover-algorithm.h +++ b/src/lte/model/a2-a4-rsrq-handover-algorithm.h @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Original work authors (from lte-enb-rrc.cc): - * - Nicola Baldo - * - Marco Miozzo - * - Manuel Requena + * Nicola Baldo + * Marco Miozzo + * Manuel Requena * * Converted to handover algorithm interface by: - * - Budiarto Herman + * Budiarto Herman */ #ifndef A2_A4_RSRQ_HANDOVER_ALGORITHM_H diff --git a/src/lte/model/epc-enb-application.h b/src/lte/model/epc-enb-application.h index fef63a18b..a534b052a 100644 --- a/src/lte/model/epc-enb-application.h +++ b/src/lte/model/epc-enb-application.h @@ -14,8 +14,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Jaume Nin - * Nicola Baldo + * Authors: + * Jaume Nin + * Nicola Baldo */ #ifndef EPC_ENB_APPLICATION_H diff --git a/src/lte/model/fdbet-ff-mac-scheduler.cc b/src/lte/model/fdbet-ff-mac-scheduler.cc index 72b4710d3..749ce0c39 100644 --- a/src/lte/model/fdbet-ff-mac-scheduler.cc +++ b/src/lte/model/fdbet-ff-mac-scheduler.cc @@ -214,13 +214,13 @@ FdBetFfMacScheduler::DoCschedLcConfigReq( fdbetsFlowPerf_t flowStatsDl; flowStatsDl.flowStart = Simulator::Now(); flowStatsDl.totalBytesTransmitted = 0; - flowStatsDl.lastTtiBytesTrasmitted = 0; + flowStatsDl.lastTtiBytesTransmitted = 0; flowStatsDl.lastAveragedThroughput = 1; m_flowStatsDl.insert(std::pair(params.m_rnti, flowStatsDl)); fdbetsFlowPerf_t flowStatsUl; flowStatsUl.flowStart = Simulator::Now(); flowStatsUl.totalBytesTransmitted = 0; - flowStatsUl.lastTtiBytesTrasmitted = 0; + flowStatsUl.lastTtiBytesTransmitted = 0; flowStatsUl.lastAveragedThroughput = 1; m_flowStatsUl.insert(std::pair(params.m_rnti, flowStatsUl)); } @@ -1023,7 +1023,7 @@ FdBetFfMacScheduler::DoSchedDlTriggerReq( // reset TTI stats of users for (auto itStats = m_flowStatsDl.begin(); itStats != m_flowStatsDl.end(); itStats++) { - (*itStats).second.lastTtiBytesTrasmitted = 0; + (*itStats).second.lastTtiBytesTransmitted = 0; } // generate the transmission opportunities by grouping the RBGs of the same RNTI and @@ -1158,8 +1158,8 @@ FdBetFfMacScheduler::DoSchedDlTriggerReq( auto it = m_flowStatsDl.find((*itMap).first); if (it != m_flowStatsDl.end()) { - (*it).second.lastTtiBytesTrasmitted = bytesTxed; - NS_LOG_INFO(this << " UE total bytes txed " << (*it).second.lastTtiBytesTrasmitted); + (*it).second.lastTtiBytesTransmitted = bytesTxed; + NS_LOG_INFO(this << " UE total bytes txed " << (*it).second.lastTtiBytesTransmitted); } else { @@ -1174,15 +1174,15 @@ FdBetFfMacScheduler::DoSchedDlTriggerReq( NS_LOG_INFO(this << " Update UEs statistics"); for (auto itStats = m_flowStatsDl.begin(); itStats != m_flowStatsDl.end(); itStats++) { - (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTrasmitted; + (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTransmitted; // update average throughput (see eq. 12.3 of Sec 12.3.1.2 of LTE – The UMTS Long Term // Evolution, Ed Wiley) (*itStats).second.lastAveragedThroughput = ((1.0 - (1.0 / m_timeWindow)) * (*itStats).second.lastAveragedThroughput) + - ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTrasmitted / 0.001)); + ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTransmitted / 0.001)); NS_LOG_INFO(this << " UE total bytes " << (*itStats).second.totalBytesTransmitted); NS_LOG_INFO(this << " UE average throughput " << (*itStats).second.lastAveragedThroughput); - (*itStats).second.lastTtiBytesTrasmitted = 0; + (*itStats).second.lastTtiBytesTransmitted = 0; } m_schedSapUser->SchedDlConfigInd(ret); @@ -1640,7 +1640,7 @@ FdBetFfMacScheduler::DoSchedUlTriggerReq( auto itStats = m_flowStatsUl.find((*it).first); if (itStats != m_flowStatsUl.end()) { - (*itStats).second.lastTtiBytesTrasmitted = uldci.m_tbSize; + (*itStats).second.lastTtiBytesTransmitted = uldci.m_tbSize; } else { @@ -1665,15 +1665,15 @@ FdBetFfMacScheduler::DoSchedUlTriggerReq( // update UEs stats for (auto itStats = m_flowStatsUl.begin(); itStats != m_flowStatsUl.end(); itStats++) { - (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTrasmitted; + (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTransmitted; // update average throughput (see eq. 12.3 of Sec 12.3.1.2 of LTE – The UMTS Long Term // Evolution, Ed Wiley) (*itStats).second.lastAveragedThroughput = ((1.0 - (1.0 / m_timeWindow)) * (*itStats).second.lastAveragedThroughput) + - ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTrasmitted / 0.001)); + ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTransmitted / 0.001)); NS_LOG_INFO(this << " UE total bytes " << (*itStats).second.totalBytesTransmitted); NS_LOG_INFO(this << " UE average throughput " << (*itStats).second.lastAveragedThroughput); - (*itStats).second.lastTtiBytesTrasmitted = 0; + (*itStats).second.lastTtiBytesTransmitted = 0; } m_allocationMaps.insert( std::pair>(params.m_sfnSf, rbgAllocationMap)); diff --git a/src/lte/model/fdbet-ff-mac-scheduler.h b/src/lte/model/fdbet-ff-mac-scheduler.h index 7e4c02269..aa757a313 100644 --- a/src/lte/model/fdbet-ff-mac-scheduler.h +++ b/src/lte/model/fdbet-ff-mac-scheduler.h @@ -39,10 +39,10 @@ namespace ns3 /// fdbetsFlowPerf_t structure struct fdbetsFlowPerf_t { - Time flowStart; ///< flow start time - unsigned long totalBytesTransmitted; ///< total bytes transmitted - unsigned int lastTtiBytesTrasmitted; ///< last total bytes transmitted - double lastAveragedThroughput; ///< last averaged throughput + Time flowStart; ///< flow start time + unsigned long totalBytesTransmitted; ///< total bytes transmitted + unsigned int lastTtiBytesTransmitted; ///< last total bytes transmitted + double lastAveragedThroughput; ///< last averaged throughput }; /** diff --git a/src/lte/model/lte-anr.cc b/src/lte/model/lte-anr.cc index b74d1adc2..087b3d7c6 100644 --- a/src/lte/model/lte-anr.cc +++ b/src/lte/model/lte-anr.cc @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Original work authors (from lte-enb-rrc.cc): - * - Nicola Baldo - * - Marco Miozzo - * - Manuel Requena + * Nicola Baldo + * Marco Miozzo + * Manuel Requena * * Converted to ANR interface by: - * - Budiarto Herman + * Budiarto Herman */ #include "lte-anr.h" diff --git a/src/lte/model/lte-anr.h b/src/lte/model/lte-anr.h index b93064784..9a7438f7b 100644 --- a/src/lte/model/lte-anr.h +++ b/src/lte/model/lte-anr.h @@ -16,12 +16,12 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Original work authors (from lte-enb-rrc.cc): - * - Nicola Baldo - * - Marco Miozzo - * - Manuel Requena + * Nicola Baldo + * Marco Miozzo + * Manuel Requena * * Converted to ANR interface by: - * - Budiarto Herman + * Budiarto Herman */ #ifndef LTE_ANR_H diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc index f1e690823..7c632c40e 100644 --- a/src/lte/model/lte-enb-rrc.cc +++ b/src/lte/model/lte-enb-rrc.cc @@ -15,12 +15,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Authors: Nicola Baldo - * Marco Miozzo - * Manuel Requena - * Modified by: Danilo Abrignani (Carrier Aggregation - GSoC 2015), - * Biljana Bojovic (Carrier Aggregation) - * Vignesh Babu (RLF extensions) + * Authors: + * Nicola Baldo + * Marco Miozzo + * Manuel Requena + * Modified by: + * Danilo Abrignani (Carrier Aggregation - GSoC 2015), + * Biljana Bojovic (Carrier Aggregation) + * Vignesh Babu (RLF extensions) */ #include "lte-enb-rrc.h" @@ -140,7 +142,7 @@ NS_OBJECT_ENSURE_REGISTERED(UeManager); UeManager::UeManager() { - NS_FATAL_ERROR("this constructor is not espected to be used"); + NS_FATAL_ERROR("this constructor is not expected to be used"); } UeManager::UeManager(Ptr rrc, uint16_t rnti, State s, uint8_t componentCarrierId) diff --git a/src/lte/model/lte-enb-rrc.h b/src/lte/model/lte-enb-rrc.h index 63b0fafaf..83ce5fb9b 100644 --- a/src/lte/model/lte-enb-rrc.h +++ b/src/lte/model/lte-enb-rrc.h @@ -15,13 +15,14 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Authors: Nicola Baldo - * Marco Miozzo - * Manuel Requena + * Authors: + * Nicola Baldo + * Marco Miozzo + * Manuel Requena * Modified by: - * Danilo Abrignani (Carrier Aggregation - GSoC 2015) - * Biljana Bojovic (Carrier Aggregation) - * Vignesh Babu (RLF extensions) + * Danilo Abrignani (Carrier Aggregation - GSoC 2015) + * Biljana Bojovic (Carrier Aggregation) + * Vignesh Babu (RLF extensions) */ #ifndef LTE_ENB_RRC_H diff --git a/src/lte/model/lte-radio-bearer-tag.h b/src/lte/model/lte-radio-bearer-tag.h index ce67a5a73..f345bf17b 100644 --- a/src/lte/model/lte-radio-bearer-tag.h +++ b/src/lte/model/lte-radio-bearer-tag.h @@ -27,7 +27,7 @@ namespace ns3 class Tag; /** - * Tag used to define the RNTI and LC id for each MAC packet trasmitted + * Tag used to define the RNTI and LC id for each MAC packet transmitted */ class LteRadioBearerTag : public Tag diff --git a/src/lte/model/lte-rlc-am-header.h b/src/lte/model/lte-rlc-am-header.h index 4ddc99802..773b50ef7 100644 --- a/src/lte/model/lte-rlc-am-header.h +++ b/src/lte/model/lte-rlc-am-header.h @@ -246,7 +246,7 @@ class LteRlcAmHeader : public Header /** * Get ack sn function * - * \returns sequence numbr + * \returns sequence number */ SequenceNumber10 GetAckSn() const; diff --git a/src/lte/model/lte-ue-rrc.h b/src/lte/model/lte-ue-rrc.h index d89dd9909..b760faa45 100644 --- a/src/lte/model/lte-ue-rrc.h +++ b/src/lte/model/lte-ue-rrc.h @@ -136,7 +136,7 @@ class LteUeRrc : public Object */ static TypeId GetTypeId(); - /// Initiaize SAP + /// Initialize SAP void InitializeSap(); /** diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc index 34fee7b2d..bf3c57e55 100644 --- a/src/lte/model/pf-ff-mac-scheduler.cc +++ b/src/lte/model/pf-ff-mac-scheduler.cc @@ -216,13 +216,13 @@ PfFfMacScheduler::DoCschedLcConfigReq( pfsFlowPerf_t flowStatsDl; flowStatsDl.flowStart = Simulator::Now(); flowStatsDl.totalBytesTransmitted = 0; - flowStatsDl.lastTtiBytesTrasmitted = 0; + flowStatsDl.lastTtiBytesTransmitted = 0; flowStatsDl.lastAveragedThroughput = 1; m_flowStatsDl.insert(std::pair(params.m_rnti, flowStatsDl)); pfsFlowPerf_t flowStatsUl; flowStatsUl.flowStart = Simulator::Now(); flowStatsUl.totalBytesTransmitted = 0; - flowStatsUl.lastTtiBytesTrasmitted = 0; + flowStatsUl.lastTtiBytesTransmitted = 0; flowStatsUl.lastAveragedThroughput = 1; m_flowStatsUl.insert(std::pair(params.m_rnti, flowStatsUl)); } @@ -1040,7 +1040,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq( // reset TTI stats of users for (auto itStats = m_flowStatsDl.begin(); itStats != m_flowStatsDl.end(); itStats++) { - (*itStats).second.lastTtiBytesTrasmitted = 0; + (*itStats).second.lastTtiBytesTransmitted = 0; } // generate the transmission opportunities by grouping the RBGs of the same RNTI and @@ -1224,8 +1224,8 @@ PfFfMacScheduler::DoSchedDlTriggerReq( auto it = m_flowStatsDl.find((*itMap).first); if (it != m_flowStatsDl.end()) { - (*it).second.lastTtiBytesTrasmitted = bytesTxed; - NS_LOG_INFO(this << " UE total bytes txed " << (*it).second.lastTtiBytesTrasmitted); + (*it).second.lastTtiBytesTransmitted = bytesTxed; + NS_LOG_INFO(this << " UE total bytes txed " << (*it).second.lastTtiBytesTransmitted); } else { @@ -1240,15 +1240,15 @@ PfFfMacScheduler::DoSchedDlTriggerReq( NS_LOG_INFO(this << " Update UEs statistics"); for (auto itStats = m_flowStatsDl.begin(); itStats != m_flowStatsDl.end(); itStats++) { - (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTrasmitted; + (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTransmitted; // update average throughput (see eq. 12.3 of Sec 12.3.1.2 of LTE – The UMTS Long Term // Evolution, Ed Wiley) (*itStats).second.lastAveragedThroughput = ((1.0 - (1.0 / m_timeWindow)) * (*itStats).second.lastAveragedThroughput) + - ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTrasmitted / 0.001)); + ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTransmitted / 0.001)); NS_LOG_INFO(this << " UE total bytes " << (*itStats).second.totalBytesTransmitted); NS_LOG_INFO(this << " UE average throughput " << (*itStats).second.lastAveragedThroughput); - (*itStats).second.lastTtiBytesTrasmitted = 0; + (*itStats).second.lastTtiBytesTransmitted = 0; } m_schedSapUser->SchedDlConfigInd(ret); @@ -1735,7 +1735,7 @@ PfFfMacScheduler::DoSchedUlTriggerReq( auto itStats = m_flowStatsUl.find((*it).first); if (itStats != m_flowStatsUl.end()) { - (*itStats).second.lastTtiBytesTrasmitted = uldci.m_tbSize; + (*itStats).second.lastTtiBytesTransmitted = uldci.m_tbSize; } else { @@ -1760,15 +1760,15 @@ PfFfMacScheduler::DoSchedUlTriggerReq( // update UEs stats for (auto itStats = m_flowStatsUl.begin(); itStats != m_flowStatsUl.end(); itStats++) { - (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTrasmitted; + (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTransmitted; // update average throughput (see eq. 12.3 of Sec 12.3.1.2 of LTE – The UMTS Long Term // Evolution, Ed Wiley) (*itStats).second.lastAveragedThroughput = ((1.0 - (1.0 / m_timeWindow)) * (*itStats).second.lastAveragedThroughput) + - ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTrasmitted / 0.001)); + ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTransmitted / 0.001)); NS_LOG_INFO(this << " UE total bytes " << (*itStats).second.totalBytesTransmitted); NS_LOG_INFO(this << " UE average throughput " << (*itStats).second.lastAveragedThroughput); - (*itStats).second.lastTtiBytesTrasmitted = 0; + (*itStats).second.lastTtiBytesTransmitted = 0; } m_allocationMaps.insert( std::pair>(params.m_sfnSf, rbgAllocationMap)); diff --git a/src/lte/model/pf-ff-mac-scheduler.h b/src/lte/model/pf-ff-mac-scheduler.h index 738380abc..2df67e476 100644 --- a/src/lte/model/pf-ff-mac-scheduler.h +++ b/src/lte/model/pf-ff-mac-scheduler.h @@ -38,10 +38,10 @@ namespace ns3 /// pfsFlowPerf_t structure struct pfsFlowPerf_t { - Time flowStart; ///< flow start time - unsigned long totalBytesTransmitted; ///< total bytes transmitted - unsigned int lastTtiBytesTrasmitted; ///< last total bytes transmitted - double lastAveragedThroughput; ///< last averaged throughput + Time flowStart; ///< flow start time + unsigned long totalBytesTransmitted; ///< total bytes transmitted + unsigned int lastTtiBytesTransmitted; ///< last total bytes transmitted + double lastAveragedThroughput; ///< last averaged throughput }; /** diff --git a/src/lte/model/simple-ue-component-carrier-manager.cc b/src/lte/model/simple-ue-component-carrier-manager.cc index 52f3e77b4..c2845764a 100644 --- a/src/lte/model/simple-ue-component-carrier-manager.cc +++ b/src/lte/model/simple-ue-component-carrier-manager.cc @@ -229,7 +229,7 @@ SimpleUeComponentCarrierManager::DoNotifyTxOpportunity( NS_ABORT_MSG_IF(lcidIt == m_lcAttached.end(), "could not find LCID" << (uint16_t)txOpParams.lcid); NS_LOG_DEBUG(this << " lcid = " << (uint32_t)txOpParams.lcid - << " layer= " << (uint16_t)txOpParams.layer << " componentCarierId " + << " layer= " << (uint16_t)txOpParams.layer << " componentCarrierId " << (uint16_t)txOpParams.componentCarrierId << " rnti " << txOpParams.rnti); NS_LOG_DEBUG(this << " MAC is asking component carrier id = " diff --git a/src/lte/model/tdbet-ff-mac-scheduler.cc b/src/lte/model/tdbet-ff-mac-scheduler.cc index 4de5bdf72..617fa8b3e 100644 --- a/src/lte/model/tdbet-ff-mac-scheduler.cc +++ b/src/lte/model/tdbet-ff-mac-scheduler.cc @@ -214,13 +214,13 @@ TdBetFfMacScheduler::DoCschedLcConfigReq( tdbetsFlowPerf_t flowStatsDl; flowStatsDl.flowStart = Simulator::Now(); flowStatsDl.totalBytesTransmitted = 0; - flowStatsDl.lastTtiBytesTrasmitted = 0; + flowStatsDl.lastTtiBytesTransmitted = 0; flowStatsDl.lastAveragedThroughput = 1; m_flowStatsDl.insert(std::pair(params.m_rnti, flowStatsDl)); tdbetsFlowPerf_t flowStatsUl; flowStatsUl.flowStart = Simulator::Now(); flowStatsUl.totalBytesTransmitted = 0; - flowStatsUl.lastTtiBytesTrasmitted = 0; + flowStatsUl.lastTtiBytesTransmitted = 0; flowStatsUl.lastAveragedThroughput = 1; m_flowStatsUl.insert(std::pair(params.m_rnti, flowStatsUl)); } @@ -945,7 +945,7 @@ TdBetFfMacScheduler::DoSchedDlTriggerReq( // reset TTI stats of users for (auto itStats = m_flowStatsDl.begin(); itStats != m_flowStatsDl.end(); itStats++) { - (*itStats).second.lastTtiBytesTrasmitted = 0; + (*itStats).second.lastTtiBytesTransmitted = 0; } // generate the transmission opportunities by grouping the RBGs of the same RNTI and @@ -1080,8 +1080,8 @@ TdBetFfMacScheduler::DoSchedDlTriggerReq( auto it = m_flowStatsDl.find((*itMap).first); if (it != m_flowStatsDl.end()) { - (*it).second.lastTtiBytesTrasmitted = bytesTxed; - NS_LOG_INFO(this << " UE total bytes txed " << (*it).second.lastTtiBytesTrasmitted); + (*it).second.lastTtiBytesTransmitted = bytesTxed; + NS_LOG_INFO(this << " UE total bytes txed " << (*it).second.lastTtiBytesTransmitted); } else { @@ -1096,15 +1096,15 @@ TdBetFfMacScheduler::DoSchedDlTriggerReq( NS_LOG_INFO(this << " Update UEs statistics"); for (auto itStats = m_flowStatsDl.begin(); itStats != m_flowStatsDl.end(); itStats++) { - (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTrasmitted; + (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTransmitted; // update average throughput (see eq. 12.3 of Sec 12.3.1.2 of LTE – The UMTS Long Term // Evolution, Ed Wiley) (*itStats).second.lastAveragedThroughput = ((1.0 - (1.0 / m_timeWindow)) * (*itStats).second.lastAveragedThroughput) + - ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTrasmitted / 0.001)); + ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTransmitted / 0.001)); NS_LOG_INFO(this << " UE total bytes " << (*itStats).second.totalBytesTransmitted); NS_LOG_INFO(this << " UE average throughput " << (*itStats).second.lastAveragedThroughput); - (*itStats).second.lastTtiBytesTrasmitted = 0; + (*itStats).second.lastTtiBytesTransmitted = 0; } m_schedSapUser->SchedDlConfigInd(ret); @@ -1562,7 +1562,7 @@ TdBetFfMacScheduler::DoSchedUlTriggerReq( auto itStats = m_flowStatsUl.find((*it).first); if (itStats != m_flowStatsUl.end()) { - (*itStats).second.lastTtiBytesTrasmitted = uldci.m_tbSize; + (*itStats).second.lastTtiBytesTransmitted = uldci.m_tbSize; } else { @@ -1587,15 +1587,15 @@ TdBetFfMacScheduler::DoSchedUlTriggerReq( // update UEs stats for (auto itStats = m_flowStatsUl.begin(); itStats != m_flowStatsUl.end(); itStats++) { - (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTrasmitted; + (*itStats).second.totalBytesTransmitted += (*itStats).second.lastTtiBytesTransmitted; // update average throughput (see eq. 12.3 of Sec 12.3.1.2 of LTE – The UMTS Long Term // Evolution, Ed Wiley) (*itStats).second.lastAveragedThroughput = ((1.0 - (1.0 / m_timeWindow)) * (*itStats).second.lastAveragedThroughput) + - ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTrasmitted / 0.001)); + ((1.0 / m_timeWindow) * (double)((*itStats).second.lastTtiBytesTransmitted / 0.001)); NS_LOG_INFO(this << " UE total bytes " << (*itStats).second.totalBytesTransmitted); NS_LOG_INFO(this << " UE average throughput " << (*itStats).second.lastAveragedThroughput); - (*itStats).second.lastTtiBytesTrasmitted = 0; + (*itStats).second.lastTtiBytesTransmitted = 0; } m_allocationMaps.insert( std::pair>(params.m_sfnSf, rbgAllocationMap)); diff --git a/src/lte/model/tdbet-ff-mac-scheduler.h b/src/lte/model/tdbet-ff-mac-scheduler.h index a9b056f1e..63fd67f27 100644 --- a/src/lte/model/tdbet-ff-mac-scheduler.h +++ b/src/lte/model/tdbet-ff-mac-scheduler.h @@ -39,10 +39,10 @@ namespace ns3 /// tdbetsFlowPerf_t structure struct tdbetsFlowPerf_t { - Time flowStart; ///< flow start time - unsigned long totalBytesTransmitted; ///< total bytes transmitted - unsigned int lastTtiBytesTrasmitted; ///< last total bytes transmitted - double lastAveragedThroughput; ///< last average throughput + Time flowStart; ///< flow start time + unsigned long totalBytesTransmitted; ///< total bytes transmitted + unsigned int lastTtiBytesTransmitted; ///< last total bytes transmitted + double lastAveragedThroughput; ///< last average throughput }; /** diff --git a/src/lte/test/epc-test-run-time.pl b/src/lte/test/epc-test-run-time.pl index 2a2ca1262..1664f2e6f 100755 --- a/src/lte/test/epc-test-run-time.pl +++ b/src/lte/test/epc-test-run-time.pl @@ -13,7 +13,7 @@ my @nodes = ( 1,2,3,4,5,6,7, 8, 12, 14); my @simTime = (5, 10); -# Configure and complite first the program to avoid counting compilation time as running time +# Configure and compile first the program to avoid counting compilation time as running time my $launch = "CXXFLAGS=\"-O3 -w\" ./ns3 configure -d optimized --enable-static --enable-examples --enable-modules=lte"; my $out, my $err; capture { system($launch ) } \$out, \$err; diff --git a/src/lte/test/lte-ffr-simple.cc b/src/lte/test/lte-ffr-simple.cc index 6a28394e2..a6a00041c 100644 --- a/src/lte/test/lte-ffr-simple.cc +++ b/src/lte/test/lte-ffr-simple.cc @@ -165,11 +165,11 @@ LteFfrSimple::SetPdschConfigDedicated(LteRrcSap::PdschConfigDedicated pdschConfi } void -LteFfrSimple::SetTpc(uint32_t tpc, uint32_t num, bool acculumatedMode) +LteFfrSimple::SetTpc(uint32_t tpc, uint32_t num, bool accumulatedMode) { m_tpc = tpc; m_tpcNum = num; - m_accumulatedMode = acculumatedMode; + m_accumulatedMode = accumulatedMode; } std::vector diff --git a/src/lte/test/lte-ffr-simple.h b/src/lte/test/lte-ffr-simple.h index 492e5e40d..aefc2613a 100644 --- a/src/lte/test/lte-ffr-simple.h +++ b/src/lte/test/lte-ffr-simple.h @@ -71,9 +71,9 @@ class LteFfrSimple : public LteFfrAlgorithm * \brief Set transmission power control * \param tpc TPC * \param num number of TPC configurations in the test case - * \param acculumatedMode whether TPC accumulated mode is used + * \param accumulatedMode whether TPC accumulated mode is used */ - void SetTpc(uint32_t tpc, uint32_t num, bool acculumatedMode); + void SetTpc(uint32_t tpc, uint32_t num, bool accumulatedMode); // inherited from LteFfrAlgorithm void SetLteFfrSapUser(LteFfrSapUser* s) override; diff --git a/src/lte/test/lte-simple-helper.cc b/src/lte/test/lte-simple-helper.cc index d64c8e114..e7964a2f9 100644 --- a/src/lte/test/lte-simple-helper.cc +++ b/src/lte/test/lte-simple-helper.cc @@ -14,7 +14,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Manuel Requena (Based on lte-helper.cc) + * Author: Manuel Requena + * (Based on lte-helper.cc) */ #include "lte-simple-helper.h" diff --git a/src/lte/test/lte-simple-helper.h b/src/lte/test/lte-simple-helper.h index 73754ef2e..59d18ae81 100644 --- a/src/lte/test/lte-simple-helper.h +++ b/src/lte/test/lte-simple-helper.h @@ -14,7 +14,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Manuel Requena (Based on lte-helper.h) + * Author: Manuel Requena + * (Based on lte-helper.h) */ #ifndef LTE_SIMPLE_HELPER_H diff --git a/src/lte/test/lte-test-entities.cc b/src/lte/test/lte-test-entities.cc index 86460b436..a6e8075bb 100644 --- a/src/lte/test/lte-test-entities.cc +++ b/src/lte/test/lte-test-entities.cc @@ -473,13 +473,13 @@ LteTestMac::SendTxOpportunity(Time time, uint32_t bytes) haveContext = true; } } - LteMacSapUser::TxOpportunityParameters txOpParmas; - txOpParmas.bytes = bytes; - txOpParmas.layer = 0; - txOpParmas.componentCarrierId = 0; - txOpParmas.harqId = 0; - txOpParmas.rnti = 0; - txOpParmas.lcid = 0; + LteMacSapUser::TxOpportunityParameters txOpParams; + txOpParams.bytes = bytes; + txOpParams.layer = 0; + txOpParams.componentCarrierId = 0; + txOpParams.harqId = 0; + txOpParams.rnti = 0; + txOpParams.lcid = 0; if (haveContext) { @@ -487,11 +487,11 @@ LteTestMac::SendTxOpportunity(Time time, uint32_t bytes) time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, - txOpParmas); + txOpParams); } else { - Simulator::Schedule(time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, txOpParmas); + Simulator::Schedule(time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, txOpParams); } if (m_txOpportunityMode == RANDOM_MODE) @@ -631,19 +631,19 @@ LteTestMac::DoReportBufferStatus(LteMacSapProvider::ReportBufferStatusParameters int32_t size = params.statusPduSize + params.txQueueSize + params.retxQueueSize; Time time = m_txOppTime; - LteMacSapUser::TxOpportunityParameters txOpParmas; - txOpParmas.bytes = m_txOppSize; - txOpParmas.layer = 0; - txOpParmas.componentCarrierId = 0; - txOpParmas.harqId = 0; - txOpParmas.rnti = params.rnti; - txOpParmas.lcid = params.lcid; + LteMacSapUser::TxOpportunityParameters txOpParams; + txOpParams.bytes = m_txOppSize; + txOpParams.layer = 0; + txOpParams.componentCarrierId = 0; + txOpParams.harqId = 0; + txOpParams.rnti = params.rnti; + txOpParams.lcid = params.lcid; while (size > 0) { EventId e = Simulator::Schedule(time, &LteMacSapUser::NotifyTxOpportunity, m_macSapUser, - txOpParmas); + txOpParams); m_nextTxOppList.push_back(e); size -= m_txOppSize; time += m_txOppTime; diff --git a/src/lte/test/lte-test-frequency-reuse.cc b/src/lte/test/lte-test-frequency-reuse.cc index ed5456869..8cbccfef8 100644 --- a/src/lte/test/lte-test-frequency-reuse.cc +++ b/src/lte/test/lte-test-frequency-reuse.cc @@ -444,13 +444,13 @@ static LteFrequencyReuseTestSuite lteFrequencyReuseTestSuite; * TestCase Data */ void -DlDataRxStartNofitication(LteFrTestCase* testcase, Ptr spectrumValue) +DlDataRxStartNotification(LteFrTestCase* testcase, Ptr spectrumValue) { testcase->DlDataRxStart(spectrumValue); } void -UlDataRxStartNofitication(LteFrTestCase* testcase, Ptr spectrumValue) +UlDataRxStartNotification(LteFrTestCase* testcase, Ptr spectrumValue) { testcase->UlDataRxStart(spectrumValue); } @@ -617,7 +617,7 @@ LteHardFrTestCase::DoRun() testDlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&DlDataRxStartNofitication, this)); + MakeBoundCallback(&DlDataRxStartNotification, this)); // Test SpectrumPhy to get signals form UL channel Ptr ueUlSpectrumPhy = ueDevs.Get(0) @@ -634,7 +634,7 @@ LteHardFrTestCase::DoRun() testUlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&UlDataRxStartNofitication, this)); + MakeBoundCallback(&UlDataRxStartNotification, this)); Simulator::Stop(Seconds(0.500)); Simulator::Run(); @@ -755,7 +755,7 @@ LteStrictFrTestCase::DoRun() testDlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&DlDataRxStartNofitication, this)); + MakeBoundCallback(&DlDataRxStartNotification, this)); // Test SpectrumPhy to get signals form UL channel Ptr ueUlSpectrumPhy = ueDevs.Get(0) @@ -772,7 +772,7 @@ LteStrictFrTestCase::DoRun() testUlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&UlDataRxStartNofitication, this)); + MakeBoundCallback(&UlDataRxStartNotification, this)); Simulator::Stop(Seconds(0.500)); Simulator::Run(); @@ -785,13 +785,13 @@ LteStrictFrTestCase::DoRun() } void -DlDataRxStartNofiticationArea(LteFrAreaTestCase* testcase, Ptr spectrumValue) +DlDataRxStartNotificationArea(LteFrAreaTestCase* testcase, Ptr spectrumValue) { testcase->DlDataRxStart(spectrumValue); } void -UlDataRxStartNofiticationArea(LteFrAreaTestCase* testcase, Ptr spectrumValue) +UlDataRxStartNotificationArea(LteFrAreaTestCase* testcase, Ptr spectrumValue) { testcase->UlDataRxStart(spectrumValue); } @@ -1087,7 +1087,7 @@ LteStrictFrAreaTestCase::DoRun() testDlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&DlDataRxStartNofiticationArea, this)); + MakeBoundCallback(&DlDataRxStartNotificationArea, this)); // Test SpectrumPhy to get signals form UL channel Ptr ueUlSpectrumPhy = ueDevs1.Get(0) @@ -1106,7 +1106,7 @@ LteStrictFrAreaTestCase::DoRun() testUlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&UlDataRxStartNofiticationArea, this)); + MakeBoundCallback(&UlDataRxStartNotificationArea, this)); std::vector expectedDlRbCenterArea; expectedDlRbCenterArea.resize(m_dlBandwidth, false); @@ -1303,7 +1303,7 @@ LteSoftFrAreaTestCase::DoRun() testDlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&DlDataRxStartNofiticationArea, this)); + MakeBoundCallback(&DlDataRxStartNotificationArea, this)); // Test SpectrumPhy to get signals form UL channel Ptr ueUlSpectrumPhy = ueDevs1.Get(0) @@ -1322,7 +1322,7 @@ LteSoftFrAreaTestCase::DoRun() testUlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&UlDataRxStartNofiticationArea, this)); + MakeBoundCallback(&UlDataRxStartNotificationArea, this)); std::vector expectedDlRbCenterArea; expectedDlRbCenterArea.resize(m_dlBandwidth, false); @@ -1532,7 +1532,7 @@ LteSoftFfrAreaTestCase::DoRun() testDlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&DlDataRxStartNofiticationArea, this)); + MakeBoundCallback(&DlDataRxStartNotificationArea, this)); // Test SpectrumPhy to get signals form UL channel Ptr ueUlSpectrumPhy = ueDevs1.Get(0) @@ -1551,7 +1551,7 @@ LteSoftFfrAreaTestCase::DoRun() testUlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&UlDataRxStartNofiticationArea, this)); + MakeBoundCallback(&UlDataRxStartNotificationArea, this)); double expectedDlPowerCenterArea = 0.5; std::vector expectedDlRbCenterArea; @@ -1803,7 +1803,7 @@ LteEnhancedFfrAreaTestCase::DoRun() testDlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&DlDataRxStartNofiticationArea, this)); + MakeBoundCallback(&DlDataRxStartNotificationArea, this)); // Test SpectrumPhy to get signals form UL channel Ptr ueUlSpectrumPhy = ueDevs1.Get(0) @@ -1822,7 +1822,7 @@ LteEnhancedFfrAreaTestCase::DoRun() testUlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&UlDataRxStartNofiticationArea, this)); + MakeBoundCallback(&UlDataRxStartNotificationArea, this)); double expectedDlPowerCenterArea = 0.251189; std::vector expectedDlRbCenterArea; @@ -2184,7 +2184,7 @@ LteDistributedFfrAreaTestCase::DoRun() testDlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&DlDataRxStartNofiticationArea, this)); + MakeBoundCallback(&DlDataRxStartNotificationArea, this)); // Test SpectrumPhy to get signals form UL channel Ptr ueUlSpectrumPhy = ueDevs1.Get(0) @@ -2203,7 +2203,7 @@ LteDistributedFfrAreaTestCase::DoRun() testUlSpectrumPhy->TraceConnectWithoutContext( "RxStart", - MakeBoundCallback(&UlDataRxStartNofiticationArea, this)); + MakeBoundCallback(&UlDataRxStartNotificationArea, this)); double expectedDlPowerCenterArea = 1.0; std::vector expectedDlRbCenterArea; diff --git a/src/lte/test/lte-test-interference-fr.cc b/src/lte/test/lte-test-interference-fr.cc index e6c231a3d..b3030b8e8 100644 --- a/src/lte/test/lte-test-interference-fr.cc +++ b/src/lte/test/lte-test-interference-fr.cc @@ -15,9 +15,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Author: Piotr Gawlowicz - * Based on lte-test-interference.{h,cc} by Manuel Requena - * Nicola Baldo - * + * Based on lte-test-interference.{h,cc} by: + * Manuel Requena + * Nicola Baldo */ #include "lte-test-interference-fr.h" diff --git a/src/lte/test/lte-test-interference-fr.h b/src/lte/test/lte-test-interference-fr.h index 00f52a7ba..083c33970 100644 --- a/src/lte/test/lte-test-interference-fr.h +++ b/src/lte/test/lte-test-interference-fr.h @@ -15,9 +15,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Author: Piotr Gawlowicz - * Based on lte-test-interference.{h,cc} by Manuel Requena - * Nicola Baldo - * + * Based on lte-test-interference.{h,cc} by: + * Manuel Requena + * Nicola Baldo */ #ifndef LTE_TEST_INTERFERENCE_FR_H diff --git a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc index 531e2a248..218476ddd 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -306,7 +306,7 @@ LenaRrFfMacSchedulerTestCase::DoRun() std::vector dlDataRxed; if (m_errorModelEnabled) { - m_thrRefDl *= 0.95; // for couting the Vienna AMC behavior: BLER between 0% and 10% + m_thrRefDl *= 0.95; // for counting the Vienna AMC behavior: BLER between 0% and 10% } for (int i = 0; i < m_nUser; i++) { @@ -327,7 +327,7 @@ LenaRrFfMacSchedulerTestCase::DoRun() std::vector ulDataRxed; if (m_errorModelEnabled) { - m_thrRefUl *= 0.95; // for couting the Vienna AMC behavior: BLER between 0% and 10% + m_thrRefUl *= 0.95; // for counting the Vienna AMC behavior: BLER between 0% and 10% } for (int i = 0; i < m_nUser; i++) { diff --git a/src/lte/test/lte-test-run-time.pl b/src/lte/test/lte-test-run-time.pl index e0390cda9..9e3483a92 100755 --- a/src/lte/test/lte-test-run-time.pl +++ b/src/lte/test/lte-test-run-time.pl @@ -13,7 +13,7 @@ my @nEnb = (1, 2, 4, 6, 8, 12, 14, 18, 22); my @nFloors = (0, 1); my @simTime = (5, 10); -# Configure and complite first the program to avoid counting compilation time as running time +# Configure and compile first the program to avoid counting compilation time as running time my $launch = "CXXFLAGS=\"-O3 -w\" ./ns3 configure -d optimized --enable-static --enable-examples --enable-modules=lte"; my $out; my $err; diff --git a/src/lte/test/lte-test-spectrum-value-helper.cc b/src/lte/test/lte-test-spectrum-value-helper.cc index 127423f49..4e8c04e40 100644 --- a/src/lte/test/lte-test-spectrum-value-helper.cc +++ b/src/lte/test/lte-test-spectrum-value-helper.cc @@ -155,7 +155,7 @@ class LteTxPsdTestCase : public TestCase * \param str the reference name * \param earfcn * \param bw bandwidth - * \param txPowerDbm tranmit power in dBm + * \param txPowerDbm transmit power in dBm * \param activeRbs active RBs * \param expected executed spectrum value */ diff --git a/src/lte/test/lte-test-ue-phy.h b/src/lte/test/lte-test-ue-phy.h index d23e30aaa..7a7677dd4 100644 --- a/src/lte/test/lte-test-ue-phy.h +++ b/src/lte/test/lte-test-ue-phy.h @@ -14,7 +14,8 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Author: Manuel Requena : Based on lte-ue-phy code + * Author: Manuel Requena + * (Based on lte-ue-phy code) */ #ifndef LTE_TEST_UE_PHY_H diff --git a/src/lte/test/lte-test-uplink-power-control.cc b/src/lte/test/lte-test-uplink-power-control.cc index 9e37e8599..d18f3d985 100644 --- a/src/lte/test/lte-test-uplink-power-control.cc +++ b/src/lte/test/lte-test-uplink-power-control.cc @@ -78,7 +78,7 @@ static LteUplinkPowerControlTestSuite lteUplinkPowerControlTestSuite; * TestCase Data */ void -PuschTxPowerNofitication(LteUplinkPowerControlTestCase* testcase, +PuschTxPowerNotification(LteUplinkPowerControlTestCase* testcase, uint16_t cellId, uint16_t rnti, double txPower) @@ -87,7 +87,7 @@ PuschTxPowerNofitication(LteUplinkPowerControlTestCase* testcase, } void -PucchTxPowerNofitication(LteUplinkPowerControlTestCase* testcase, +PucchTxPowerNotification(LteUplinkPowerControlTestCase* testcase, uint16_t cellId, uint16_t rnti, double txPower) @@ -96,7 +96,7 @@ PucchTxPowerNofitication(LteUplinkPowerControlTestCase* testcase, } void -SrsTxPowerNofitication(LteUplinkPowerControlTestCase* testcase, +SrsTxPowerNotification(LteUplinkPowerControlTestCase* testcase, uint16_t cellId, uint16_t rnti, double txPower) @@ -269,11 +269,11 @@ LteUplinkOpenLoopPowerControlTestCase::DoRun() m_ueUpc = uePhy->GetUplinkPowerControl(); m_ueUpc->TraceConnectWithoutContext("ReportPuschTxPower", - MakeBoundCallback(&PuschTxPowerNofitication, this)); + MakeBoundCallback(&PuschTxPowerNotification, this)); m_ueUpc->TraceConnectWithoutContext("ReportPucchTxPower", - MakeBoundCallback(&PucchTxPowerNofitication, this)); + MakeBoundCallback(&PucchTxPowerNotification, this)); m_ueUpc->TraceConnectWithoutContext("ReportSrsTxPower", - MakeBoundCallback(&SrsTxPowerNofitication, this)); + MakeBoundCallback(&SrsTxPowerNotification, this)); // Attach a UE to a eNB lteHelper->Attach(ueDevs, enbDevs.Get(0)); @@ -452,11 +452,11 @@ LteUplinkClosedLoopPowerControlAbsoluteModeTestCase::DoRun() m_ueUpc = uePhy->GetUplinkPowerControl(); m_ueUpc->TraceConnectWithoutContext("ReportPuschTxPower", - MakeBoundCallback(&PuschTxPowerNofitication, this)); + MakeBoundCallback(&PuschTxPowerNotification, this)); m_ueUpc->TraceConnectWithoutContext("ReportPucchTxPower", - MakeBoundCallback(&PucchTxPowerNofitication, this)); + MakeBoundCallback(&PucchTxPowerNotification, this)); m_ueUpc->TraceConnectWithoutContext("ReportSrsTxPower", - MakeBoundCallback(&SrsTxPowerNofitication, this)); + MakeBoundCallback(&SrsTxPowerNotification, this)); // Attach a UE to a eNB lteHelper->Attach(ueDevs, enbDevs.Get(0)); @@ -616,11 +616,11 @@ LteUplinkClosedLoopPowerControlAccumulatedModeTestCase::DoRun() m_ueUpc = uePhy->GetUplinkPowerControl(); m_ueUpc->TraceConnectWithoutContext("ReportPuschTxPower", - MakeBoundCallback(&PuschTxPowerNofitication, this)); + MakeBoundCallback(&PuschTxPowerNotification, this)); m_ueUpc->TraceConnectWithoutContext("ReportPucchTxPower", - MakeBoundCallback(&PucchTxPowerNofitication, this)); + MakeBoundCallback(&PucchTxPowerNotification, this)); m_ueUpc->TraceConnectWithoutContext("ReportSrsTxPower", - MakeBoundCallback(&SrsTxPowerNofitication, this)); + MakeBoundCallback(&SrsTxPowerNotification, this)); // Attach a UE to a eNB lteHelper->Attach(ueDevs, enbDevs.Get(0)); diff --git a/src/lte/test/test-epc-tft-classifier.cc b/src/lte/test/test-epc-tft-classifier.cc index ec58896d5..0b32a3538 100644 --- a/src/lte/test/test-epc-tft-classifier.cc +++ b/src/lte/test/test-epc-tft-classifier.cc @@ -14,8 +14,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Authors: Nicola Baldo - * Manuel Requena + * Authors: + * Nicola Baldo + * Manuel Requena */ #include "ns3/epc-tft-classifier.h" diff --git a/src/lte/test/test-lte-x2-handover-measures.cc b/src/lte/test/test-lte-x2-handover-measures.cc index 09db4e31d..9d54ac368 100644 --- a/src/lte/test/test-lte-x2-handover-measures.cc +++ b/src/lte/test/test-lte-x2-handover-measures.cc @@ -14,8 +14,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Authors: Nicola Baldo - * Manuel Requena + * Authors: + * Nicola Baldo + * Manuel Requena */ #include diff --git a/src/mesh/model/mesh-point-device.cc b/src/mesh/model/mesh-point-device.cc index 8e6bc37d1..56de2a3c6 100644 --- a/src/mesh/model/mesh-point-device.cc +++ b/src/mesh/model/mesh-point-device.cc @@ -174,16 +174,16 @@ MeshPointDevice::ReceiveFromDevice(Ptr incomingPort, } void -MeshPointDevice::Forward(Ptr inport, +MeshPointDevice::Forward(Ptr incomingPort, Ptr packet, uint16_t protocol, const Mac48Address src, const Mac48Address dst) { - NS_LOG_FUNCTION(this << inport << packet << protocol << src << dst); + NS_LOG_FUNCTION(this << incomingPort << packet << protocol << src << dst); // pass through routing protocol NS_LOG_DEBUG("Forwarding from " << src << " to " << dst << " at " << m_address); - bool result = m_routingProtocol->RequestRoute(inport->GetIfIndex(), + bool result = m_routingProtocol->RequestRoute(incomingPort->GetIfIndex(), src, dst, packet, diff --git a/src/mobility/examples/reference-point-group-mobility-example.cc b/src/mobility/examples/reference-point-group-mobility-example.cc index d2b63f295..53026eccd 100644 --- a/src/mobility/examples/reference-point-group-mobility-example.cc +++ b/src/mobility/examples/reference-point-group-mobility-example.cc @@ -33,7 +33,7 @@ * and different child mobility models. * * There is no node associated with the parent (reference) model. - * Instead, all nodes are associated with a hiearchical mobility model + * Instead, all nodes are associated with a hierarchical mobility model * containing both the parent and child models, and the position of * the node is the vector sum of these parent and child positions. * diff --git a/src/mobility/helper/ns2-mobility-helper.cc b/src/mobility/helper/ns2-mobility-helper.cc index 790a662f8..acd5182a7 100644 --- a/src/mobility/helper/ns2-mobility-helper.cc +++ b/src/mobility/helper/ns2-mobility-helper.cc @@ -854,7 +854,7 @@ SetSchedPosition(Ptr model, position.y = model->GetPosition().y; position.z = model->GetPosition().z; - // Chedule next positions + // Schedule next positions Simulator::Schedule(Seconds(at), &ConstantVelocityMobilityModel::SetPosition, model, position); return position; diff --git a/src/network/utils/queue-size.cc b/src/network/utils/queue-size.cc index 6c5fbb160..54c91b843 100644 --- a/src/network/utils/queue-size.cc +++ b/src/network/utils/queue-size.cc @@ -1,21 +1,21 @@ -// -// Copyright (c) 2018 Universita' degli Studi di Napoli Federico II -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Author: Stefano Avallone -// +/* + * Copyright (c) 2018 Universita' degli Studi di Napoli Federico II + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Stefano Avallone + */ #include "queue-size.h" diff --git a/src/network/utils/queue-size.h b/src/network/utils/queue-size.h index 832ab0f2d..274400e86 100644 --- a/src/network/utils/queue-size.h +++ b/src/network/utils/queue-size.h @@ -1,21 +1,21 @@ -// -// Copyright (c) 2018 Universita' degli Studi di Napoli Federico II -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License version 2 as -// published by the Free Software Foundation; -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// Author: Stefano Avallone -// +/* + * Copyright (c) 2018 Universita' degli Studi di Napoli Federico II + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Stefano Avallone + */ #ifndef QUEUE_SIZE_H #define QUEUE_SIZE_H diff --git a/src/propagation/doc/propagation.rst b/src/propagation/doc/propagation.rst index 1e45fa0e7..1eb5ce137 100644 --- a/src/propagation/doc/propagation.rst +++ b/src/propagation/doc/propagation.rst @@ -410,7 +410,7 @@ The extension for the standard OH in open area is The literature lacks of extensions of the COST231 to open area (for suburban it seems that -we can just impose C = 0); therefore we consider it a special case fo the suburban one. +we can just impose C = 0); therefore we consider it a special case of the suburban one. Cost231PropagationLossModel diff --git a/src/propagation/model/channel-condition-model.cc b/src/propagation/model/channel-condition-model.cc index bbac4db2b..08604e5a8 100644 --- a/src/propagation/model/channel-condition-model.cc +++ b/src/propagation/model/channel-condition-model.cc @@ -686,7 +686,7 @@ ThreeGppUmiStreetCanyonChannelConditionModel::ComputePlos(PtrGetPosition(), b->GetPosition()); - // NOTE: no idication is given about the UT height used to derive the + // NOTE: no indication is given about the UT height used to derive the // LOS probability // h_BS should be equal to 10 m. We check if at least one of the two @@ -741,7 +741,7 @@ ThreeGppIndoorMixedOfficeChannelConditionModel::ComputePlos(PtrGetPosition(), b->GetPosition()); - // NOTE: no idication is given about the UT height used to derive the + // NOTE: no indication is given about the UT height used to derive the // LOS probability // retrieve h_BS, it should be equal to 3 m @@ -800,7 +800,7 @@ ThreeGppIndoorOpenOfficeChannelConditionModel::ComputePlos(PtrGetPosition(), b->GetPosition()); - // NOTE: no idication is given about the UT height used to derive the + // NOTE: no indication is given about the UT height used to derive the // LOS probability // retrieve h_BS, it should be equal to 3 m diff --git a/src/spectrum/test/two-ray-splm-test-suite.cc b/src/spectrum/test/two-ray-splm-test-suite.cc index 4ed3d37bc..e5deb9418 100644 --- a/src/spectrum/test/two-ray-splm-test-suite.cc +++ b/src/spectrum/test/two-ray-splm-test-suite.cc @@ -259,7 +259,7 @@ ArrayResponseTest::ArrayResponseTest(Ptr txAntElem, double expectedGain) // TODO: Create a string with the test parameters as the test case name like in // test-uniform-planar-array ? - : TestCase("Check that the overall array response gain has the proper trend with respect to" + : TestCase("Check that the overall array response gain has the proper trend with respect to " "the number of antennas and the type of single element antenna"), m_txAntElem(txAntElem), m_rxAntElem(rxAntElem), diff --git a/src/traffic-control/doc/fq-cobalt.rst b/src/traffic-control/doc/fq-cobalt.rst index 3422fef44..8d823eb51 100644 --- a/src/traffic-control/doc/fq-cobalt.rst +++ b/src/traffic-control/doc/fq-cobalt.rst @@ -32,7 +32,7 @@ The Model Description is similar to the FqCoDel documentation mentioned above. References ========== -.. [Pal19] J. Palmei, S. Gupta, P. Imputato, J. Morton, M. Tahiliani, S. Avallone, and D. Taht, Design and Evaluation of COBALT Queue Discipline, 2019 IEEE International Symposium on Local and Metropolitan Area Networks (LANMAN), Paris, France, 2019. +.. [Pal19] J. Palmei, S. Gupta, P. Imputato, J. Morton, M. Tahiliani, S. Avallone, and D. Taht, Design and Evaluation of COBALT Queue Discipline, 2019 IEEE International Symposium on Local and Metropolitan Area Networks (LANMAN), Paris, France, 2019. .. [Hoe18] T. Hoiland-Jørgensen, D. Taht and J. Morton, "Piece of CAKE: A Comprehensive Queue Management Solution for Home Gateways," 2018 IEEE International Symposium on Local and Metropolitan Area Networks (LANMAN), Washington, DC, USA, 2018. diff --git a/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc b/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc index 0437aa101..dcbc814fb 100644 --- a/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc +++ b/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc @@ -260,7 +260,7 @@ TraceDroppingState(std::string dropStateTrFileName) * * \param remoteAddress Remote address. * \param sender Sender node. - * \param pktSize Pakcet size. + * \param pktSize Packet size. * \param stopTime Stop time. */ void diff --git a/src/traffic-control/model/codel-queue-disc.cc b/src/traffic-control/model/codel-queue-disc.cc index d66257edd..da2975de6 100644 --- a/src/traffic-control/model/codel-queue-disc.cc +++ b/src/traffic-control/model/codel-queue-disc.cc @@ -18,8 +18,9 @@ * Based on ns2 simulation code presented by Kathie Nichols * * This port based on linux kernel code by - * Authors: Dave Täht - * Eric Dumazet + * Authors: + * Dave Täht + * Eric Dumazet * * Ported to ns-3 by: Andrew McGregor */ diff --git a/src/traffic-control/model/codel-queue-disc.h b/src/traffic-control/model/codel-queue-disc.h index c6535cb3b..9a26bc3b4 100644 --- a/src/traffic-control/model/codel-queue-disc.h +++ b/src/traffic-control/model/codel-queue-disc.h @@ -18,8 +18,9 @@ * Based on ns2 simulation code presented by Kathie Nichols * * This port based on linux kernel code by - * Authors: Dave Täht - * Eric Dumazet + * Authors: + * Dave Täht + * Eric Dumazet * * Ported to ns-3 by: Andrew McGregor */ diff --git a/src/uan/model/uan-mac-rc.h b/src/uan/model/uan-mac-rc.h index 2b203bf4e..dd58b83b8 100644 --- a/src/uan/model/uan-mac-rc.h +++ b/src/uan/model/uan-mac-rc.h @@ -125,7 +125,7 @@ class Reservation /** * Set the reservation transmitted state. * - * \param t True if resevation has been transmitted. + * \param t True if reservation has been transmitted. */ void SetTransmitted(bool t = true); diff --git a/src/wifi/doc/source/wifi-design.rst b/src/wifi/doc/source/wifi-design.rst index 598ee8fe4..af7259887 100644 --- a/src/wifi/doc/source/wifi-design.rst +++ b/src/wifi/doc/source/wifi-design.rst @@ -1396,7 +1396,7 @@ Depending on your goal, the common tasks are (in no particular order): * Wi-Fi queue management. The files ``txop.*`` and ``qos-txop.*`` are of interest for this task. * Channel access management. Users should modify the files ``channel-access-manager.*``, which grant access to ``Txop`` and ``QosTxop``. -* Fragmentation and RTS threholds are handled by Wi-Fi remote station manager. Note that Wi-Fi remote +* Fragmentation and RTS thresholds are handled by Wi-Fi remote station manager. Note that Wi-Fi remote station manager simply indicates if fragmentation and RTS are needed. Fragmentation is handled by ``Txop`` or ``QosTxop`` while RTS/CTS transaction is handled by ``FrameExchangeManager``. * Modifying or creating new rate control algorithms can be done by creating a new child class of Wi-Fi remote diff --git a/src/wifi/examples/reference/bianchi11ax.py b/src/wifi/examples/reference/bianchi11ax.py index b06f807b9..5f8b5c953 100644 --- a/src/wifi/examples/reference/bianchi11ax.py +++ b/src/wifi/examples/reference/bianchi11ax.py @@ -129,39 +129,39 @@ ack_rates_160MHz = [6e6, 12e6, 12e6, 24e6, 24e6, 24e6, 24e6, 24e6, 24e6, 24e6, 2 k = 1 difs = 1 -with open("bianchi_11ax_difs.txt", "w", encoding="utf-8") as fo: +with open("bianchi_11ax_difs.txt", "w", encoding="utf-8") as f: for i in range(len(data_rates_20MHz)): bianchi_result = bianchi_ax(data_rates_20MHz[i], ack_rates_20MHz[i], k, difs) str_s = str_result(bianchi_result, i, 20) - fo.write(str_s) + f.write(str_s) for i in range(len(data_rates_40MHz)): bianchi_result = bianchi_ax(data_rates_40MHz[i], ack_rates_40MHz[i], k, difs) str_s = str_result(bianchi_result, i, 40) - fo.write(str_s) + f.write(str_s) for i in range(len(data_rates_80MHz)): bianchi_result = bianchi_ax(data_rates_80MHz[i], ack_rates_80MHz[i], k, difs) str_s = str_result(bianchi_result, i, 80) - fo.write(str_s) + f.write(str_s) for i in range(len(data_rates_160MHz)): bianchi_result = bianchi_ax(data_rates_160MHz[i], ack_rates_160MHz[i], k, difs) str_s = str_result(bianchi_result, i, 160) - fo.write(str_s) + f.write(str_s) difs = 0 -with open("bianchi_11ax_eifs.txt", "w", encoding="utf-8") as fo: +with open("bianchi_11ax_eifs.txt", "w", encoding="utf-8") as f: for i in range(len(data_rates_20MHz)): bianchi_result = bianchi_ax(data_rates_20MHz[i], ack_rates_20MHz[i], k, difs) str_s = str_result(bianchi_result, i, 20) - fo.write(str_s) + f.write(str_s) for i in range(len(data_rates_40MHz)): bianchi_result = bianchi_ax(data_rates_40MHz[i], ack_rates_40MHz[i], k, difs) str_s = str_result(bianchi_result, i, 40) - fo.write(str_s) + f.write(str_s) for i in range(len(data_rates_80MHz)): bianchi_result = bianchi_ax(data_rates_80MHz[i], ack_rates_80MHz[i], k, difs) str_s = str_result(bianchi_result, i, 80) - fo.write(str_s) + f.write(str_s) for i in range(len(data_rates_160MHz)): bianchi_result = bianchi_ax(data_rates_160MHz[i], ack_rates_160MHz[i], k, difs) str_s = str_result(bianchi_result, i, 160) - fo.write(str_s) + f.write(str_s) diff --git a/src/wimax/model/bs-net-device.h b/src/wimax/model/bs-net-device.h index be968a09c..0b0e5c26d 100644 --- a/src/wimax/model/bs-net-device.h +++ b/src/wimax/model/bs-net-device.h @@ -492,7 +492,7 @@ class BaseStationNetDevice : public WimaxNetDevice * \see class CallBackTraceSource */ TracedCallback> - m_bsPromiscRxTrace; ///< base station promiscious receive trace callback + m_bsPromiscRxTrace; ///< base station promiscuous receive trace callback /** * The trace source fired for packets successfully received by the device diff --git a/src/wimax/model/wimax-net-device.h b/src/wimax/model/wimax-net-device.h index 7e2bc648c..1c4910028 100644 --- a/src/wimax/model/wimax-net-device.h +++ b/src/wimax/model/wimax-net-device.h @@ -211,7 +211,7 @@ class WimaxNetDevice : public NetDevice /** * Set the connection manager of the device - * \param connectionManager the commection manager to be installed in the device + * \param connectionManager the connection manager to be installed in the device */ virtual void SetConnectionManager(Ptr connectionManager); @@ -421,13 +421,13 @@ class WimaxNetDevice : public NetDevice const Address& dest, uint16_t protocolNumber) override; /** - * Set promiscious receive callback function - * \param cb the promiscious mode callback + * Set promiscuous receive callback function + * \param cb the promiscuous mode callback */ void SetPromiscReceiveCallback(PromiscReceiveCallback cb) override; /** - * Get promiscious receive callback function - * \returns the promiscious mode callback + * Get promiscuous receive callback function + * \returns the promiscuous mode callback */ NetDevice::PromiscReceiveCallback GetPromiscReceiveCallback(); /** @@ -470,12 +470,12 @@ class WimaxNetDevice : public NetDevice bool IsBridge() const override; /** - * Check if device is promiscious - * \returns true if promiscious + * Check if device is promiscuous + * \returns true if promiscuous */ bool IsPromisc(); /** - * Notify promiscious trace of a packet arrival + * Notify promiscuous trace of a packet arrival * \param p the packet */ void NotifyPromiscTrace(Ptr p); @@ -527,7 +527,7 @@ class WimaxNetDevice : public NetDevice Ptr m_node; ///< the node Ptr m_phy; ///< the phy NetDevice::ReceiveCallback m_forwardUp; ///< forward up callback function - NetDevice::PromiscReceiveCallback m_promiscRx; ///< promiscious receive fcallback function + NetDevice::PromiscReceiveCallback m_promiscRx; ///< promiscuous receive callback function uint32_t m_ifIndex; ///< IF index std::string m_name; ///< service name diff --git a/utils/bench-scheduler.cc b/utils/bench-scheduler.cc index 2cfbaf1fa..7cbb326b8 100644 --- a/utils/bench-scheduler.cc +++ b/utils/bench-scheduler.cc @@ -479,10 +479,10 @@ main(int argc, char* argv[]) "\n" "If no scheduler is specified the MapScheduler will be run."); cmd.AddValue("all", "use all schedulers", allSched); - cmd.AddValue("cal", "use CalendarSheduler", schedCal); + cmd.AddValue("cal", "use CalendarScheduler", schedCal); cmd.AddValue("calrev", "reverse ordering in the CalendarScheduler", calRev); cmd.AddValue("heap", "use HeapScheduler", schedHeap); - cmd.AddValue("list", "use ListSheduler", schedList); + cmd.AddValue("list", "use ListScheduler", schedList); cmd.AddValue("map", "use MapScheduler (default)", schedMap); cmd.AddValue("pri", "use PriorityQueue", schedPQ); cmd.AddValue("debug", "enable debugging output", g_debug); diff --git a/utils/codespell-ignored-lines b/utils/codespell-ignored-lines index 736a234a3..b38136e3f 100644 --- a/utils/codespell-ignored-lines +++ b/utils/codespell-ignored-lines @@ -49,6 +49,42 @@ Network Animator nam. It is not possible to run a simulation arp_h->ar_tha); // Target hardware address. arp_h->ar_hln = sizeof arp_h->ar_tha; // Hardware address length. +# Names and emails + * Author: Manuel Requena + * Manuel Requena + * Dave Täht +.. [Pal19] J. Palmei, S. Gupta, P. Imputato, J. Morton, M. Tahiliani, S. Avallone, and D. Taht, Design and Evaluation of COBALT Queue Discipline, 2019 IEEE International Symposium on Local and Metropolitan Area Networks (LANMAN), Paris, France, 2019. +.. [Hoe18] T. Hoiland-Jørgensen, D. Taht and J. Morton, "Piece of CAKE: A Comprehensive Queue Management Solution for Home Gateways," 2018 IEEE International Symposium on Local and Metropolitan Area Networks (LANMAN), Washington, DC, USA, 2018. +.. [Hoe16] T. Hoeiland-Joergensen, P. McKenney, D. Taht, J. Gettys and E. Dumazet, The FlowQueue-CoDel Packet Scheduler and Active Queue Management Algorithm, IETF draft. Available online at ``_ + Morton, Mohit P. Tahiliani, Stefano Avallone and Dave Taht (2019). + * Author: Jaume Nin + * Jaume Nin + * Author: Jaume Nin + * Jaume Nin + * Author: Jaume Nin + * Author: Jaume Nin + * Jaume Nin + * Copyright (c) 2014 Universita' degli Studi di Napoli "Federico II" + * 2014 Universita' degli Studi di Napoli "Federico II" + * Copyright (c) 2015 Universita' degli Studi di Napoli Federico II + * Copyright (c) 2015 Universita' degli Studi di Napoli "Federico II" + * 2015 Universita' degli Studi di Napoli Federico II + * Copyright (c) 2016 Universita' degli Studi di Napoli Federico II + * Copyright (c) 2017 Universita' degli Studi di Napoli Federico II + * 2017 Università' degli Studi di Napoli Federico II + * 2017 Universita' degli Studi di Napoli Federico II + * Copyright (c) 2018 Universita' degli Studi di Napoli Federico II + * Copyright (c) 2019 Universita' degli Studi di Napoli Federico II + * Copyright (c) 2020 Universita' degli Studi di Napoli Federico II + * Copyright (c) 2021 2020 Universita' degli Studi di Napoli Federico II + * Copyright (c) 2021 Universita' degli Studi di Napoli Federico II + * Copyright (c) 2022 Universita' degli Studi di Napoli Federico II + * Copyright (c) 2022 Universita' degli Studi di Napoli "Federico II" + * Copyright (c) 2023 Universita' degli Studi di Napoli Federico II + +./src/core/examples/hash-example.cc +6ed21de2 brand-newness peripherial + ./src/dsr/model/dsr-routing.cc:243, 246, 3360, 3363 .AddAttribute("GratReplyHoldoff", MakeTimeAccessor(&DsrRouting::m_gratReplyHoldoff), @@ -95,6 +131,10 @@ static ns3::GlobalValue g_rate("VRCrate", ./src/internet/model/global-route-manager-impl.h:555 typedef std::list ListOfSPFVertex_t; //!< container of SPFVertexes +./utils/tests/test-ns3.py + destination_src = os.path.join(ns3_path, "src/test-src-dependant-on-contrib") + shutil.copytree(os.path.join(ns3_path, "build-support/test-files/test-src-dependant-on-contrib"), + ./CHANGES.md: * (dsr) Class `DsrOptionRerrUnsupportHeader` from `dsr-option-header.h` was renamed `DsrOptionRerrUnsupportedHeader`. * (internet) Enumerated value `IPV6_EXT_AUTHENTIFICATION` from `ipv6-header.h` was renamed `IPV6_EXT_AUTHENTICATION`. @@ -117,5 +157,8 @@ static ns3::GlobalValue g_rate("VRCrate", * (wifi) Enumerated value `MDAOP_ADVERTISMENTS` from `mgmt-headers.h` was renamed `MDAOP_ADVERTISEMENTS`. * (wifi) Define `IE_BEAMLINK_MAINENANCE` from `wifi-information-element.h` was renamed `IE_BEAMLINK_MAINTENANCE`. * (wimax) Attribute `m_nrRecivedFecBlocks` from `simple-ofdm-wimax-phy.h` was renamed `m_nrReceivedFecBlocks`. + * (lte) Struct member `fdbetsFlowPerf_t::lastTtiBytesTrasmitted` in file `fdbet-ff-mac-scheduler.h` was renamed `fdbetsFlowPerf_t::lastTtiBytesTransmitted`. + * (lte) Struct member `tdbetsFlowPerf_t::lastTtiBytesTrasmitted` in file `tdbet-ff-mac-scheduler.h` was renamed `fdbetsFlowPerf_t::lastTtiBytesTransmitted`. + * (lte) Struct member `pfsFlowPerf_t::lastTtiBytesTrasmitted` in file `pf-ff-mac-scheduler.h` was renamed `fdbetsFlowPerf_t::lastTtiBytesTransmitted`. * The spelling of the attribute `IntialCellVoltage` from `LiIonEnergySource` was corrected to `InitialCellVoltage`; this will affect existing users who were using the attribute with the misspelling. * The attribute `Recievers` in class `YansWifiPhy` was misspelled, so this has been corrected to `Receivers`. diff --git a/utils/codespell-ignored-words b/utils/codespell-ignored-words index 04b6ccd87..eac37a4b4 100644 --- a/utils/codespell-ignored-words +++ b/utils/codespell-ignored-words @@ -2,81 +2,40 @@ te #Core -anid -anumber bu mone -peripherial -studi -thre #Network ot nd #Internet -devicec ect iif -nce -inflight -upto - -#Internet Apps -clen - -#Buildings -nin #DSR -cleanp grat #LTE commun -couting ue ues -#Netanim -writen - -#Spectrum -inh - -#Wave -aci -ois - -#Wifi -fo - #Traffic Control -taht interm +#Wi-Fi +aci + #Wimax aas opps -#Propagation -alos -clos - -#Examples -clienta - #Brite brite -#Mesh -inport - #Visualizer inout #Utils filetest - -#test-ns3.py -dependant diff --git a/utils/tests/README.md b/utils/tests/README.md index 0fabbcf82..a478ca404 100644 --- a/utils/tests/README.md +++ b/utils/tests/README.md @@ -27,7 +27,7 @@ The configuration is split in different files, each one containing a group of jo - `gitlab-ci-scheduled.yml`: daily and weekly ordinary and slow jobs. - `gitlab-ci-gcc.yml`: jobs to test various GCC versions. -If you did fork ns-3, the CI should already point to the right configureation file. Otherwise, you will have to select the `gitlab-ci.yml` in your fork configuration. Note that Gitlab requires a user verification (usually it requires a valid credit card) to run CI jobs. If you did skip the verification process the CI will always fail. +If you did fork ns-3, the CI should already point to the right configuration file. Otherwise, you will have to select the `gitlab-ci.yml` in your fork configuration. Note that Gitlab requires a user verification (usually it requires a valid credit card) to run CI jobs. If you did skip the verification process the CI will always fail. ### CI pipelines