From 00bb6fe7f6be95c48b1000a13693859134f08089 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Wed, 27 Jun 2018 10:50:27 +0300 Subject: [PATCH] Spellcheck --- examples/stats/README | 2 +- examples/stats/wifi-example-db.sh | 2 +- examples/tcp/tcp-nsc-zoo.cc | 2 +- examples/wireless/80211e-txop.cc | 4 +-- examples/wireless/wifi-aggregation.cc | 6 ++--- examples/wireless/wifi-blockack.cc | 2 +- src/aodv/model/aodv-packet.h | 2 +- src/aodv/model/aodv-routing-protocol.cc | 2 +- src/aodv/model/aodv-rqueue.h | 2 +- .../examples/three-gpp-http-example.cc | 4 +-- .../test/three-gpp-http-client-server-test.cc | 2 +- src/buildings/doc/source/buildings-design.rst | 2 +- src/buildings/doc/source/buildings-user.rst | 12 ++++----- src/buildings/helper/building-allocator.cc | 2 +- .../helper/building-position-allocator.h | 8 +++--- src/buildings/model/building-list.cc | 2 +- src/buildings/model/mobility-building-info.h | 2 +- src/core/model/cairo-wideint-private.h | 2 +- src/core/model/command-line.cc | 2 +- src/core/model/command-line.h | 4 +-- src/core/model/config.cc | 2 +- src/core/model/fatal-impl.cc | 2 +- src/core/model/hash-function.h | 2 +- src/core/model/heap-scheduler.cc | 2 +- src/core/model/log-macros-enabled.h | 2 +- src/core/model/log.cc | 4 +-- src/core/model/nstime.h | 2 +- src/core/model/object-base.h | 2 +- src/core/model/object.h | 4 +-- src/core/model/rng-seed-manager.h | 2 +- src/core/model/simulator.h | 2 +- src/core/model/test.cc | 6 ++--- src/core/model/test.h | 4 +-- src/core/model/traced-value.h | 2 +- src/core/model/type-id.cc | 2 +- src/core/model/type-id.h | 4 +-- src/core/model/valgrind.h | 4 +-- src/core/test/attribute-test-suite.cc | 10 +++---- src/core/test/command-line-test-suite.cc | 2 +- src/core/test/int64x64-test-suite.cc | 2 +- src/core/test/names-test-suite.cc | 6 ++--- .../test/random-variable-stream-test-suite.cc | 4 +-- src/core/test/simulator-test-suite.cc | 2 +- src/csma/model/csma-net-device.cc | 2 +- src/csma/model/csma-net-device.h | 4 +-- .../source/figures/ca-downlink-bsr.seqdiag | 2 +- src/lte/doc/source/lte-design.rst | 26 +++++++++---------- src/lte/doc/source/lte-profiling.rst | 4 +-- src/lte/doc/source/lte-testing.rst | 10 +++---- src/lte/doc/source/lte-user.rst | 4 +-- src/lte/examples/lena-distributed-ffr.cc | 2 +- src/lte/examples/lena-dual-stripe.cc | 6 ++--- src/lte/examples/lena-fading.cc | 2 +- src/lte/examples/lena-x2-handover-measures.cc | 4 +-- src/lte/examples/lena-x2-handover.cc | 2 +- src/lte/helper/emu-epc-helper.cc | 2 +- src/lte/helper/epc-helper.h | 4 +-- .../helper/lte-hex-grid-enb-topology-helper.h | 2 +- src/lte/helper/phy-tx-stats-calculator.h | 4 +-- src/lte/model/component-carrier-enb.h | 4 +-- src/lte/model/cqa-ff-mac-scheduler.cc | 2 +- src/lte/model/cqa-ff-mac-scheduler.h | 4 +-- src/lte/model/epc-x2-sap.h | 2 +- src/lte/model/fdbet-ff-mac-scheduler.cc | 4 +-- src/lte/model/fdbet-ff-mac-scheduler.h | 4 +-- src/lte/model/fdmt-ff-mac-scheduler.cc | 2 +- src/lte/model/fdmt-ff-mac-scheduler.h | 6 ++--- src/lte/model/fdtbfq-ff-mac-scheduler.cc | 4 +-- src/lte/model/fdtbfq-ff-mac-scheduler.h | 4 +-- src/lte/model/ff-mac-sched-sap.h | 2 +- src/lte/model/lte-asn1-header.cc | 2 +- src/lte/model/lte-ccm-rrc-sap.h | 4 +-- src/lte/model/lte-control-messages.h | 10 +++---- src/lte/model/lte-enb-mac.cc | 2 +- src/lte/model/lte-enb-net-device.h | 2 +- src/lte/model/lte-enb-rrc.cc | 2 +- src/lte/model/lte-ffr-algorithm.h | 2 +- src/lte/model/lte-ffr-enhanced-algorithm.cc | 2 +- src/lte/model/lte-ffr-enhanced-algorithm.h | 4 +-- src/lte/model/lte-interference.h | 2 +- src/lte/model/lte-phy.h | 4 +-- src/lte/model/lte-radio-bearer-tag.cc | 2 +- src/lte/model/lte-rlc-am-header.cc | 2 +- src/lte/model/lte-rrc-header.h | 4 +-- src/lte/model/lte-rrc-protocol-real.cc | 8 +++--- src/lte/model/lte-spectrum-phy.cc | 18 ++++++------- src/lte/model/lte-spectrum-phy.h | 2 +- src/lte/model/lte-ue-ccm-rrc-sap.h | 2 +- .../model/lte-ue-component-carrier-manager.h | 2 +- src/lte/model/lte-ue-mac.cc | 2 +- src/lte/model/lte-ue-mac.h | 6 ++--- src/lte/model/lte-ue-net-device.h | 4 +-- src/lte/model/lte-ue-phy.cc | 2 +- src/lte/model/lte-ue-phy.h | 2 +- src/lte/model/lte-ue-power-control.cc | 2 +- src/lte/model/lte-ue-rrc.cc | 4 +-- src/lte/model/lte-ue-rrc.h | 6 ++--- src/lte/model/pf-ff-mac-scheduler.cc | 2 +- src/lte/model/pf-ff-mac-scheduler.h | 4 +-- src/lte/model/pss-ff-mac-scheduler.cc | 6 ++--- src/lte/model/pss-ff-mac-scheduler.h | 6 ++--- src/lte/model/rr-ff-mac-scheduler.cc | 2 +- src/lte/model/rr-ff-mac-scheduler.h | 6 ++--- src/lte/model/tdbet-ff-mac-scheduler.cc | 2 +- src/lte/model/tdbet-ff-mac-scheduler.h | 6 ++--- src/lte/model/tdmt-ff-mac-scheduler.cc | 4 +-- src/lte/model/tdmt-ff-mac-scheduler.h | 6 ++--- src/lte/model/tdtbfq-ff-mac-scheduler.cc | 2 +- src/lte/model/tdtbfq-ff-mac-scheduler.h | 6 ++--- src/lte/model/tta-ff-mac-scheduler.cc | 4 +-- src/lte/model/tta-ff-mac-scheduler.h | 8 +++--- src/lte/test/lte-test-cell-selection.h | 2 +- src/lte/test/lte-test-deactivate-bearer.h | 2 +- src/lte/test/lte-test-earfcn.cc | 6 ++--- .../test/lte-test-fdbet-ff-mac-scheduler.cc | 2 +- .../test/lte-test-fdmt-ff-mac-scheduler.cc | 2 +- src/lte/test/lte-test-frequency-reuse.cc | 2 +- src/lte/test/lte-test-frequency-reuse.h | 2 +- src/lte/test/lte-test-pf-ff-mac-scheduler.cc | 6 ++--- .../test/lte-test-spectrum-value-helper.cc | 4 +-- .../test/lte-test-tdbet-ff-mac-scheduler.cc | 2 +- .../test/lte-test-tdmt-ff-mac-scheduler.cc | 2 +- src/lte/test/lte-test-tta-ff-mac-scheduler.cc | 2 +- src/lte/test/lte-test-ue-measurements.h | 4 +-- src/lte/test/test-asn1-encoding.cc | 2 +- src/lte/test/test-lte-antenna.cc | 2 +- src/lte/test/test-lte-rlc-header.cc | 2 +- src/lte/test/test-lte-rrc.cc | 2 +- src/lte/test/test-lte-x2-handover.cc | 2 +- src/mobility/examples/main-grid-topology.cc | 2 +- src/mobility/helper/ns2-mobility-helper.cc | 2 +- .../constant-acceleration-mobility-model.h | 2 +- .../model/constant-position-mobility-model.h | 2 +- .../model/constant-velocity-mobility-model.h | 2 +- .../model/hierarchical-mobility-model.cc | 2 +- src/mobility/model/position-allocator.cc | 2 +- .../model/random-walk-2d-mobility-model.h | 2 +- .../test/waypoint-mobility-model-test.cc | 2 +- src/network/doc/error-model.rst | 2 +- src/network/model/buffer.h | 4 +-- src/network/model/node.cc | 2 +- src/network/model/packet-metadata.h | 6 ++--- src/network/model/tag-buffer.h | 2 +- src/network/test/buffer-test.cc | 2 +- src/network/utils/data-rate.h | 2 +- src/network/utils/mac8-address.h | 2 +- src/network/utils/output-stream-wrapper.cc | 2 +- src/network/utils/packetbb.h | 2 +- src/network/utils/queue-size.h | 2 +- .../model/point-to-point-grid.h | 2 +- .../model/point-to-point-net-device.cc | 2 +- .../model/point-to-point-net-device.h | 2 +- src/propagation/doc/propagation.rst | 2 +- .../model/propagation-loss-model.cc | 2 +- src/stats/model/file-aggregator.h | 4 +-- src/stats/model/get-wildcard-matches.cc | 2 +- src/stats/model/get-wildcard-matches.h | 2 +- src/stats/model/gnuplot-aggregator.cc | 2 +- src/stats/model/gnuplot.h | 4 +-- src/stats/model/stats.h | 2 +- src/test/ns3tcp/ns3tcp-interop-test-suite.cc | 2 +- .../wifi-msdu-aggregator-test-suite.cc | 2 +- ...raced-value-callback-typedef-test-suite.cc | 2 +- src/uan/examples/uan-rc-example.cc | 2 +- src/uan/examples/uan-rc-example.h | 2 +- src/uan/helper/uan-helper.h | 2 +- src/uan/model/acoustic-modem-energy-model.h | 2 +- src/uan/model/uan-header-rc.h | 2 +- src/uan/model/uan-mac-rc-gw.h | 2 +- src/uan/model/uan-phy.h | 6 ++--- src/uan/model/uan-prop-model.h | 2 +- src/uan/test/uan-test.cc | 2 +- src/wifi/doc/source/wifi-design.rst | 2 +- src/wifi/doc/source/wifi-testing.rst | 2 +- src/wifi/doc/source/wifi-user.rst | 4 +-- src/wifi/helper/athstats-helper.cc | 2 +- src/wifi/helper/athstats-helper.h | 2 +- src/wifi/model/aarf-wifi-manager.h | 2 +- src/wifi/model/aarfcd-wifi-manager.h | 2 +- src/wifi/model/amrr-wifi-manager.h | 2 +- src/wifi/model/amsdu-subframe-header.h | 2 +- src/wifi/model/aparf-wifi-manager.h | 2 +- src/wifi/model/arf-wifi-manager.cc | 2 +- src/wifi/model/arf-wifi-manager.h | 2 +- src/wifi/model/cara-wifi-manager.cc | 2 +- src/wifi/model/cara-wifi-manager.h | 2 +- src/wifi/model/channel-access-manager.h | 6 ++--- src/wifi/model/constant-rate-wifi-manager.h | 2 +- src/wifi/model/dsss-error-rate-model.h | 2 +- src/wifi/model/he-capabilities.h | 2 +- src/wifi/model/ht-capabilities.h | 2 +- src/wifi/model/ht-operation.h | 2 +- src/wifi/model/ideal-wifi-manager.h | 2 +- src/wifi/model/mac-low.cc | 2 +- src/wifi/model/mac-low.h | 14 +++++----- src/wifi/model/mac-rx-middle.cc | 8 +++--- src/wifi/model/mac-rx-middle.h | 4 +-- src/wifi/model/mgt-headers.h | 4 +-- src/wifi/model/minstrel-ht-wifi-manager.cc | 6 ++--- src/wifi/model/minstrel-ht-wifi-manager.h | 4 +-- src/wifi/model/minstrel-wifi-manager.cc | 8 +++--- src/wifi/model/minstrel-wifi-manager.h | 6 ++--- src/wifi/model/onoe-wifi-manager.h | 2 +- src/wifi/model/parf-wifi-manager.h | 2 +- src/wifi/model/qos-txop.cc | 2 +- src/wifi/model/regular-wifi-mac.h | 8 +++--- src/wifi/model/rraa-wifi-manager.cc | 2 +- src/wifi/model/rraa-wifi-manager.h | 4 +-- src/wifi/model/rrpaa-wifi-manager.h | 4 +-- src/wifi/model/sta-wifi-mac.h | 2 +- src/wifi/model/supported-rates.h | 2 +- src/wifi/model/wifi-phy-listener.h | 4 +-- src/wifi/model/wifi-phy.cc | 2 +- src/wifi/model/wifi-phy.h | 2 +- src/wifi/model/wifi-remote-station-manager.cc | 2 +- src/wifi/model/wifi-remote-station-manager.h | 4 +-- src/wifi/model/yans-error-rate-model.h | 2 +- src/wifi/test/channel-access-manager-test.cc | 2 +- src/wifi/test/power-rate-adaptation-test.cc | 2 +- src/wimax/doc/wimax.rst | 2 +- src/wimax/model/bandwidth-manager.h | 2 +- src/wimax/model/bs-net-device.cc | 2 +- src/wimax/model/bs-scheduler-rtps.h | 6 ++--- src/wimax/model/bs-scheduler-simple.h | 2 +- src/wimax/model/bs-scheduler.h | 2 +- src/wimax/model/bs-uplink-scheduler-mbqos.cc | 2 +- src/wimax/model/bs-uplink-scheduler-rtps.cc | 2 +- src/wimax/model/bs-uplink-scheduler-rtps.h | 2 +- src/wimax/model/bs-uplink-scheduler-simple.cc | 2 +- src/wimax/model/connection-manager.h | 2 +- src/wimax/model/default-traces.h | 2 +- src/wimax/model/dl-mac-messages.h | 6 ++--- src/wimax/model/ipcs-classifier.h | 2 +- src/wimax/model/service-flow-record.h | 2 +- src/wimax/model/service-flow.h | 4 +-- src/wimax/model/simple-ofdm-send-param.h | 4 +-- src/wimax/model/simple-ofdm-wimax-phy.cc | 2 +- src/wimax/model/simple-ofdm-wimax-phy.h | 2 +- .../model/snr-to-block-error-rate-manager.h | 2 +- .../model/snr-to-block-error-rate-record.h | 2 +- src/wimax/model/ss-link-manager.cc | 6 ++--- src/wimax/model/ss-link-manager.h | 2 +- src/wimax/model/ss-net-device.cc | 4 +-- src/wimax/model/ss-net-device.h | 4 +-- src/wimax/model/ss-record.h | 2 +- src/wimax/model/ss-scheduler.h | 4 +-- src/wimax/model/ul-mac-messages.h | 2 +- src/wimax/model/wimax-phy.h | 2 +- test.py | 16 ++++++------ utils/lcov/genhtml | 2 +- utils/python-unit-tests.py | 4 +-- 251 files changed, 414 insertions(+), 414 deletions(-) diff --git a/examples/stats/README b/examples/stats/README index f317f91d3..81952075a 100644 --- a/examples/stats/README +++ b/examples/stats/README @@ -23,7 +23,7 @@ Use the wifi-example-omnet.sh script to generate the results in OMNeT++ format. If you want to analyse the results with OMNeT++'s result analyser tool: a) Download OMNeT++ 4 and install it. Start the IDE. (www.omnetpp.org) -b) If you do not want to install the whole simulator framework, there is a seperate +b) If you do not want to install the whole simulator framework, there is a separate package which contains only the analysis tool from the OMNeT++ package. You can download it from http://omnetpp.org/download/release/omnetpp-scave.tgz diff --git a/examples/stats/wifi-example-db.sh b/examples/stats/wifi-example-db.sh index e13f78748..4f3e35609 100755 --- a/examples/stats/wifi-example-db.sh +++ b/examples/stats/wifi-example-db.sh @@ -49,7 +49,7 @@ do done # -#Another SQL command which just collects raw numbers of frames receved. +#Another SQL command which just collects raw numbers of frames received. # #CMD="select Experiments.input,avg(Singletons.value) \ # from Singletons,Experiments \ diff --git a/examples/tcp/tcp-nsc-zoo.cc b/examples/tcp/tcp-nsc-zoo.cc index 7a532b150..d56fbe573 100644 --- a/examples/tcp/tcp-nsc-zoo.cc +++ b/examples/tcp/tcp-nsc-zoo.cc @@ -89,7 +89,7 @@ int main (int argc, char *argv[]) internetStack.SetTcp ("ns3::NscTcpL4Protocol","Library",StringValue ("liblinux2.6.26.so")); // this switches node 3 to NSCs Linux 2.6.26 stack. internetStack.Install (n.Get (3)); - // and then agains disables sack/timestamps/wscale on node 3. + // and then again disables sack/timestamps/wscale on node 3. Config::Set ("/NodeList/3/$ns3::Ns3NscStack/net.ipv4.tcp_sack", StringValue ("0")); Config::Set ("/NodeList/3/$ns3::Ns3NscStack/net.ipv4.tcp_timestamps", StringValue ("0")); Config::Set ("/NodeList/3/$ns3::Ns3NscStack/net.ipv4.tcp_window_scaling", StringValue ("0")); diff --git a/examples/wireless/80211e-txop.cc b/examples/wireless/80211e-txop.cc index 0243d1dbb..92fa534a7 100644 --- a/examples/wireless/80211e-txop.cc +++ b/examples/wireless/80211e-txop.cc @@ -35,7 +35,7 @@ #include "ns3/wifi-mac.h" // This is an example that illustrates 802.11 QoS for different Access Categories. -// It defines 4 independant Wi-Fi networks (working on different logical channels +// It defines 4 independent Wi-Fi networks (working on different logical channels // on the same "ns3::YansWifiPhy" channel object). // Each network contains one access point and one station. Each station continuously // transmits data packets to its respective AP. @@ -57,7 +57,7 @@ // and can choose the payload size and the simulation duration. // Example: ./waf --run "80211e-txop --distance=10 --simulationTime=20 --payloadSize=1000" // -// The output prints the throughput measured for the 4 cases/networks decribed above. When TXOP is enabled, results show +// The output prints the throughput measured for the 4 cases/networks described above. When TXOP is enabled, results show // increased throughput since the channel is granted for a longer duration. TXOP is enabled by default for AC_VI and AC_VO, // so that they can use the channel for a longer duration than AC_BE and AC_BK. diff --git a/examples/wireless/wifi-aggregation.cc b/examples/wireless/wifi-aggregation.cc index 06b4719ba..8abff4693 100644 --- a/examples/wireless/wifi-aggregation.cc +++ b/examples/wireless/wifi-aggregation.cc @@ -34,9 +34,9 @@ #include "ns3/yans-wifi-channel.h" // This is an example that illustrates how 802.11n aggregation is configured. -// It defines 4 independant Wi-Fi networks (working on different channels). +// It defines 4 independent Wi-Fi networks (working on different channels). // Each network contains one access point and one station. Each station -// continously transmits data packets to its respective AP. +// continuously transmits data packets to its respective AP. // // Network topology (numbers in parentheses are channel numbers): // @@ -57,7 +57,7 @@ // The user can select the distance between the stations and the APs and can enable/disable the RTS/CTS mechanism. // Example: ./waf --run "wifi-aggregation --distance=10 --enableRts=0 --simulationTime=20" // -// The output prints the throughput measured for the 4 cases/networks decribed above. When default aggregation parameters are enabled, the +// The output prints the throughput measured for the 4 cases/networks described above. When default aggregation parameters are enabled, the // maximum A-MPDU size is 65 kB and the throughput is maximal. When aggregation is disabled, the throughput is about the half of the // physical bitrate as in legacy wifi networks. When only A-MSDU is enabled, the throughput is increased but is not maximal, since the maximum // A-MSDU size is limited to 7935 bytes (whereas the maximum A-MPDU size is limited to 65535 bytes). When A-MSDU and A-MPDU are both enabled diff --git a/examples/wireless/wifi-blockack.cc b/examples/wireless/wifi-blockack.cc index 8c589dfb0..cf9fa5202 100644 --- a/examples/wireless/wifi-blockack.cc +++ b/examples/wireless/wifi-blockack.cc @@ -32,7 +32,7 @@ * * In this example a QoS sta sends UDP datagram packets to access point. On the access point * there is no application installed so it replies to every packet with an ICMP frame. However - * our attention is on originator sta n1. We have set blockAckThreshold (mininum number of packets to use + * our attention is on originator sta n1. We have set blockAckThreshold (minimum number of packets to use * block ack) to 2 so if there are in the BestEffort queue more than 2 packets a block ack will be * negotiated. We also set a timeout for block ack inactivity to 3 blocks of 1024 microseconds. This timer is * reset when: diff --git a/src/aodv/model/aodv-packet.h b/src/aodv/model/aodv-packet.h index 7ede84465..fc12e38ca 100644 --- a/src/aodv/model/aodv-packet.h +++ b/src/aodv/model/aodv-packet.h @@ -270,7 +270,7 @@ public: bool GetGratuitousRrep () const; /** * \brief Set the Destination only flag - * \param f the Destiantion only flag + * \param f the Destination only flag */ void SetDestinationOnly (bool f); /** diff --git a/src/aodv/model/aodv-routing-protocol.cc b/src/aodv/model/aodv-routing-protocol.cc index 35705dbf3..bace44af4 100644 --- a/src/aodv/model/aodv-routing-protocol.cc +++ b/src/aodv/model/aodv-routing-protocol.cc @@ -1341,7 +1341,7 @@ RoutingProtocol::RecvRequest (Ptr p, Ipv4Address receiver, Ipv4Address s if (m_routingTable.LookupRoute (dst, toDst)) { /* - * Drop RREQ, This node RREP wil make a loop. + * Drop RREQ, This node RREP will make a loop. */ if (toDst.GetNextHop () == src) { diff --git a/src/aodv/model/aodv-rqueue.h b/src/aodv/model/aodv-rqueue.h index 7f8ac704a..55afbf2f4 100644 --- a/src/aodv/model/aodv-rqueue.h +++ b/src/aodv/model/aodv-rqueue.h @@ -275,7 +275,7 @@ private: * Determine if queue matches a destination address * \param en The queue entry * \param dst The destination IPv4 address - * \returns true if the queue entry matches the desination address + * \returns true if the queue entry matches the destination address */ static bool IsEqual (QueueEntry en, const Ipv4Address dst) { diff --git a/src/applications/examples/three-gpp-http-example.cc b/src/applications/examples/three-gpp-http-example.cc index 9201221fe..5c234491d 100644 --- a/src/applications/examples/three-gpp-http-example.cc +++ b/src/applications/examples/three-gpp-http-example.cc @@ -67,7 +67,7 @@ ClientMainObjectReceived (Ptr, Ptr packe if (header.GetContentLength () == p->GetSize () && header.GetContentType () == ThreeGppHttpHeader::MAIN_OBJECT) { - NS_LOG_INFO ("Client has succesfully received a main object of " + NS_LOG_INFO ("Client has successfully received a main object of " << p->GetSize () << " bytes."); } else @@ -85,7 +85,7 @@ ClientEmbeddedObjectReceived (Ptr, Ptr p if (header.GetContentLength () == p->GetSize () && header.GetContentType () == ThreeGppHttpHeader::EMBEDDED_OBJECT) { - NS_LOG_INFO ("Client has succesfully received an embedded object of " + NS_LOG_INFO ("Client has successfully received an embedded object of " << p->GetSize () << " bytes."); } else diff --git a/src/applications/test/three-gpp-http-client-server-test.cc b/src/applications/test/three-gpp-http-client-server-test.cc index fecd4d883..439e8de78 100644 --- a/src/applications/test/three-gpp-http-client-server-test.cc +++ b/src/applications/test/three-gpp-http-client-server-test.cc @@ -167,7 +167,7 @@ private: // The following defines one tracker for each HTTP object type. ThreeGppHttpObjectTracker m_requestObjectTracker; ///< Tracker of request objects. - ThreeGppHttpObjectTracker m_mainObjectTracker; ///< Tracker of main objectss. + ThreeGppHttpObjectTracker m_mainObjectTracker; ///< Tracker of main objects. ThreeGppHttpObjectTracker m_embeddedObjectTracker; ///< Tracker of embedded objects. // CALLBACK TO TRACE SOURCES. diff --git a/src/buildings/doc/source/buildings-design.rst b/src/buildings/doc/source/buildings-design.rst index d09476ab1..153dabb0d 100644 --- a/src/buildings/doc/source/buildings-design.rst +++ b/src/buildings/doc/source/buildings-design.rst @@ -233,7 +233,7 @@ We note that, for the case of communication between two nodes below rooftop leve For the ITU-R P.1411 model we consider both the LOS and NLoS versions. In particular, we considers the LoS propagation for distances that are shorted than a tunable threshold (``m_itu1411NlosThreshold``). In case on NLoS propagation, the over the roof-top model is taken in consideration for modeling both macro BS and SC. In case on NLoS several parameters scenario dependent have been included, such as average street width, orientation, etc. The values of such parameters have to be properly set according to the scenario implemented, the model does not calculate natively their values. In case any values is provided, the standard ones are used, apart for the height of the mobile and BS, which instead their integrity is tested directly in the code (i.e., they have to be greater then zero). In the following we give the expressions of the components of the model. -We also note that the use of different propagation models (OH, I1411, I1238 with their variants) in HybridBuildingsPropagationLossModel can result in discontinuities of the pathloss with respect to distance. A proper tuning of the attributes (especially the distance threshold attributes) can avoid these discontinuities. However, since the behavior of each model depends on several other parameters (frequency, node heigth, etc), there is no default value of these thresholds that can avoid the discontinuities in all possible configurations. Hence, an appropriate tuning of these parameters is left to the user. +We also note that the use of different propagation models (OH, I1411, I1238 with their variants) in HybridBuildingsPropagationLossModel can result in discontinuities of the pathloss with respect to distance. A proper tuning of the attributes (especially the distance threshold attributes) can avoid these discontinuities. However, since the behavior of each model depends on several other parameters (frequency, node height, etc), there is no default value of these thresholds that can avoid the discontinuities in all possible configurations. Hence, an appropriate tuning of these parameters is left to the user. OhBuildingsPropagationLossModel diff --git a/src/buildings/doc/source/buildings-user.rst b/src/buildings/doc/source/buildings-user.rst index 017fae9f7..dc9c7a27c 100644 --- a/src/buildings/doc/source/buildings-user.rst +++ b/src/buildings/doc/source/buildings-user.rst @@ -71,7 +71,7 @@ Setup nodes and mobility models Nodes and mobility models are configured as usual, however in order to use them with the buildings model you need an additional call to ``BuildingsHelper::Install()``, so as to let the mobility model include -the informtion on their position w.r.t. the buildings. Here is an example:: +the information on their position w.r.t. the buildings. Here is an example:: MobilityHelper mobility; mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel"); @@ -125,12 +125,12 @@ The following position allocator classes are available to place node in special positions with respect to buildings: - ``RandomBuildingPositionAllocator``: Allocate each position by - randomly chosing a building from the list of all buildings, and - then randomly chosing a position inside the building. + randomly choosing a building from the list of all buildings, and + then randomly choosing a position inside the building. - ``RandomRoomPositionAllocator``: Allocate each position by randomly - chosing a room from the list of rooms in all buildings, and then - randomly chosing a position inside the room. + choosing a room from the list of rooms in all buildings, and then + randomly choosing a position inside the room. - ``SameRoomPositionAllocator``: Walks a given NodeContainer sequentially, and for each node allocate a new position randomly in @@ -180,7 +180,7 @@ The ``Building`` class has the following configurable parameters: * number of floors. * number of rooms in x-axis and y-axis (rooms can be placed only in a grid way). -The ``BuildingMobilityLossModel`` parameter configurable with the ns3 attribute system is represented by the bound (string ``Bounds``) of the simulation area by providing a ``Box`` class with the area bounds. Moreover, by means of its methos the following parameters can be configured: +The ``BuildingMobilityLossModel`` parameter configurable with the ns3 attribute system is represented by the bound (string ``Bounds``) of the simulation area by providing a ``Box`` class with the area bounds. Moreover, by means of its methods the following parameters can be configured: * the number of floor the node is placed (default 0). * the position in the rooms grid. diff --git a/src/buildings/helper/building-allocator.cc b/src/buildings/helper/building-allocator.cc index dd8abb6eb..e167d9a8a 100644 --- a/src/buildings/helper/building-allocator.cc +++ b/src/buildings/helper/building-allocator.cc @@ -52,7 +52,7 @@ GridBuildingAllocator::GetTypeId (void) .SetParent () .AddConstructor () .SetGroupName ("Buildings") - .AddAttribute ("GridWidth", "The number of objects layed out on a line.", + .AddAttribute ("GridWidth", "The number of objects laid out on a line.", UintegerValue (10), MakeUintegerAccessor (&GridBuildingAllocator::m_n), MakeUintegerChecker ()) diff --git a/src/buildings/helper/building-position-allocator.h b/src/buildings/helper/building-position-allocator.h index 184a1040a..3f3c3d159 100644 --- a/src/buildings/helper/building-position-allocator.h +++ b/src/buildings/helper/building-position-allocator.h @@ -33,8 +33,8 @@ class UniformRandomVariable; /** - * Allocate each position by randomly chosing a building from the list - * of all buildings, and then randomly chosing a position inside the building. + * Allocate each position by randomly choosing a building from the list + * of all buildings, and then randomly choosing a position inside the building. * */ class RandomBuildingPositionAllocator : public PositionAllocator @@ -127,8 +127,8 @@ private: }; /** - * Allocate each position by randomly chosing a room from the list - * of all buildings, and then randomly chosing a position inside the room. + * Allocate each position by randomly choosing a room from the list + * of all buildings, and then randomly choosing a position inside the room. * The selection of the room is always done without replacement. * */ diff --git a/src/buildings/model/building-list.cc b/src/buildings/model/building-list.cc index 8e4897977..0b47292c6 100644 --- a/src/buildings/model/building-list.cc +++ b/src/buildings/model/building-list.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Author: Jaume Nin - * Based on BuildingList implemenation by Mathieu Lacage + * Based on BuildingList implementation by Mathieu Lacage * */ #include "building-list.h" diff --git a/src/buildings/model/mobility-building-info.h b/src/buildings/model/mobility-building-info.h index 1f48dd87b..e89c9101e 100644 --- a/src/buildings/model/mobility-building-info.h +++ b/src/buildings/model/mobility-building-info.h @@ -40,7 +40,7 @@ namespace ns3 { * \ingroup buildings * \brief mobility buildings information (to be used by mobility models) * - * This model implements the managment of scenarios where users might be + * This model implements the management of scenarios where users might be * either indoor (e.g., houses, offices, etc.) and outdoor. * */ diff --git a/src/core/model/cairo-wideint-private.h b/src/core/model/cairo-wideint-private.h index d3df4e98d..37ccbbf1e 100644 --- a/src/core/model/cairo-wideint-private.h +++ b/src/core/model/cairo-wideint-private.h @@ -185,7 +185,7 @@ typedef int64_t cairo_int64_t; #endif /* - * 64-bit comparisions derived from lt or eq + * 64-bit comparisons derived from lt or eq */ #define _cairo_uint64_le(a,b) (!_cairo_uint64_gt (a,b)) #define _cairo_uint64_ne(a,b) (!_cairo_uint64_eq (a,b)) diff --git a/src/core/model/command-line.cc b/src/core/model/command-line.cc index 7cc8de493..f04cbe490 100644 --- a/src/core/model/command-line.cc +++ b/src/core/model/command-line.cc @@ -257,7 +257,7 @@ CommandLine::PrintHelp (std::ostream &os) const { width = std::max (width, it->m_name.size ()); } - width += 3; // room for ": " betwen option and help + width += 3; // room for ": " between option and help if (!m_options.empty ()) { diff --git a/src/core/model/command-line.h b/src/core/model/command-line.h index cc895fbf7..6b55088be 100644 --- a/src/core/model/command-line.h +++ b/src/core/model/command-line.h @@ -103,7 +103,7 @@ namespace ns3 { * Because arguments can be repeated it can be hard to decipher what * value each variable ended up with, especially when using boolean toggles. * Suggested best practice is for scripts to report the values of all items - * settable throught CommandLine, as done by the example below. + * settable through CommandLine, as done by the example below. * * * CommandLine can set the initial value of every attribute in the system @@ -291,7 +291,7 @@ public: /** * Get extra non-option arguments by index. * This allows CommandLine to accept more non-option arguments than - * have been configured explictly with AddNonOption(). + * have been configured explicitly with AddNonOption(). * * This is only valid after calling Parse(). * diff --git a/src/core/model/config.cc b/src/core/model/config.cc index 9796e649b..25ee39cf1 100644 --- a/src/core/model/config.cc +++ b/src/core/model/config.cc @@ -293,7 +293,7 @@ private: * Parse the next element in the Config path. * * \param [in] path The remaining portion of the Config path. - * \param [in] root The object corresponding to the current positon + * \param [in] root The object corresponding to the current position * in the Config path. */ void DoResolve (std::string path, Ptr root); diff --git a/src/core/model/fatal-impl.cc b/src/core/model/fatal-impl.cc index de64cf6a2..cb95ccd21 100644 --- a/src/core/model/fatal-impl.cc +++ b/src/core/model/fatal-impl.cc @@ -122,7 +122,7 @@ UnregisterStream (std::ostream* stream) /** * \ingroup fatalimpl - * Unnamed namespace for fatal streams signal hander. + * Unnamed namespace for fatal streams signal handler. * * This is private to the fatal implementation. */ diff --git a/src/core/model/hash-function.h b/src/core/model/hash-function.h index 07efe8d98..4970e887e 100644 --- a/src/core/model/hash-function.h +++ b/src/core/model/hash-function.h @@ -145,7 +145,7 @@ private: /** * \ingroup hash * - * \brief Template for creating a Hash::Implemetation from + * \brief Template for creating a Hash::Implementation from * a 64-bit hash function. */ class Hash64 : public Implementation diff --git a/src/core/model/heap-scheduler.cc b/src/core/model/heap-scheduler.cc index 59a6c94a0..7597f6d6e 100644 --- a/src/core/model/heap-scheduler.cc +++ b/src/core/model/heap-scheduler.cc @@ -51,7 +51,7 @@ HeapScheduler::GetTypeId (void) HeapScheduler::HeapScheduler () { NS_LOG_FUNCTION (this); - // we purposedly waste an item at the start of + // we purposely waste an item at the start of // the array to make sure the indexes in the // array start at one. Scheduler::Event empty = { 0,{ 0,0}}; diff --git a/src/core/model/log-macros-enabled.h b/src/core/model/log-macros-enabled.h index a6fe0b50d..d8dbe7a83 100644 --- a/src/core/model/log-macros-enabled.h +++ b/src/core/model/log-macros-enabled.h @@ -231,7 +231,7 @@ /** * \ingroup logging * - * Output the requested message unconditionaly. + * Output the requested message unconditionally. * * \param [in] msg The message to log */ diff --git a/src/core/model/log.cc b/src/core/model/log.cc index 7a8e46780..5793ae000 100644 --- a/src/core/model/log.cc +++ b/src/core/model/log.cc @@ -339,7 +339,7 @@ LogComponent::GetLevelLabel(const enum LogLevel level) } else if (level == LOG_WARN) { - // whitespace left at the end for aligment + // whitespace left at the end for alignment return "WARN "; } else if (level == LOG_DEBUG) @@ -348,7 +348,7 @@ LogComponent::GetLevelLabel(const enum LogLevel level) } else if (level == LOG_INFO) { - // whitespace left at the end for aligment + // whitespace left at the end for alignment return "INFO "; } else if (level == LOG_FUNCTION) diff --git a/src/core/model/nstime.h b/src/core/model/nstime.h index 7f26732db..2abe0b67a 100644 --- a/src/core/model/nstime.h +++ b/src/core/model/nstime.h @@ -64,7 +64,7 @@ class TimeWithUnit; * * This class defines all the classic C++ addition/subtraction * operators: +, -, +=, -=; and all the classic comparison operators: - * ==, !=, <, >, <=, >=. It is thus easy to add, substract, or + * ==, !=, <, >, <=, >=. It is thus easy to add, subtract, or * compare Time objects. * * For example: diff --git a/src/core/model/object-base.h b/src/core/model/object-base.h index 1bd8c74f8..fd84e6f53 100644 --- a/src/core/model/object-base.h +++ b/src/core/model/object-base.h @@ -187,7 +187,7 @@ public: /** * Get the value of an attribute without raising erros. * - * If the atttribute could not be read this will return \c false, + * If the attribute could not be read this will return \c false, * but not raise any errors. * * \param [in] name The name of the attribute to read. diff --git a/src/core/model/object.h b/src/core/model/object.h index 70fbe559b..6f6a4cbe3 100644 --- a/src/core/model/object.h +++ b/src/core/model/object.h @@ -230,7 +230,7 @@ protected: * * This method is invoked whenever two sets of Objects are aggregated * together. It is invoked exactly once for each Object in both sets. - * This method can be overriden by subclasses who wish to be notified + * This method can be overridden by subclasses who wish to be notified * of aggregation events. These subclasses must chain up to their * base class NotifyNewAggregate() method. * @@ -257,7 +257,7 @@ protected: * destructor, whichever comes first. * * Subclasses are expected to implement their real destruction - * code in an overriden version of this method and chain + * code in an overridden version of this method and chain * up to their parent's implementation once they are done. * _i.e_, for simplicity, the destructor of every subclass should * be empty and its content should be moved to the associated diff --git a/src/core/model/rng-seed-manager.h b/src/core/model/rng-seed-manager.h index 5b9473fb8..7b64d5f84 100644 --- a/src/core/model/rng-seed-manager.h +++ b/src/core/model/rng-seed-manager.h @@ -47,7 +47,7 @@ public: * * \code * RngSeedManger::SetSeed(15); - * UniformVariable x(2,3); // These will give the same output everytime + * UniformVariable x(2,3); // These will give the same output every time * ExponentialVariable y(120); // as long as the seed stays the same. * \endcode * \param [in] seed The seed value to use. diff --git a/src/core/model/simulator.h b/src/core/model/simulator.h index 61f52065e..6d6a3b975 100644 --- a/src/core/model/simulator.h +++ b/src/core/model/simulator.h @@ -106,7 +106,7 @@ public: * @param [in] schedulerFactory The configured ObjectFactory. * * The event scheduler can be set at any time: the events scheduled - * in the previous scheduler will be transfered to the new scheduler + * in the previous scheduler will be transferred to the new scheduler * before we start to use it. */ static void SetScheduler (ObjectFactory schedulerFactory); diff --git a/src/core/model/test.cc b/src/core/model/test.cc index 24314e8ca..bf8c4be58 100644 --- a/src/core/model/test.cc +++ b/src/core/model/test.cc @@ -81,7 +81,7 @@ struct TestCaseFailure * \param [in] _actual The actual value returned by the test. * \param [in] _limit The expected value. * \param [in] _message The associated message. - * \param [in] _file The soure file. + * \param [in] _file The source file. * \param [in] _line The source line. */ TestCaseFailure (std::string _cond, std::string _actual, @@ -91,7 +91,7 @@ struct TestCaseFailure std::string actual; /**< The actual value returned by the test. */ std::string limit; /**< The expected value. */ std::string message; /**< The associated message. */ - std::string file; /**< The soure file. */ + std::string file; /**< The source file. */ int32_t line; /**< The source line. */ }; /** @@ -229,7 +229,7 @@ private: /** * Generate the list of tests matching the constraints. * - * Test name and type contraints are or'ed. The duration constraint + * Test name and type constraints are or'ed. The duration constraint * is and'ed. * * \param [in] testName Include a specific test by name. diff --git a/src/core/model/test.h b/src/core/model/test.h index ec438a16a..2b50e5091 100644 --- a/src/core/model/test.h +++ b/src/core/model/test.h @@ -1356,7 +1356,7 @@ public: }; /** - * \brief Constuct a new test suite. + * \brief Construct a new test suite. * * \param [in] name The name of the test suite. * \param [in] type The TestType of the test suite (defaults to UNIT test). @@ -1410,7 +1410,7 @@ public: */ TestVectors (); /** - * Virtual desctructor + * Virtual destructor */ virtual ~TestVectors (); diff --git a/src/core/model/traced-value.h b/src/core/model/traced-value.h index 152b7f3c2..d20fce2e0 100644 --- a/src/core/model/traced-value.h +++ b/src/core/model/traced-value.h @@ -144,7 +144,7 @@ public: return *this; } /** - * Copy from a TracedValue of a compatable type. + * Copy from a TracedValue of a compatible type. * \tparam U \deduced The underlying type of the other TracedValue. * \param [in] other The other TracedValuet to copy. */ diff --git a/src/core/model/type-id.cc b/src/core/model/type-id.cc index f1edde1d6..fa1ab0870 100644 --- a/src/core/model/type-id.cc +++ b/src/core/model/type-id.cc @@ -175,7 +175,7 @@ public: /** * Get a type id by index. * - * The type id value 0 indicates not registerd, so there is an offset + * The type id value 0 indicates not registered, so there is an offset * of 1 between the index and the type id value. This function converts * from an index to the type id value. * \param [in] i The index. diff --git a/src/core/model/type-id.h b/src/core/model/type-id.h index b411b4730..f29db23c3 100644 --- a/src/core/model/type-id.h +++ b/src/core/model/type-id.h @@ -266,7 +266,7 @@ public: /** * Get the constructor callback. * - * \returns A callback which can be used to instanciate an object + * \returns A callback which can be used to instantiate an object * of this type. */ Callback GetConstructor (void) const; @@ -388,7 +388,7 @@ public: * * \param [in] i The attribute to manipulate * \param [in] initialValue The new initial value to use for this attribute. - * \returns \c true if the call was successfuly. + * \returns \c true if the call was successfully. */ bool SetAttributeInitialValue (std::size_t i, Ptr initialValue); diff --git a/src/core/model/valgrind.h b/src/core/model/valgrind.h index ab95c6fa0..e35e1d230 100644 --- a/src/core/model/valgrind.h +++ b/src/core/model/valgrind.h @@ -1568,7 +1568,7 @@ typedef /* NB 9 Sept 07. There is a nasty kludge here in all these CALL_FN_ macros. In order not to trash the stack redzone, we need to drop %rsp by 128 before the hidden call, and restore afterwards. The - nastyness is that it is only by luck that the stack still appears + nastiness is that it is only by luck that the stack still appears to be unwindable during the hidden call - since then the behaviour of any routine using this macro does not match what the CFI data says. Sigh. @@ -5332,7 +5332,7 @@ VALGRIND_PRINTF_BACKTRACE(const char *format, ...) /* These requests allow control to move from the simulated CPU to the - real CPU, calling an arbitary function. + real CPU, calling an arbitrary function. Note that the current ThreadId is inserted as the first argument. So this call: diff --git a/src/core/test/attribute-test-suite.cc b/src/core/test/attribute-test-suite.cc index 12482229a..e180635da 100644 --- a/src/core/test/attribute-test-suite.cc +++ b/src/core/test/attribute-test-suite.cc @@ -1093,7 +1093,7 @@ IntegerTraceSourceTestCase::DoRun (void) NS_TEST_ASSERT_MSG_NE (p, 0, "Unable to CreateObject"); // - // Check to make sure changing an Attibute value triggers a trace callback + // Check to make sure changing an Attribute value triggers a trace callback // that sets a member variable. // m_got1 = 1234; @@ -1273,7 +1273,7 @@ PointerAttributeTestCase::DoRun (void) // p->GetAttribute ("Pointer", ptr); Ptr stored = ptr.Get (); - NS_TEST_ASSERT_MSG_EQ (stored, derived, "Retreived Attribute does not match stored PointerValue"); + NS_TEST_ASSERT_MSG_EQ (stored, derived, "Retrieved Attribute does not match stored PointerValue"); // // We should be able to use the Attribute Get() just like GetObject, @@ -1283,7 +1283,7 @@ PointerAttributeTestCase::DoRun (void) // p->GetAttribute ("Pointer", ptr); Ptr storedBase = ptr.Get (); - NS_TEST_ASSERT_MSG_EQ (storedBase, stored, "Retreived Ptr does not match stored Ptr"); + NS_TEST_ASSERT_MSG_EQ (storedBase, stored, "Retrieved Ptr does not match stored Ptr"); // // If we try to Get() something that is unrelated to what we stored, we should @@ -1291,7 +1291,7 @@ PointerAttributeTestCase::DoRun (void) // p->GetAttribute ("Pointer", ptr); Ptr x = ptr.Get (); - NS_TEST_ASSERT_MSG_EQ (x, 0, "Unexpectedly retreived unrelated Ptr from stored Ptr"); + NS_TEST_ASSERT_MSG_EQ (x, 0, "Unexpectedly retrieved unrelated Ptr from stored Ptr"); // // Test whether the initialized pointers from two different objects @@ -1371,7 +1371,7 @@ CallbackValueTestCase::DoRun (void) // // The member variable m_cbValue is declared as a Callback. The - // Attibute named "Callback" also points to m_cbValue and allows us to set the + // Attribute named "Callback" also points to m_cbValue and allows us to set the // callback using that Attribute. // // NotifyCallbackValue is going to be the target of the callback and will just set diff --git a/src/core/test/command-line-test-suite.cc b/src/core/test/command-line-test-suite.cc index 6f75dd439..eca0338ac 100644 --- a/src/core/test/command-line-test-suite.cc +++ b/src/core/test/command-line-test-suite.cc @@ -64,7 +64,7 @@ public: virtual ~CommandLineTestCaseBase () {} /** - * Excercise the CommandLine with the provided arguments + * Exercise the CommandLine with the provided arguments * * \param cmd the configured CommandLine * \param n the number of arguments diff --git a/src/core/test/int64x64-test-suite.cc b/src/core/test/int64x64-test-suite.cc index d2a78eab0..f9e6ce255 100644 --- a/src/core/test/int64x64-test-suite.cc +++ b/src/core/test/int64x64-test-suite.cc @@ -42,7 +42,7 @@ namespace ns3 { * of the double and long double implementations. * * To handle this, where needed we define a tolerance to use in the - * test comparisions. If you need to increase the tolerance, + * test comparisons. If you need to increase the tolerance, * please append the system and compiler version. For example: * * \code diff --git a/src/core/test/names-test-suite.cc b/src/core/test/names-test-suite.cc index 889c4e72d..133299dfb 100644 --- a/src/core/test/names-test-suite.cc +++ b/src/core/test/names-test-suite.cc @@ -38,7 +38,7 @@ namespace ns3 { /** * \ingroup names-tests - * Simple test object to excercise the Name service. + * Simple test object to exercise the Name service. */ class TestObject : public Object { @@ -225,7 +225,7 @@ StringContextAddTestCase::DoRun (void) /** * \ingroup names-tests * Test the Object Name Service can correctly use a - * fully qualified path to add assocations. + * fully qualified path to add associations. * * Add (std::string name, Ptr object); * @@ -292,7 +292,7 @@ FullyQualifiedAddTestCase::DoRun (void) /** * \ingroup names-tests * Test the Object Name Service can correctly use a - * relative path to add assocations. + * relative path to add associations. * * This functionality is provided as a convenience so clients * don't always have to provide the name service namespace name diff --git a/src/core/test/random-variable-stream-test-suite.cc b/src/core/test/random-variable-stream-test-suite.cc index 072018ffc..096735d85 100644 --- a/src/core/test/random-variable-stream-test-suite.cc +++ b/src/core/test/random-variable-stream-test-suite.cc @@ -1693,7 +1693,7 @@ RandomVariableStreamLogNormalTestCase::DoRun (void) /// \todo This test fails sometimes if the required tolerance is less /// than 3%, which may be because there is a bug in the /// implementation or that the mean of this distribution is more - /// senstive to its parameters than the others are. + /// sensitive to its parameters than the others are. double TOLERANCE = expectedMean * 3e-2; NS_TEST_ASSERT_MSG_EQ_TOL (valueMean, expectedMean, TOLERANCE, "Wrong mean value."); } @@ -1836,7 +1836,7 @@ RandomVariableStreamLogNormalAntitheticTestCase::DoRun (void) /// \todo This test fails sometimes if the required tolerance is less /// than 3%, which may be because there is a bug in the /// implementation or that the mean of this distribution is more - /// senstive to its parameters than the others are. + /// sensitive to its parameters than the others are. double TOLERANCE = expectedMean * 3e-2; NS_TEST_ASSERT_MSG_EQ_TOL (valueMean, expectedMean, TOLERANCE, "Wrong mean value."); } diff --git a/src/core/test/simulator-test-suite.cc b/src/core/test/simulator-test-suite.cc index 39c81c4e5..ce4cbed4c 100644 --- a/src/core/test/simulator-test-suite.cc +++ b/src/core/test/simulator-test-suite.cc @@ -250,7 +250,7 @@ static void cber5 (const int &, const int &, const int &, const int &, const int {} SimulatorTemplateTestCase::SimulatorTemplateTestCase () - : TestCase ("Check that all templates are instanciated correctly. This is a compilation test, it cannot fail at runtime.") + : TestCase ("Check that all templates are instantiated correctly. This is a compilation test, it cannot fail at runtime.") { } void diff --git a/src/csma/model/csma-net-device.cc b/src/csma/model/csma-net-device.cc index a3950a4c9..acece49df 100644 --- a/src/csma/model/csma-net-device.cc +++ b/src/csma/model/csma-net-device.cc @@ -131,7 +131,7 @@ CsmaNetDevice::GetTypeId (void) MakeTraceSourceAccessor (&CsmaNetDevice::m_macTxBackoffTrace), "ns3::Packet::TracedCallback") // - // Trace souces at the "bottom" of the net device, where packets transition + // Trace sources at the "bottom" of the net device, where packets transition // to/from the channel. // .AddTraceSource ("PhyTxBegin", diff --git a/src/csma/model/csma-net-device.h b/src/csma/model/csma-net-device.h index 578441c0b..f612eeeb8 100644 --- a/src/csma/model/csma-net-device.h +++ b/src/csma/model/csma-net-device.h @@ -269,7 +269,7 @@ public: * \param packet packet to send * \param dest layer 2 destination address * \param protocolNumber protocol number - * \return true if successfull, false otherwise (drop, ...) + * \return true if successful, false otherwise (drop, ...) */ virtual bool Send (Ptr packet, const Address& dest, uint16_t protocolNumber); @@ -280,7 +280,7 @@ public: * \param source layer 2 source address * \param dest layer 2 destination address * \param protocolNumber protocol number - * \return true if successfull, false otherwise (drop, ...) + * \return true if successful, false otherwise (drop, ...) */ virtual bool SendFrom (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber); diff --git a/src/lte/doc/source/figures/ca-downlink-bsr.seqdiag b/src/lte/doc/source/figures/ca-downlink-bsr.seqdiag index 4a97b5220..88ea336e4 100644 --- a/src/lte/doc/source/figures/ca-downlink-bsr.seqdiag +++ b/src/lte/doc/source/figures/ca-downlink-bsr.seqdiag @@ -8,7 +8,7 @@ diagram { LteEnbComponentCarrierManager -> LteEnbMac1 [label="ReportBufferStatus ((100-x)%)"]; LteEnbComponentCarrierManager <- LteEnbMac0 [label="NotifyTxOpportunity ()"]; LteEnbComponentCarrierManager <- LteEnbMac1 [label="NotifyTxOpportunity ()"]; - LteEnbComponentCarrierManager -> "LteRlc at eNb" [label="NotifyTx Oportunity (Mac0)"]; + LteEnbComponentCarrierManager -> "LteRlc at eNb" [label="NotifyTx Opportunity (Mac0)"]; LteEnbComponentCarrierManager -> "LteRlc at eNb" [label="NotifyTxOpportunity (Mac1)"]; "LteRlc at eNb" -> LteEnbComponentCarrierManager [label="TransmitPdu ()"]; "LteRlc at eNb" -> LteEnbComponentCarrierManager [label="TransmitPdu ()"]; diff --git a/src/lte/doc/source/lte-design.rst b/src/lte/doc/source/lte-design.rst index 455483e87..7287514a4 100644 --- a/src/lte/doc/source/lte-design.rst +++ b/src/lte/doc/source/lte-design.rst @@ -66,7 +66,7 @@ have been considered: approach, which evaluates resource allocation only at the granularity of call/bearer establishment. #. The simulator should scale up to tens of eNBs and hundreds of User - Equipments (UEs). This + Equipment (UEs). This rules out the use of a link level simulator, i.e., a simulator whose radio interface is modeled with a granularity up to the symbol level. This is because to have a symbol level model it is necessary to implement all the PHY @@ -466,7 +466,7 @@ Overview The physical layer model provided in this LTE simulator is based on the one described in [Piro2011]_, with the following modifications. The model now includes the -inter cell intereference calculation and the simulation of uplink traffic, including both packet transmission and CQI generation. +inter cell interference calculation and the simulation of uplink traffic, including both packet transmission and CQI generation. Subframe Structure @@ -520,7 +520,7 @@ In uplink, two types of CQIs are implemented: - SRS based, periodically sent by the UEs. - PUSCH based, calculated from the actual transmitted data. -The scheduler interface include an attribute system calld ``UlCqiFilter`` for managing the filtering of the CQIs according to their nature, in detail: +The scheduler interface include an attribute system called ``UlCqiFilter`` for managing the filtering of the CQIs according to their nature, in detail: - ``SRS_UL_CQI`` for storing only SRS based CQIs. - ``PUSCH_UL_CQI`` for storing only PUSCH based CQIs. @@ -588,7 +588,7 @@ The specific LSM method adopted is the one based on the usage of a mutual inform MIESM computational procedure diagram -The mutual information (MI) is dependent on the constellation mapping and can be calculated per transport block (TB) basis, by evaluating the MI over the symbols and the subcarrier. However, this would be too complex for a network simulator. Hence, in our implementation a flat channel response within the RB has been considered; therefore the overall MI of a TB is calculated averaging the MI evaluated per each RB used in the TB. In detail, the implemented scheme is depicted in Figure :ref:`fig-miesm-architecture`, where we see that the model starts by evaluating the MI value for each RB, represented in the figure by the SINR samples. Then the equivalent MI is evaluated per TB basis by averaging the MI values. Finally, a further step has to be done since the link level simulator returns the performance of the link in terms of block error rate (BLER) in a addive white guassian noise (AWGN) channel, where the blocks are the code blocks (CBs) independently encoded/decoded by the turbo encoder. On this matter the +The mutual information (MI) is dependent on the constellation mapping and can be calculated per transport block (TB) basis, by evaluating the MI over the symbols and the subcarrier. However, this would be too complex for a network simulator. Hence, in our implementation a flat channel response within the RB has been considered; therefore the overall MI of a TB is calculated averaging the MI evaluated per each RB used in the TB. In detail, the implemented scheme is depicted in Figure :ref:`fig-miesm-architecture`, where we see that the model starts by evaluating the MI value for each RB, represented in the figure by the SINR samples. Then the equivalent MI is evaluated per TB basis by averaging the MI values. Finally, a further step has to be done since the link level simulator returns the performance of the link in terms of block error rate (BLER) in a addive white gaussian noise (AWGN) channel, where the blocks are the code blocks (CBs) independently encoded/decoded by the turbo encoder. On this matter the standard 3GPP segmentation scheme has been used for estimating the actual CB size (described in section 5.1.2 of [TS36212]_). This scheme divides the TB in :math:`N_{K_-}` blocks of size :math:`K_-` and :math:`N_{K+}` blocks of size :math:`K_+`. Therefore the overall TB BLER (TBLER) can be expressed as .. math:: @@ -611,7 +611,7 @@ BLER Curves On this respect, we reused part of the curves obtained within [PaduaPEM]_. In detail, we introduced the CB size dependency to the CB BLER curves with the support of the developers of [PaduaPEM]_ and of the LTE Vienna Simulator. In fact, the module released provides the link layer performance only for what concerns the MCSs (i.e, with a given fixed ECR). In detail the new error rate curves for each has been evaluated with a simulation campaign with the link layer simulator for a single link with AWGN noise and for CB size of 104, 140, 256, 512, 1024, 2048, 4032 and 6144. These curves has been mapped with the Gaussian cumulative model formula presented above for obtaining the correspondents :math:`b_{ECR}` and :math:`c_{ECR}` parameters. -The BLER perfomance of all MCS obtained with the link level simulator are plotted in the following figures (blue lines) together with their correspondent mapping to the Gaussian cumulative distribution (red dashed lines). +The BLER performance of all MCS obtained with the link level simulator are plotted in the following figures (blue lines) together with their correspondent mapping to the Gaussian cumulative distribution (red dashed lines). .. _fig-mcs-1-4-ber: @@ -814,7 +814,7 @@ The PHY Error Model model (i.e., the ``LteMiErrorModel`` class already presented M_{I eff} = \frac{\sum\limits_{i=1}^q C_i M_i}{\sum\limits_{i=1}^q C_i} -where :math:`X` is the number of original information bits, :math:`C_i` are number of coded bits, :math:`M_i` are the mutual informations per HARQ block received on the total number of :math:`q` retransmissions. Therefore, in order to be able to return the error probability with the error model implemented in the simulator evaluates the :math:`R_{eff}` and the :math:`MI_{I eff}` and return the value of error probability of the ECR of the same modulation with closest lower rate respect to the :math:`R_{eff}`. In order to consider the effect of HARQ retransmissions a new sets of curves have been integrated respect to the standard one used for the original MCS. The new curves are intended for covering the cases when the most conservative MCS of a modulation is used which implies the generation of :math:`R_{eff}` lower respect to the one of standard MCSs. On this matter the curves for 1, 2 and 3 retransmissions have been evaluated for 10 and 17. For MCS 0 we considered only the first retransmission since the +where :math:`X` is the number of original information bits, :math:`C_i` are number of coded bits, :math:`M_i` are the mutual information per HARQ block received on the total number of :math:`q` retransmissions. Therefore, in order to be able to return the error probability with the error model implemented in the simulator evaluates the :math:`R_{eff}` and the :math:`MI_{I eff}` and return the value of error probability of the ECR of the same modulation with closest lower rate respect to the :math:`R_{eff}`. In order to consider the effect of HARQ retransmissions a new sets of curves have been integrated respect to the standard one used for the original MCS. The new curves are intended for covering the cases when the most conservative MCS of a modulation is used which implies the generation of :math:`R_{eff}` lower respect to the one of standard MCSs. On this matter the curves for 1, 2 and 3 retransmissions have been evaluated for 10 and 17. For MCS 0 we considered only the first retransmission since the produced code rate is already very conservative (i.e., 0.04) and returns an error rate enough robust for the reception (i.e., the downturn of the BLER is centered around -18 dB). It is to be noted that, the size of first TB transmission has been assumed as containing all the information bits to be coded; therefore :math:`X` is equal to the size of the first TB sent of a an HARQ process. The model assumes that the eventual presence of parity bits in the codewords is already considered in the link level curves. This implies that as soon as the minimum :math:`R_{eff}` is reached the model is not including the gain due to the transmission of further parity bits. @@ -1026,11 +1026,11 @@ For what concern the HARQ, RR implements the non adaptive version, which implies Config::SetDefault ("ns3::RrFfMacScheduler::HarqEnabled", BooleanValue (false)); -The scheduler implements the filtering of the uplink CQIs according to their nature with ``UlCqiFilter`` attibute, in detail: +The scheduler implements the filtering of the uplink CQIs according to their nature with ``UlCqiFilter`` attribute, in detail: - ``SRS_UL_CQI``: only SRS based CQI are stored in the internal attributes. - ``PUSCH_UL_CQI``: only PUSCH based CQI are stored in the internal attributes. - - ``ALL_UL_CQI``: all CQIs are stored in the same internal attibute (i.e., the last CQI received is stored independently from its nature). + - ``ALL_UL_CQI``: all CQIs are stored in the same internal attribute (i.e., the last CQI received is stored independently from its nature). @@ -1283,7 +1283,7 @@ quality UE tend towards the TBR. Config::SetDefault ("ns3::PfFfMacScheduler::HarqEnabled", BooleanValue (false)); -The scheduler implements the filtering of the uplink CQIs according to their nature with ``UlCqiFilter`` attibute, in detail: +The scheduler implements the filtering of the uplink CQIs according to their nature with ``UlCqiFilter`` attribute, in detail: - ``SRS_UL_CQI``: only SRS based CQI are stored in the internal attributes. - ``PUSCH_UL_CQI``: only PUSCH based CQI are stored in the internal attributes. @@ -2288,7 +2288,7 @@ following simplifying assumptions: - carrier aggregation is now supported in the LTE module - Event A6 is not implemented; - - speed dependant scaling of time-to-trigger (Section 5.5.6.2 of [TS36331]_) is + - speed dependent scaling of time-to-trigger (Section 5.5.6.2 of [TS36331]_) is not supported. Overall design @@ -3139,7 +3139,7 @@ assigned the base IPv4 address of the EPC network; hence, static routing rules will cause the incoming packet from the internet to be routed through this VirtualNetDevice. In case of IPv6 address as destination, a manual route towards the VirtualNetDevice is inserted in the routing table, -containg the 48 bit IPv6 prefix from which all the IPv6 addresses of the UEs +containing the 48 bit IPv6 prefix from which all the IPv6 addresses of the UEs and PGW are configured. Such device starts the GTP/UDP/IP tunneling procedure, by forwarding the packet to a dedicated application in the SGW/PGW node which is called EpcSgwPgwApplication. This application does the following operations: @@ -3356,7 +3356,7 @@ and it provides services to: * to send/receive RRC messages. The X2 entity sends the RRC message as a transparent container in the X2 message. This RRC message is sent to the UE. -Figure :ref:`fig-x2-entity-saps` shows the implentation model of the X2 entity and its relationship with all the other entities and services in the protocol stack. +Figure :ref:`fig-x2-entity-saps` shows the implementation model of the X2 entity and its relationship with all the other entities and services in the protocol stack. .. _fig-x2-entity-saps: @@ -4314,7 +4314,7 @@ pointers to MAC, PHY, scheduler, fractional frequency reuse instances. ``LteEnbNetDevice`` can contain pointers to several ``ComponentCarrierEnb`` instances. This architecture allows that each CC may have its own configuration for PHY, MAC, scheduling algorithm and franctional frequency reuse algorithm. These attributes are -currently mantained also in the ``LteEnbNetDevice`` for backward compatibility purpose. +currently maintained also in the ``LteEnbNetDevice`` for backward compatibility purpose. By default the ``LteEnbNetDevice`` attributes are the same as the primary carrier attributes. diff --git a/src/lte/doc/source/lte-profiling.rst b/src/lte/doc/source/lte-profiling.rst index 2df8f14db..b21850dd2 100644 --- a/src/lte/doc/source/lte-profiling.rst +++ b/src/lte/doc/source/lte-profiling.rst @@ -19,7 +19,7 @@ Framework description Simulation scripts ~~~~~~~~~~~~~~~~~~ -The simulation script used for all the E-UTRAN results showed in this documentation is located at ``src/lte/examples/lena-profiling.cc``. It uses the complete PHY and MAC UE/eNodeB implementation with a simplified RLC implementation on top. This script generates a squared grid topology, placing a eNodeB at the centre of each square. UEs attached to this node are scattered randomly across the square (using a random uniform distribution along X and Y axis). If *BuildingPropagationModel* is used, the squares are replaced by rooms. To generate the UL and DL traffic, the RLC implementation always report data to be transfered. +The simulation script used for all the E-UTRAN results showed in this documentation is located at ``src/lte/examples/lena-profiling.cc``. It uses the complete PHY and MAC UE/eNodeB implementation with a simplified RLC implementation on top. This script generates a squared grid topology, placing a eNodeB at the centre of each square. UEs attached to this node are scattered randomly across the square (using a random uniform distribution along X and Y axis). If *BuildingPropagationModel* is used, the squares are replaced by rooms. To generate the UL and DL traffic, the RLC implementation always report data to be transferred. .. _fig-eutranProfilingScenario: @@ -119,7 +119,7 @@ The figure shows the expected behaviour, since it increases linearly respect the Propagation model ----------------- -The objective of this scenario is to evaluate the impact of the propagation model complexity in the overall run time figures. Therefore, the same scenario is simulated twice: once using the more simple Friis model, once with the more complex Building model. The rest of the parameters (e.g. number of eNodeB and of UE attached per eNodeB) were mantained. The timing results for both models are compared in the following figure. +The objective of this scenario is to evaluate the impact of the propagation model complexity in the overall run time figures. Therefore, the same scenario is simulated twice: once using the more simple Friis model, once with the more complex Building model. The rest of the parameters (e.g. number of eNodeB and of UE attached per eNodeB) were maintained. The timing results for both models are compared in the following figure. .. _fig-propagationModel: diff --git a/src/lte/doc/source/lte-testing.rst b/src/lte/doc/source/lte-testing.rst index b361b74cc..6018ed62b 100644 --- a/src/lte/doc/source/lte-testing.rst +++ b/src/lte/doc/source/lte-testing.rst @@ -415,7 +415,7 @@ Handover configuration ###################### The purpose of the handover configuration is to verify whether UE measurement -configuration is updated properly after a succesful handover takes place. For +configuration is updated properly after a successful handover takes place. For this purpose, the simulation will construct 2 eNodeBs with different UE measurement configuration, and the UE will perform handover from one cell to another. The UE will be located on a straight line between the 2 eNodeBs, and @@ -932,7 +932,7 @@ might be produced in quantizing the MI and the error curve. HARQ Model ---------- -The test suite ``lte-harq`` includes two tests for evaluating the HARQ model and the related extension in the error model. The test consists on checking whether the amount of bytes received during the simulation corresponds to the expected ones according to the values of transport block and the HARQ dynamics. In detail, the test checks whether the throughput obtained after one HARQ retransmission is the expeted one. For evaluating the expected throughput the expected TB delivering time has been evaluated according to the following formula: +The test suite ``lte-harq`` includes two tests for evaluating the HARQ model and the related extension in the error model. The test consists on checking whether the amount of bytes received during the simulation corresponds to the expected ones according to the values of transport block and the HARQ dynamics. In detail, the test checks whether the throughput obtained after one HARQ retransmission is the expected one. For evaluating the expected throughput the expected TB delivering time has been evaluated according to the following formula: .. math:: @@ -1015,7 +1015,7 @@ knowledge of the input test vector and knowledge of the expected behavior. These test vector are specialized for UM RLC and AM RLC due to their different behavior. Each test case passes if the sequence of primitives triggered by the RLC instance being tested is -exacly equal to the output test vector. In particular, for each PDU +exactly equal to the output test vector. In particular, for each PDU transmitted by the RLC instance, both the size and the content of the PDU are verified to check for an exact match with the test vector. @@ -1473,8 +1473,8 @@ Power Control in three different ways: to ``RsPowerChunkProcessor`` list in UE DownlinkSpectrumPhy. Tx power of data channel is measured in similar way, but it had to be implemented. Now ``LteTestSinrChunkProcessor`` is added to ``DataPowerChunkProcessor`` list in UE - DownlinkSpectrumPhy. Test vector contain a set of all avaiable P_A values. Test - pass if power diffrence equals P_A value. + DownlinkSpectrumPhy. Test vector contain a set of all available P_A values. Test + pass if power difference equals P_A value. * LteDownlinkPowerControlRrcConnectionReconfiguration test case check if RrcConnectionReconfiguration is performed correctly. When FR entity gets UE diff --git a/src/lte/doc/source/lte-user.rst b/src/lte/doc/source/lte-user.rst index e251ec2f8..d8d5635f0 100644 --- a/src/lte/doc/source/lte-user.rst +++ b/src/lte/doc/source/lte-user.rst @@ -452,7 +452,7 @@ It has to be noted that the ns-3 LTE module is able to work with any fading trac Fading Traces Usage ******************* -When using a fading trace, it is of paramount importance to specify correctly the trace parameters in the simulation, so that the fading model can load and use it correcly. +When using a fading trace, it is of paramount importance to specify correctly the trace parameters in the simulation, so that the fading model can load and use it correctly. The parameters to be configured are: * ``TraceFilename`` : the name of the trace to be loaded (absolute path, or relative path w.r.t. the path from where the simulation program is executed); @@ -1940,7 +1940,7 @@ compare the effect of each built-in handover algorithm of the LTE module. The campaign will use the ``lena-dual-stripe`` example program. First, we have to modify the example program to produce the output that we need. In this -occassion, we want to produce the number of handovers, user average throughput, +occasion, we want to produce the number of handovers, user average throughput, and average SINR. The number of handovers can be obtained by counting the number of times the diff --git a/src/lte/examples/lena-distributed-ffr.cc b/src/lte/examples/lena-distributed-ffr.cc index 2602a6f62..4093b1f9b 100644 --- a/src/lte/examples/lena-distributed-ffr.cc +++ b/src/lte/examples/lena-distributed-ffr.cc @@ -236,7 +236,7 @@ int main (int argc, char *argv[]) enbDevs = lteHelper->InstallEnbDevice (enbNodes); randomUeDevs = lteHelper->InstallUeDevice (randomUeNodes); - // Add X2 inteface + // Add X2 interface lteHelper->AddX2Interface (enbNodes); diff --git a/src/lte/examples/lena-dual-stripe.cc b/src/lte/examples/lena-dual-stripe.cc index 5fcb5ccbf..9eb456ce3 100644 --- a/src/lte/examples/lena-dual-stripe.cc +++ b/src/lte/examples/lena-dual-stripe.cc @@ -119,7 +119,7 @@ FemtocellBlockAllocator::Create () uint32_t attempt = 0; do { - NS_ASSERT_MSG (attempt < 100, "Too many failed attemtps to position apartment block. Too many blocks? Too small area?"); + NS_ASSERT_MSG (attempt < 100, "Too many failed attempts to position apartment block. Too many blocks? Too small area?"); box.xMin = m_xMinVar->GetValue (); box.xMax = box.xMin + m_xSize; box.yMin = m_yMinVar->GetValue (); @@ -364,11 +364,11 @@ static ns3::GlobalValue g_srsPeriodicity ("srsPeriodicity", ns3::UintegerValue (80), ns3::MakeUintegerChecker ()); static ns3::GlobalValue g_outdoorUeMinSpeed ("outdoorUeMinSpeed", - "Minimum speed value of macor UE with random waypoint model [m/s].", + "Minimum speed value of macro UE with random waypoint model [m/s].", ns3::DoubleValue (0.0), ns3::MakeDoubleChecker ()); static ns3::GlobalValue g_outdoorUeMaxSpeed ("outdoorUeMaxSpeed", - "Maximum speed value of macor UE with random waypoint model [m/s].", + "Maximum speed value of macro UE with random waypoint model [m/s].", ns3::DoubleValue (0.0), ns3::MakeDoubleChecker ()); diff --git a/src/lte/examples/lena-fading.cc b/src/lte/examples/lena-fading.cc index 3c256bc99..31ad4830d 100644 --- a/src/lte/examples/lena-fading.cc +++ b/src/lte/examples/lena-fading.cc @@ -68,7 +68,7 @@ int main (int argc, char *argv[]) lteHelper->SetFadingModelAttribute ("TraceFilename", StringValue ("src/lte/model/fading-traces/fading_trace_EPA_3kmph.fad")); } - // these parameters have to setted only in case of the trace format + // these parameters have to set only in case of the trace format // differs from the standard one, that is // - 10 seconds length trace // - 10,000 samples diff --git a/src/lte/examples/lena-x2-handover-measures.cc b/src/lte/examples/lena-x2-handover-measures.cc index 5fbdd8b6e..c77453a20 100644 --- a/src/lte/examples/lena-x2-handover-measures.cc +++ b/src/lte/examples/lena-x2-handover-measures.cc @@ -159,7 +159,7 @@ main (int argc, char *argv[]) CommandLine cmd; cmd.AddValue ("simTime", "Total duration of the simulation (in seconds)", simTime); cmd.AddValue ("speed", "Speed of the UE (default = 20 m/s)", speed); - cmd.AddValue ("enbTxPowerDbm", "TX power [dBm] used by HeNBs (defalut = 46.0)", enbTxPowerDbm); + cmd.AddValue ("enbTxPowerDbm", "TX power [dBm] used by HeNBs (default = 46.0)", enbTxPowerDbm); cmd.Parse (argc, argv); @@ -326,7 +326,7 @@ main (int argc, char *argv[]) } - // Add X2 inteface + // Add X2 interface lteHelper->AddX2Interface (enbNodes); // X2-based Handover diff --git a/src/lte/examples/lena-x2-handover.cc b/src/lte/examples/lena-x2-handover.cc index 85b4ad64f..806f4745e 100644 --- a/src/lte/examples/lena-x2-handover.cc +++ b/src/lte/examples/lena-x2-handover.cc @@ -289,7 +289,7 @@ main (int argc, char *argv[]) } - // Add X2 inteface + // Add X2 interface lteHelper->AddX2Interface (enbNodes); // X2-based Handover diff --git a/src/lte/helper/emu-epc-helper.cc b/src/lte/helper/emu-epc-helper.cc index 8fb4866c9..6e5fded64 100644 --- a/src/lte/helper/emu-epc-helper.cc +++ b/src/lte/helper/emu-epc-helper.cc @@ -136,7 +136,7 @@ EmuEpcHelper::DoInitialize () int retval = sgwPgwS1uSocket->Bind (InetSocketAddress (Ipv4Address::GetAny (), m_gtpuUdpPort)); NS_ASSERT (retval == 0); - // create TUN device containg IPv4 address and implementing tunneling of user data over GTP-U/UDP/IP + // create TUN device containing IPv4 address and implementing tunneling of user data over GTP-U/UDP/IP m_tunDevice = CreateObject (); // allow jumbo packets diff --git a/src/lte/helper/epc-helper.h b/src/lte/helper/epc-helper.h index 57022b294..fd03b47de 100644 --- a/src/lte/helper/epc-helper.h +++ b/src/lte/helper/epc-helper.h @@ -74,7 +74,7 @@ public: /** * Add an eNB to the EPC * - * \param enbNode the previosuly created eNB node which is to be + * \param enbNode the previously created eNB node which is to be * added to the EPC * \param lteEnbNetDevice the LteEnbNetDevice of the eNB node * \param cellId ID of the eNB @@ -82,7 +82,7 @@ public: virtual void AddEnb (Ptr enbNode, Ptr lteEnbNetDevice, uint16_t cellId) = 0; /** - * Notify the EPC of the existance of a new UE which might attach at a later time + * Notify the EPC of the existence of a new UE which might attach at a later time * * \param ueLteDevice the UE device to be attached * \param imsi the unique identifier of the UE diff --git a/src/lte/helper/lte-hex-grid-enb-topology-helper.h b/src/lte/helper/lte-hex-grid-enb-topology-helper.h index 4c20a37f3..1655bdb3c 100644 --- a/src/lte/helper/lte-hex-grid-enb-topology-helper.h +++ b/src/lte/helper/lte-hex-grid-enb-topology-helper.h @@ -29,7 +29,7 @@ namespace ns3 { * \ingroup lte * * This helper class allows to easily create a topology with eNBs - * grouped in three-sector sites layed out on an hexagonal grid. The + * grouped in three-sector sites laid out on an hexagonal grid. The * layout is done row-wise. * */ diff --git a/src/lte/helper/phy-tx-stats-calculator.h b/src/lte/helper/phy-tx-stats-calculator.h index d5db232f6..aa4bcdde1 100644 --- a/src/lte/helper/phy-tx-stats-calculator.h +++ b/src/lte/helper/phy-tx-stats-calculator.h @@ -94,13 +94,13 @@ public: std::string GetDlTxOutputFilename (void); /** - * Notifies the stats calculator that an downlink trasmission has occurred. + * Notifies the stats calculator that an downlink transmission has occurred. * @param params Trace information regarding PHY transmission stats */ void DlPhyTransmission (PhyTransmissionStatParameters params); /** - * Notifies the stats calculator that an uplink trasmission has occurred. + * Notifies the stats calculator that an uplink transmission has occurred. * @param params Trace information regarding PHY transmission stats */ void UlPhyTransmission (PhyTransmissionStatParameters params); diff --git a/src/lte/model/component-carrier-enb.h b/src/lte/model/component-carrier-enb.h index b2f0ba4e9..ec381268c 100644 --- a/src/lte/model/component-carrier-enb.h +++ b/src/lte/model/component-carrier-enb.h @@ -61,7 +61,7 @@ public: /** * Get cell identifier - * \return cell identifer + * \return cell identifier */ uint16_t GetCellId (); @@ -120,7 +120,7 @@ protected: private: - uint16_t m_cellId; ///< Cell identifer + uint16_t m_cellId; ///< Cell identifier Ptr m_phy; ///< the Phy instance of this eNodeB component carrier Ptr m_mac; ///< the MAC instance of this eNodeB component carrier Ptr m_scheduler; ///< the scheduler instance of this eNodeB component carrier diff --git a/src/lte/model/cqa-ff-mac-scheduler.cc b/src/lte/model/cqa-ff-mac-scheduler.cc index 306406f59..7f6f14eac 100644 --- a/src/lte/model/cqa-ff-mac-scheduler.cc +++ b/src/lte/model/cqa-ff-mac-scheduler.cc @@ -1621,7 +1621,7 @@ CqaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche (*itHarqTimer).second.at (newDci.m_harqProcess) = 0; } - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version ret.m_buildDataList.push_back (newEl); // update UE stats diff --git a/src/lte/model/cqa-ff-mac-scheduler.h b/src/lte/model/cqa-ff-mac-scheduler.h index dfa5cc86d..6c538124b 100644 --- a/src/lte/model/cqa-ff-mac-scheduler.h +++ b/src/lte/model/cqa-ff-mac-scheduler.h @@ -384,7 +384,7 @@ private: std::map m_dlHarqCurrentProcessId; ///< DL HARQ process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_dlHarqProcessesStatus; ///< DL HARQ process statuses std::map m_dlHarqProcessesTimer; ///< DL HARQ process timers std::map m_dlHarqProcessesDciBuffer; ///< DL HARQ process DCI buffer @@ -394,7 +394,7 @@ private: std::map m_ulHarqCurrentProcessId; ///< UL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_ulHarqProcessesStatus; ///< UL HARQ process status std::map m_ulHarqProcessesDciBuffer; ///< UL HARQ process DCI buffer diff --git a/src/lte/model/epc-x2-sap.h b/src/lte/model/epc-x2-sap.h index 329fd32eb..1d7c2cfb6 100644 --- a/src/lte/model/epc-x2-sap.h +++ b/src/lte/model/epc-x2-sap.h @@ -482,7 +482,7 @@ public: // /** - * Send handover request functon + * Send handover request function * \param params the hadnover request parameters */ virtual void SendHandoverRequest (HandoverRequestParams params); diff --git a/src/lte/model/fdbet-ff-mac-scheduler.cc b/src/lte/model/fdbet-ff-mac-scheduler.cc index 519a0c237..59660e19f 100644 --- a/src/lte/model/fdbet-ff-mac-scheduler.cc +++ b/src/lte/model/fdbet-ff-mac-scheduler.cc @@ -957,7 +957,7 @@ FdBetFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sc (*itMap).second.push_back (i); } - // caculate expected throughput for current UE + // calculate expected throughput for current UE std::map ::iterator itCqi; itCqi = m_p10CqiRxed.find ((*itMax).first); std::map ::iterator itTxMode; @@ -1149,7 +1149,7 @@ FdBetFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sc (*itHarqTimer).second.at (newDci.m_harqProcess) = 0; } - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version ret.m_buildDataList.push_back (newEl); // update UE stats diff --git a/src/lte/model/fdbet-ff-mac-scheduler.h b/src/lte/model/fdbet-ff-mac-scheduler.h index 80311240d..eed2868b1 100644 --- a/src/lte/model/fdbet-ff-mac-scheduler.h +++ b/src/lte/model/fdbet-ff-mac-scheduler.h @@ -373,7 +373,7 @@ private: std::map m_dlHarqCurrentProcessId; ///< DL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_dlHarqProcessesStatus; ///< DL HARQ process status std::map m_dlHarqProcessesTimer; ///< DL HARQ process timer std::map m_dlHarqProcessesDciBuffer; ///< DL HARQ process DCI buffer @@ -383,7 +383,7 @@ private: std::map m_ulHarqCurrentProcessId; ///< UL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_ulHarqProcessesStatus; ///< UL HARQ process status std::map m_ulHarqProcessesDciBuffer; ///< UL HARQ process DCI Buffer diff --git a/src/lte/model/fdmt-ff-mac-scheduler.cc b/src/lte/model/fdmt-ff-mac-scheduler.cc index 9bb703708..104e71841 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.cc +++ b/src/lte/model/fdmt-ff-mac-scheduler.cc @@ -1125,7 +1125,7 @@ FdMtFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sch (*itHarqTimer).second.at (newDci.m_harqProcess) = 0; } - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version ret.m_buildDataList.push_back (newEl); diff --git a/src/lte/model/fdmt-ff-mac-scheduler.h b/src/lte/model/fdmt-ff-mac-scheduler.h index 97f7864a4..07ba87eff 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.h +++ b/src/lte/model/fdmt-ff-mac-scheduler.h @@ -201,7 +201,7 @@ private: void DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params); /** - * Sched UL SR infor request function + * Sched UL SR info request function * \param params the Sched UL SR info request parameters */ void DoSchedUlSrInfoReq (const struct FfMacSchedSapProvider::SchedUlSrInfoReqParameters& params); @@ -366,7 +366,7 @@ private: std::map m_dlHarqCurrentProcessId; ///< DL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_dlHarqProcessesStatus; ///< DL HARQ process status std::map m_dlHarqProcessesTimer; ///< DL HARDQ process timer std::map m_dlHarqProcessesDciBuffer; ///< DL HARQ process DCI buffer @@ -376,7 +376,7 @@ private: std::map m_ulHarqCurrentProcessId; ///< UL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_ulHarqProcessesStatus; ///< UL HARQ process status std::map m_ulHarqProcessesDciBuffer; ///< UL HARQ process DCI buffer diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc index 6ea979c7a..5c77465b9 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc @@ -1086,7 +1086,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S } budget = budget + (*itMax).second.tokenPoolSize; - // calcualte how much bytes this UE actally need + // calculate how much bytes this UE actally need if (budget == 0) { // there are no tokens for this UE @@ -1463,7 +1463,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S (*itHarqTimer).second.at (newDci.m_harqProcess) = 0; } - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version ret.m_buildDataList.push_back (newEl); diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.h b/src/lte/model/fdtbfq-ff-mac-scheduler.h index b57fe3736..e0c75269d 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.h +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.h @@ -415,7 +415,7 @@ private: std::map m_dlHarqCurrentProcessId; ///< DL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_dlHarqProcessesStatus; ///< DL HARQ process status std::map m_dlHarqProcessesTimer; ///< DL HARQ process timer std::map m_dlHarqProcessesDciBuffer; ///< DL HARQ process DCI buffer @@ -425,7 +425,7 @@ private: std::map m_ulHarqCurrentProcessId; ///< UL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_ulHarqProcessesStatus; ///< UL HARQ process status std::map m_ulHarqProcessesDciBuffer; ///< UL HARQ process DCI buffer diff --git a/src/lte/model/ff-mac-sched-sap.h b/src/lte/model/ff-mac-sched-sap.h index acb7d5e4e..64c486474 100644 --- a/src/lte/model/ff-mac-sched-sap.h +++ b/src/lte/model/ff-mac-sched-sap.h @@ -298,7 +298,7 @@ public: uint8_t m_nrOfPdcchOfdmSymbols; ///< number of PDCCH OFDM symbols - std::vector m_vendorSpecificList; ///< vendor specfic list + std::vector m_vendorSpecificList; ///< vendor specific list }; /** diff --git a/src/lte/model/lte-asn1-header.cc b/src/lte/model/lte-asn1-header.cc index eb8cd108d..095512525 100644 --- a/src/lte/model/lte-asn1-header.cc +++ b/src/lte/model/lte-asn1-header.cc @@ -326,7 +326,7 @@ void Asn1Header::SerializeInteger (int n, int nmin, int nmax) const // Clause 11.5.3 ITU-T X.691 int range = nmax - nmin + 1; - // Substract nmin to n + // Subtract nmin to n n -= nmin; // Clause 11.5.4 ITU-T X.691 diff --git a/src/lte/model/lte-ccm-rrc-sap.h b/src/lte/model/lte-ccm-rrc-sap.h index 5307e6176..0f74ec773 100644 --- a/src/lte/model/lte-ccm-rrc-sap.h +++ b/src/lte/model/lte-ccm-rrc-sap.h @@ -55,7 +55,7 @@ public: virtual ~LteCcmRrcSapProvider (); - /// LcsConfig sructure + /// LcsConfig structure struct LcsConfig { uint16_t componentCarrierId; ///< component carrier ID @@ -130,7 +130,7 @@ public: virtual std::vector ReleaseDataRadioBearer (uint16_t rnti, uint8_t lcid) = 0; /** - * \brief Add the Signal Bearer for a specif Ue in LteEnbComponenCarrierManager + * \brief Add the Signal Bearer for a specific Ue in LteEnbComponenCarrierManager * \param lcInfo this structure it is hard-coded in the LteEnbRrc * \param rlcMacSapUser it is the MacSapUser of the Rlc istance * \return the LteMacSapUser of the ComponentCarrierManager diff --git a/src/lte/model/lte-control-messages.h b/src/lte/model/lte-control-messages.h index 2a2ac394b..a83d11804 100644 --- a/src/lte/model/lte-control-messages.h +++ b/src/lte/model/lte-control-messages.h @@ -102,7 +102,7 @@ public: void SetDci (DlDciListElement_s dci); /** - * \brief Get dic informations + * \brief Get dic information * \return dci messages */ DlDciListElement_s GetDci (void); @@ -132,7 +132,7 @@ public: void SetDci (UlDciListElement_s dci); /** - * \brief Get dic informations + * \brief Get dic information * \return dci messages */ UlDciListElement_s GetDci (void); @@ -162,7 +162,7 @@ public: void SetDlCqi (CqiListElement_s dlcqi); /** - * \brief Get DL cqi informations + * \brief Get DL cqi information * \return dlcqi messages */ CqiListElement_s GetDlCqi (void); @@ -192,7 +192,7 @@ public: void SetBsr (MacCeListElement_s bsr); /** - * \brief Get BSR informations + * \brief Get BSR information * \return BSR message */ MacCeListElement_s GetBsr (void); @@ -223,7 +223,7 @@ public: void SetDlHarqFeedback (DlInfoListElement_s m); /** - * \brief Get DL HARQ informations + * \brief Get DL HARQ information * \return DL HARQ message */ DlInfoListElement_s GetDlHarqFeedback (void); diff --git a/src/lte/model/lte-enb-mac.cc b/src/lte/model/lte-enb-mac.cc index 35c0dc2f3..d29446fe0 100644 --- a/src/lte/model/lte-enb-mac.cc +++ b/src/lte/model/lte-enb-mac.cc @@ -808,7 +808,7 @@ LteEnbMac::DoAddUe (uint16_t rnti) m_cschedSapProvider->CschedUeConfigReq (params); - // Create DL trasmission HARQ buffers + // Create DL transmission HARQ buffers std::vector < Ptr > dlHarqLayer0pkt; dlHarqLayer0pkt.resize (8); for (uint8_t i = 0; i < 8; i++) diff --git a/src/lte/model/lte-enb-net-device.h b/src/lte/model/lte-enb-net-device.h index a90e624a7..2038d61ce 100644 --- a/src/lte/model/lte-enb-net-device.h +++ b/src/lte/model/lte-enb-net-device.h @@ -242,7 +242,7 @@ private: Ptr m_ffrAlgorithm; /**< DEPRECATED - It is maintained for backward compatibility after adding CA feature*/ - uint16_t m_cellId; /**< Cell Identifer. Part of the CGI, see TS 29.274, section 8.21.1 */ + uint16_t m_cellId; /**< Cell Identifier. Part of the CGI, see TS 29.274, section 8.21.1 */ uint8_t m_dlBandwidth; /** > ulCqiMap); /** - * Get CQI from spectral efficency + * Get CQI from spectral efficiency * - * \param s spectral efficency + * \param s spectral efficiency * \returns CQI */ int GetCqiFromSpectralEfficiency (double s); diff --git a/src/lte/model/lte-interference.h b/src/lte/model/lte-interference.h index fd2cdd96d..a093e4cc1 100644 --- a/src/lte/model/lte-interference.h +++ b/src/lte/model/lte-interference.h @@ -102,7 +102,7 @@ public: /** * notify that a new signal is being perceived in the medium. This * method is to be called for all incoming signal, regardless of - * wether they're useful signals or interferers. + * whether they're useful signals or interferers. * * @param spd the power spectral density of the new signal * @param duration the duration of the new signal diff --git a/src/lte/model/lte-phy.h b/src/lte/model/lte-phy.h index 31b69f2a6..910fb99d1 100644 --- a/src/lte/model/lte-phy.h +++ b/src/lte/model/lte-phy.h @@ -141,7 +141,7 @@ public: /** - * \returns the RB gruop size according to the bandwidth + * \returns the RB group size according to the bandwidth */ uint8_t GetRbgSize (void) const; @@ -272,7 +272,7 @@ protected: * Specified by the upper layer through CPHY SAP. */ uint8_t m_dlBandwidth; - /// The RB gruop size according to the bandwidth. + /// The RB group size according to the bandwidth. uint8_t m_rbgSize; /** * The downlink carrier frequency. diff --git a/src/lte/model/lte-radio-bearer-tag.cc b/src/lte/model/lte-radio-bearer-tag.cc index 6e1ce50a8..6824416a4 100644 --- a/src/lte/model/lte-radio-bearer-tag.cc +++ b/src/lte/model/lte-radio-bearer-tag.cc @@ -38,7 +38,7 @@ LteRadioBearerTag::GetTypeId (void) UintegerValue (0), MakeUintegerAccessor (&LteRadioBearerTag::GetRnti), MakeUintegerChecker ()) - .AddAttribute ("lcid", "The id whithin the UE identifying the logical channel to which the packet belongs", + .AddAttribute ("lcid", "The id within the UE identifying the logical channel to which the packet belongs", UintegerValue (0), MakeUintegerAccessor (&LteRadioBearerTag::GetLcid), MakeUintegerChecker ()) diff --git a/src/lte/model/lte-rlc-am-header.cc b/src/lte/model/lte-rlc-am-header.cc index baa0839f3..69defee69 100644 --- a/src/lte/model/lte-rlc-am-header.cc +++ b/src/lte/model/lte-rlc-am-header.cc @@ -454,7 +454,7 @@ void LteRlcAmHeader::Serialize (Buffer::Iterator start) const { // The variable oddNack has the current NACK value to write, also // either the setup to enter this loop or the previous loop would - // have written the highest order bit to the previouse octet. + // have written the highest order bit to the previous octet. // Write the next set of bits (2 - 9) into the next octet i.WriteU8( ((oddNack >> 1) & 0xFF) ); diff --git a/src/lte/model/lte-rrc-header.h b/src/lte/model/lte-rrc-header.h index 9f25bc0fe..0cb323459 100644 --- a/src/lte/model/lte-rrc-header.h +++ b/src/lte/model/lte-rrc-header.h @@ -69,7 +69,7 @@ protected: /** * Convert from bandwidth (in RBs) to ENUMERATED value * - * \param bandwidth Bandwith in RBs: 6, 15, 25, 50, 75, 100 + * \param bandwidth Bandwidth in RBs: 6, 15, 25, 50, 75, 100 * \returns ENUMERATED value: 0, 1, 2, 3, 4, 5 */ int BandwidthToEnum (uint8_t bandwidth) const; @@ -77,7 +77,7 @@ protected: * Convert from ENUMERATED value to bandwidth (in RBs) * * \param n ENUMERATED value: 0, 1, 2, 3, 4, 5 - * \returns bandwidth Bandwith in RBs: 6, 15, 25, 50, 75, 100 + * \returns bandwidth Bandwidth in RBs: 6, 15, 25, 50, 75, 100 */ uint8_t EnumToBandwidth (int n) const; diff --git a/src/lte/model/lte-rrc-protocol-real.cc b/src/lte/model/lte-rrc-protocol-real.cc index 79dee41f5..7685a7758 100644 --- a/src/lte/model/lte-rrc-protocol-real.cc +++ b/src/lte/model/lte-rrc-protocol-real.cc @@ -289,7 +289,7 @@ LteUeRrcProtocolReal::DoReceivePdcpPdu (Ptr p) LteRrcSap::RrcConnectionSetup rrcConnectionSetupMsg; LteRrcSap::RrcConnectionReject rrcConnectionRejectMsg; - // Deserialize packet and call member recv function with appropiate structure + // Deserialize packet and call member recv function with appropriate structure switch ( rrcDlCcchMessage.GetMessageType () ) { case 0: @@ -334,7 +334,7 @@ LteUeRrcProtocolReal::DoReceivePdcpSdu (LtePdcpSapUser::ReceivePdcpSduParameters LteRrcSap::RrcConnectionReconfiguration rrcConnectionReconfigurationMsg; LteRrcSap::RrcConnectionRelease rrcConnectionReleaseMsg; - // Deserialize packet and call member recv function with appropiate structure + // Deserialize packet and call member recv function with appropriate structure switch ( rrcDlDcchMessage.GetMessageType () ) { case 4: @@ -653,7 +653,7 @@ LteEnbRrcProtocolReal::DoReceivePdcpPdu (uint16_t rnti, Ptr p) RrcConnectionReestablishmentRequestHeader rrcConnectionReestablishmentRequestHeader; RrcConnectionRequestHeader rrcConnectionRequestHeader; - // Deserialize packet and call member recv function with appropiate structure + // Deserialize packet and call member recv function with appropriate structure switch ( rrcUlCcchMessage.GetMessageType () ) { case 0: @@ -690,7 +690,7 @@ LteEnbRrcProtocolReal::DoReceivePdcpSdu (LtePdcpSapUser::ReceivePdcpSduParameter LteRrcSap::RrcConnectionReestablishmentComplete rrcConnectionReestablishmentCompleteMsg; LteRrcSap::RrcConnectionSetupCompleted rrcConnectionSetupCompletedMsg; - // Deserialize packet and call member recv function with appropiate structure + // Deserialize packet and call member recv function with appropriate structure switch ( rrcUlDcchMessage.GetMessageType () ) { case 1: diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc index 068f02305..1287fcec9 100644 --- a/src/lte/model/lte-spectrum-phy.cc +++ b/src/lte/model/lte-spectrum-phy.cc @@ -221,7 +221,7 @@ LteSpectrumPhy::GetTypeId (void) MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyTxStartTrace), "ns3::PacketBurst::TracedCallback") .AddTraceSource ("TxEnd", - "Trace fired when a previosuly started transmission is finished", + "Trace fired when a previously started transmission is finished", MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyTxEndTrace), "ns3::PacketBurst::TracedCallback") .AddTraceSource ("RxStart", @@ -229,11 +229,11 @@ LteSpectrumPhy::GetTypeId (void) MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxStartTrace), "ns3::PacketBurst::TracedCallback") .AddTraceSource ("RxEndOk", - "Trace fired when a previosuly started RX terminates successfully", + "Trace fired when a previously started RX terminates successfully", MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxEndOkTrace), "ns3::Packet::TracedCallback") .AddTraceSource ("RxEndError", - "Trace fired when a previosuly started RX terminates with an error", + "Trace fired when a previously started RX terminates with an error", MakeTraceSourceAccessor (&LteSpectrumPhy::m_phyRxEndErrorTrace), "ns3::Packet::TracedCallback") .AddAttribute ("DataErrorModelEnabled", @@ -455,7 +455,7 @@ LteSpectrumPhy::StartTxDataFrame (Ptr pb, std::list pb, std::list > ctrlMsgLi case RX_DATA: case RX_DL_CTRL: case RX_UL_SRS: - NS_FATAL_ERROR ("cannot TX while RX: according to FDD channel acces, the physical layer for transmission cannot be used for reception"); + NS_FATAL_ERROR ("cannot TX while RX: according to FDD channel access, the physical layer for transmission cannot be used for reception"); break; case TX_DATA: @@ -524,7 +524,7 @@ LteSpectrumPhy::StartTxDlCtrlFrame (std::list > ctrlMsgLi case IDLE: { /* - m_txPsd must be setted by the device, according to + m_txPsd must be set by the device, according to (i) the available subchannel for transmission (ii) the power transmission */ @@ -570,7 +570,7 @@ LteSpectrumPhy::StartTxUlSrsFrame () case RX_DATA: case RX_DL_CTRL: case RX_UL_SRS: - NS_FATAL_ERROR ("cannot TX while RX: according to FDD channel acces, the physical layer for transmission cannot be used for reception"); + NS_FATAL_ERROR ("cannot TX while RX: according to FDD channel access, the physical layer for transmission cannot be used for reception"); break; case TX_DL_CTRL: @@ -582,7 +582,7 @@ LteSpectrumPhy::StartTxUlSrsFrame () case IDLE: { /* - m_txPsd must be setted by the device, according to + m_txPsd must be set by the device, according to (i) the available subchannel for transmission (ii) the power transmission */ diff --git a/src/lte/model/lte-spectrum-phy.h b/src/lte/model/lte-spectrum-phy.h index 8513d026e..363981571 100644 --- a/src/lte/model/lte-spectrum-phy.h +++ b/src/lte/model/lte-spectrum-phy.h @@ -44,7 +44,7 @@ namespace ns3 { -/// TbId_t sturcture +/// TbId_t structure struct TbId_t { uint16_t m_rnti; ///< RNTI diff --git a/src/lte/model/lte-ue-ccm-rrc-sap.h b/src/lte/model/lte-ue-ccm-rrc-sap.h index bdd6dd456..d956100ce 100644 --- a/src/lte/model/lte-ue-ccm-rrc-sap.h +++ b/src/lte/model/lte-ue-ccm-rrc-sap.h @@ -85,7 +85,7 @@ public: /** - * \brief Add the Signal Bearer for a specif Ue in LteUeComponenCarrierManager + * \brief Add the Signal Bearer for a specific Ue in LteUeComponenCarrierManager * \param lcid the Logical Channel Id * \param lcConfig this structure it is hard-coded in the LteEnbRrc * \param msu it is the MacSapUser of the Rlc istance diff --git a/src/lte/model/lte-ue-component-carrier-manager.h b/src/lte/model/lte-ue-component-carrier-manager.h index b5cca931b..71a195b52 100644 --- a/src/lte/model/lte-ue-component-carrier-manager.h +++ b/src/lte/model/lte-ue-component-carrier-manager.h @@ -89,7 +89,7 @@ public: /** * \brief Sets number of component carriers that are supported by this UE. - * \param noOfComponentCarriers numbr of compoent carriers + * \param noOfComponentCarriers numbr of component carriers */ void SetNumberOfComponentCarriers (uint8_t noOfComponentCarriers); diff --git a/src/lte/model/lte-ue-mac.cc b/src/lte/model/lte-ue-mac.cc index 2c37e8c0a..618688c6b 100644 --- a/src/lte/model/lte-ue-mac.cc +++ b/src/lte/model/lte-ue-mac.cc @@ -609,7 +609,7 @@ LteUeMac::DoReceiveLteControlMessage (Ptr msg) UlDciListElement_s dci = msg2->GetDci (); if (dci.m_ndi == 1) { - // New transmission -> emtpy pkt buffer queue (for deleting eventual pkts not acked ) + // New transmission -> empty pkt buffer queue (for deleting eventual pkts not acked ) Ptr pb = CreateObject (); m_miUlHarqProcessesPacket.at (m_harqProcessId) = pb; // Retrieve data from RLC diff --git a/src/lte/model/lte-ue-mac.h b/src/lte/model/lte-ue-mac.h index 408617cbb..ef4100cf8 100644 --- a/src/lte/model/lte-ue-mac.h +++ b/src/lte/model/lte-ue-mac.h @@ -189,7 +189,7 @@ private: /** * Send RA preamble function * - * \param contention if true randomly select and send te RA preamble + * \param contention if true randomly select and send the RA preamble */ void SendRaPreamble (bool contention); /// Start waiting for RA response function @@ -203,7 +203,7 @@ private: /** * RA response timeout function * - * \param contention if true randomly select and send te RA preamble + * \param contention if true randomly select and send the RA preamble */ void RaResponseTimeout (bool contention); /// Send report buffer status @@ -242,7 +242,7 @@ private: bool m_freshUlBsr; ///< true when a BSR has been received in the last TTI uint8_t m_harqProcessId; ///< HARQ process ID - std::vector < Ptr > m_miUlHarqProcessesPacket; ///< Packets under trasmission of the UL HARQ processes + std::vector < Ptr > m_miUlHarqProcessesPacket; ///< Packets under transmission of the UL HARQ processes std::vector < uint8_t > m_miUlHarqProcessesPacketTimer; ///< timer for packet life in the buffer uint16_t m_rnti; ///< RNTI diff --git a/src/lte/model/lte-ue-net-device.h b/src/lte/model/lte-ue-net-device.h index a0f072df2..eb6dfc4aa 100644 --- a/src/lte/model/lte-ue-net-device.h +++ b/src/lte/model/lte-ue-net-device.h @@ -143,13 +143,13 @@ public: void SetCsgId (uint32_t csgId); /** - * \brief Set the targer eNB where the UE is registered + * \brief Set the target eNB where the UE is registered * \param enb */ void SetTargetEnb (Ptr enb); /** - * \brief Get the targer eNB where the UE is registered + * \brief Get the target eNB where the UE is registered * \return the pointer to the enb */ Ptr GetTargetEnb (void); diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc index fdfbc82b8..01abf0a79 100644 --- a/src/lte/model/lte-ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -976,7 +976,7 @@ LteUePhy::ReceiveLteControlMessageList (std::list > msgLi else { NS_LOG_INFO ("received RAR RNTI " << m_raRnti); - // set the uplink bandwidht according to the UL grant + // set the uplink bandwidth according to the UL grant std::vector ulRb; for (int i = 0; i < it->rarPayload.m_grant.m_rbLen; i++) { diff --git a/src/lte/model/lte-ue-phy.h b/src/lte/model/lte-ue-phy.h index 36fe46098..c11ad6cd0 100644 --- a/src/lte/model/lte-ue-phy.h +++ b/src/lte/model/lte-ue-phy.h @@ -446,7 +446,7 @@ private: // UE PHY SAP methods virtual void DoSendMacPdu (Ptr p); /** - * Send LTE conrol message function + * Send LTE control message function * \param msg the LTE control message */ virtual void DoSendLteControlMessage (Ptr msg); diff --git a/src/lte/model/lte-ue-power-control.cc b/src/lte/model/lte-ue-power-control.cc index a240042ae..8b12cae8a 100644 --- a/src/lte/model/lte-ue-power-control.cc +++ b/src/lte/model/lte-ue-power-control.cc @@ -85,7 +85,7 @@ LteUePowerControl::GetTypeId (void) MakeBooleanAccessor (&LteUePowerControl::m_accumulationEnabled), MakeBooleanChecker ()) .AddAttribute ("Alpha", - "Value of Alpha paramter", + "Value of Alpha parameter", DoubleValue (1.0), MakeDoubleAccessor (&LteUePowerControl::SetAlpha), MakeDoubleChecker ()) diff --git a/src/lte/model/lte-ue-rrc.cc b/src/lte/model/lte-ue-rrc.cc index e7be353e5..cc45a0e3f 100644 --- a/src/lte/model/lte-ue-rrc.cc +++ b/src/lte/model/lte-ue-rrc.cc @@ -494,9 +494,9 @@ LteUeRrc::InitializeSap (void) { if (m_numberOfComponentCarriers < MIN_NO_CC || m_numberOfComponentCarriers > MAX_NO_CC) { - // this check is neede in order to maintain backward compatibility with scripts and tests + // this check is needed in order to maintain backward compatibility with scripts and tests // if case lte-helper is not used (like in several tests) the m_numberOfComponentCarriers - // is not set and then an error is rised + // is not set and then an error is raised // In this case m_numberOfComponentCarriers is set to 1 m_numberOfComponentCarriers = MIN_NO_CC; } diff --git a/src/lte/model/lte-ue-rrc.h b/src/lte/model/lte-ue-rrc.h index ae01ae7f3..bc7eb4e94 100644 --- a/src/lte/model/lte-ue-rrc.h +++ b/src/lte/model/lte-ue-rrc.h @@ -679,12 +679,12 @@ private: void SendMeasurementReport (uint8_t measId); /** - * Apply radio resoure config dedicated. + * Apply radio resource config dedicated. * \param rrcd LteRrcSap::RadioResourceConfigDedicated */ void ApplyRadioResourceConfigDedicated (LteRrcSap::RadioResourceConfigDedicated rrcd); /** - * Apply radio resoure config dedicated secondary carrier. + * Apply radio resource config dedicated secondary carrier. * \param nonCec LteRrcSap::NonCriticalExtensionConfiguration */ void ApplyRadioResourceConfigDedicatedSecondaryCarrier (LteRrcSap::NonCriticalExtensionConfiguration nonCec); @@ -1027,7 +1027,7 @@ private: * applied to the measurement results and they are used by *UE measurements* * function: * - LteUeRrc::MeasurementReportTriggering: in this case it is not set any - * measurment related to seconday carrier components since the + * measurement related to seconday carrier components since the * A6 event is not implemented * - LteUeRrc::SendMeasurementReport: in this case the report are sent. */ diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc index af889589f..525e41fcf 100644 --- a/src/lte/model/pf-ff-mac-scheduler.cc +++ b/src/lte/model/pf-ff-mac-scheduler.cc @@ -1199,7 +1199,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched (*itHarqTimer).second.at (newDci.m_harqProcess) = 0; } - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version ret.m_buildDataList.push_back (newEl); // update UE stats diff --git a/src/lte/model/pf-ff-mac-scheduler.h b/src/lte/model/pf-ff-mac-scheduler.h index 07398886d..4025d4c5e 100644 --- a/src/lte/model/pf-ff-mac-scheduler.h +++ b/src/lte/model/pf-ff-mac-scheduler.h @@ -250,7 +250,7 @@ private: * \brief LC active per flow * * \param rnti the RNTI - * \returns the LC acive per flow + * \returns the LC active per flow */ unsigned int LcActivePerFlow (uint16_t rnti); @@ -387,7 +387,7 @@ private: // HARQ attributes /** - * m_harqOn when false inhibit te HARQ mechanisms (by default active) + * m_harqOn when false inhibit the HARQ mechanisms (by default active) */ bool m_harqOn; std::map m_dlHarqCurrentProcessId; ///< DL HARQ current process ID diff --git a/src/lte/model/pss-ff-mac-scheduler.cc b/src/lte/model/pss-ff-mac-scheduler.cc index a24e88078..d9053d5e8 100644 --- a/src/lte/model/pss-ff-mac-scheduler.cc +++ b/src/lte/model/pss-ff-mac-scheduler.cc @@ -1177,7 +1177,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche if ((m_ffrSapProvider->IsDlRbgAvailableForUe (i, (*it).first)) == false) continue; - // calculate PF weigth + // calculate PF weight double weight = (*it).second.targetThroughput / (*it).second.lastAveragedThroughput; if (weight < 1.0) weight = 1.0; @@ -1274,7 +1274,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche { if ((m_ffrSapProvider->IsDlRbgAvailableForUe (i, (*it).first)) == false) continue; - // calculate PF weigth + // calculate PF weight double weight = (*it).second.targetThroughput / (*it).second.lastAveragedThroughput; if (weight < 1.0) weight = 1.0; @@ -1524,7 +1524,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche (*itHarqTimer).second.at (newDci.m_harqProcess) = 0; } - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version ret.m_buildDataList.push_back (newEl); // update UE stats diff --git a/src/lte/model/pss-ff-mac-scheduler.h b/src/lte/model/pss-ff-mac-scheduler.h index b6c3405db..652ed79d0 100644 --- a/src/lte/model/pss-ff-mac-scheduler.h +++ b/src/lte/model/pss-ff-mac-scheduler.h @@ -399,13 +399,13 @@ private: // HARQ attributes /** - * m_harqOn when false inhibit te HARQ mechanisms (by default active) + * m_harqOn when false inhibit the HARQ mechanisms (by default active) */ bool m_harqOn; std::map m_dlHarqCurrentProcessId; ///< DL HARQ current proess ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_dlHarqProcessesStatus; ///< DL HARQ process status std::map m_dlHarqProcessesTimer; ///< DL HARQ process timer std::map m_dlHarqProcessesDciBuffer; ///< DL HARQ process DCI buffer @@ -415,7 +415,7 @@ private: std::map m_ulHarqCurrentProcessId; ///< UL HARQ process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_ulHarqProcessesStatus; ///< UL HARQ process status std::map m_ulHarqProcessesDciBuffer; ///< UL HARQ process DCI buffer diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index efa634c6f..0f5961935 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -859,7 +859,7 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched } else { - cqi = 1; // lowest value fro trying a transmission + cqi = 1; // lowest value for trying a transmission } if (cqi != 0) { diff --git a/src/lte/model/rr-ff-mac-scheduler.h b/src/lte/model/rr-ff-mac-scheduler.h index 79705b7c2..298526efd 100644 --- a/src/lte/model/rr-ff-mac-scheduler.h +++ b/src/lte/model/rr-ff-mac-scheduler.h @@ -326,13 +326,13 @@ private: // HARQ attributes /** - * m_harqOn when false inhibit te HARQ mechanisms (by default active) + * m_harqOn when false inhibit the HARQ mechanisms (by default active) */ bool m_harqOn; std::map m_dlHarqCurrentProcessId; ///< DL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_dlHarqProcessesStatus; ///< DL HARQ process status std::map m_dlHarqProcessesTimer; ///< DL HARQ process timer std::map m_dlHarqProcessesDciBuffer; ///< DL HARQ process DCI buffer @@ -342,7 +342,7 @@ private: std::map m_ulHarqCurrentProcessId; ///< UL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_ulHarqProcessesStatus; ///< UL HARQ process status std::map m_ulHarqProcessesDciBuffer; ///< UL HARQ process DCI buffer diff --git a/src/lte/model/tdbet-ff-mac-scheduler.cc b/src/lte/model/tdbet-ff-mac-scheduler.cc index 8dbe3a420..677095249 100644 --- a/src/lte/model/tdbet-ff-mac-scheduler.cc +++ b/src/lte/model/tdbet-ff-mac-scheduler.cc @@ -1071,7 +1071,7 @@ TdBetFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sc (*itHarqTimer).second.at (newDci.m_harqProcess) = 0; } - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version ret.m_buildDataList.push_back (newEl); // update UE stats diff --git a/src/lte/model/tdbet-ff-mac-scheduler.h b/src/lte/model/tdbet-ff-mac-scheduler.h index 5e8809e01..180ec1f7d 100644 --- a/src/lte/model/tdbet-ff-mac-scheduler.h +++ b/src/lte/model/tdbet-ff-mac-scheduler.h @@ -366,13 +366,13 @@ private: // HARQ attributes /** - * m_harqOn when false inhibit te HARQ mechanisms (by default active) + * m_harqOn when false inhibit the HARQ mechanisms (by default active) */ bool m_harqOn; std::map m_dlHarqCurrentProcessId; ///< DL HARQ process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_dlHarqProcessesStatus; ///< DL HARQ process status std::map m_dlHarqProcessesTimer; ///< DL HARQ process timer std::map m_dlHarqProcessesDciBuffer; ///< DL HARQ process DCI buffer @@ -382,7 +382,7 @@ private: std::map m_ulHarqCurrentProcessId; ///< UL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_ulHarqProcessesStatus; ///< UL HARQ process status std::map m_ulHarqProcessesDciBuffer; ///< UL HARQ process DCI buffer diff --git a/src/lte/model/tdmt-ff-mac-scheduler.cc b/src/lte/model/tdmt-ff-mac-scheduler.cc index 905467327..6c04baf25 100644 --- a/src/lte/model/tdmt-ff-mac-scheduler.cc +++ b/src/lte/model/tdmt-ff-mac-scheduler.cc @@ -890,7 +890,7 @@ TdMtFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sch } else { - wbCqi = 1; // lowest value fro trying a transmission + wbCqi = 1; // lowest value for trying a transmission } if (wbCqi != 0) @@ -1065,7 +1065,7 @@ TdMtFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sch (*itHarqTimer).second.at (newDci.m_harqProcess) = 0; } - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version ret.m_buildDataList.push_back (newEl); diff --git a/src/lte/model/tdmt-ff-mac-scheduler.h b/src/lte/model/tdmt-ff-mac-scheduler.h index da6a982fc..ca607cb3b 100644 --- a/src/lte/model/tdmt-ff-mac-scheduler.h +++ b/src/lte/model/tdmt-ff-mac-scheduler.h @@ -355,13 +355,13 @@ private: // HARQ attributes /** - * m_harqOn when false inhibit te HARQ mechanisms (by default active) + * m_harqOn when false inhibit the HARQ mechanisms (by default active) */ bool m_harqOn; std::map m_dlHarqCurrentProcessId; ///< DL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_dlHarqProcessesStatus; ///< DL HARQ process status std::map m_dlHarqProcessesTimer; ///< DL HARQ process timer std::map m_dlHarqProcessesDciBuffer; ///< DL HARQ process DCI buffer @@ -371,7 +371,7 @@ private: std::map m_ulHarqCurrentProcessId; ///< UL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_ulHarqProcessesStatus; ///< UL HARQ process status std::map m_ulHarqProcessesDciBuffer; ///< UL HARQ process DCI buffer diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.cc b/src/lte/model/tdtbfq-ff-mac-scheduler.cc index cce92c951..863111ffb 100644 --- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc @@ -1253,7 +1253,7 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::S } - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version ret.m_buildDataList.push_back (newEl); diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.h b/src/lte/model/tdtbfq-ff-mac-scheduler.h index def8d0091..45e354943 100644 --- a/src/lte/model/tdtbfq-ff-mac-scheduler.h +++ b/src/lte/model/tdtbfq-ff-mac-scheduler.h @@ -380,13 +380,13 @@ private: // HARQ attributes /** - * m_harqOn when false inhibit te HARQ mechanisms (by default active) + * m_harqOn when false inhibit the HARQ mechanisms (by default active) */ bool m_harqOn; std::map m_dlHarqCurrentProcessId; ///< DL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_dlHarqProcessesStatus; ///< DL HARQ process status std::map m_dlHarqProcessesTimer; ///< DL HARQ process timer std::map m_dlHarqProcessesDciBuffer; ///< DL HARQ process DCI buffer @@ -396,7 +396,7 @@ private: std::map m_ulHarqCurrentProcessId; ///< UL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_ulHarqProcessesStatus; ///< UL HARQ process status std::map m_ulHarqProcessesDciBuffer; ///< UL HARQ process DCI buffer diff --git a/src/lte/model/tta-ff-mac-scheduler.cc b/src/lte/model/tta-ff-mac-scheduler.cc index 7a6be1aa4..30226aab6 100644 --- a/src/lte/model/tta-ff-mac-scheduler.cc +++ b/src/lte/model/tta-ff-mac-scheduler.cc @@ -913,7 +913,7 @@ TtaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche } else { - wbCqi = 1; // lowest value fro trying a transmission + wbCqi = 1; // lowest value for trying a transmission } uint8_t cqi1 = sbCqi.at (0); @@ -1144,7 +1144,7 @@ TtaFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sche (*itHarqTimer).second.at (newDci.m_harqProcess) = 0; } - // ...more parameters -> ingored in this version + // ...more parameters -> ignored in this version ret.m_buildDataList.push_back (newEl); diff --git a/src/lte/model/tta-ff-mac-scheduler.h b/src/lte/model/tta-ff-mac-scheduler.h index 67feca9b0..e2034c7b9 100644 --- a/src/lte/model/tta-ff-mac-scheduler.h +++ b/src/lte/model/tta-ff-mac-scheduler.h @@ -221,7 +221,7 @@ private: int GetRbgSize (int dlbandwidth); /** - * \brief LC acive per flow function + * \brief LC active per flow function * \param rnti the RNTI * \returns the LC active per flow */ @@ -355,13 +355,13 @@ private: // HARQ attributes /** - * m_harqOn when false inhibit te HARQ mechanisms (by default active) + * m_harqOn when false inhibit the HARQ mechanisms (by default active) */ bool m_harqOn; std::map m_dlHarqCurrentProcessId; ///< DL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_dlHarqProcessesStatus; ///< DL HARQ process status std::map m_dlHarqProcessesTimer; ///< DL HARQ process timer std::map m_dlHarqProcessesDciBuffer; ///< DL HARQ process DCI buffer @@ -371,7 +371,7 @@ private: std::map m_ulHarqCurrentProcessId; ///< UL HARQ current process ID //HARQ status // 0: process Id available - // x>0: process Id equal to `x` trasmission count + // x>0: process Id equal to `x` transmission count std::map m_ulHarqProcessesStatus; ///< UL HARQ process status std::map m_ulHarqProcessesDciBuffer; ///< UL HARQ process DCI buffer diff --git a/src/lte/test/lte-test-cell-selection.h b/src/lte/test/lte-test-cell-selection.h index 22e4612a9..4697a4ca2 100644 --- a/src/lte/test/lte-test-cell-selection.h +++ b/src/lte/test/lte-test-cell-selection.h @@ -74,7 +74,7 @@ public: uint16_t expectedCellId1; ///< The cell ID that the UE is expected to attach to (0 means that the UE should not attach to any cell). uint16_t expectedCellId2; ///< An alternative cell ID that the UE is expected to attach to (0 means that this no alternative cell is expected). /** - * \brief UE test setup funtion. + * \brief UE test setup function. * \param relPosX relative position to the inter site distance in X * \param relPosY relative position to the inter site distance in Y * \param isCsgMember if true, simulation is allowed access to CSG cell diff --git a/src/lte/test/lte-test-deactivate-bearer.h b/src/lte/test/lte-test-deactivate-bearer.h index 119b03239..f18fc826b 100644 --- a/src/lte/test/lte-test-deactivate-bearer.h +++ b/src/lte/test/lte-test-deactivate-bearer.h @@ -15,7 +15,7 @@ namespace ns3 { * * \brief Test case that for testing the deactivation of the bearer * functionality. The test consist in deactivating the bearer and checking - * if some traffic will apear afterwards on the given bearer. If some traffic + * if some traffic will appear afterwards on the given bearer. If some traffic * is detected the test will fail. Firs the de-activation is performed by * using Simulator::Schedule() method which will initiate bearer de-activation * after deActivateTime that is specified as the test parameter. Additionally, diff --git a/src/lte/test/lte-test-earfcn.cc b/src/lte/test/lte-test-earfcn.cc index f8e1c9205..b7f5a4ccf 100644 --- a/src/lte/test/lte-test-earfcn.cc +++ b/src/lte/test/lte-test-earfcn.cc @@ -43,7 +43,7 @@ public: /** * Constructor * - * \param str referene name + * \param str reference name * \param earfcn EARFCN * \param f frequency */ @@ -92,7 +92,7 @@ public: /** * Constructor * - * \param str referene name + * \param str reference name * \param earfcn EARFCN * \param f frequency */ @@ -133,7 +133,7 @@ public: /** * Constructor * - * \param str referene name + * \param str reference name * \param earfcn EARFCN * \param f frequency */ diff --git a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc index 2b018f300..c436b8afd 100644 --- a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc @@ -320,7 +320,7 @@ LenaFdBetFfMacSchedulerTestCase1::DoRun (void) } /** * Check that the assignation is done in a "FD blind equal throughput" manner among users - * with equal SINRs: the bandwidht should be distributed according to the + * with equal SINRs: the bandwidth should be distributed according to the * ratio of the estimated throughput per TTI of each user; therefore equally * partitioning the whole bandwidth achievable from a single users in a TTI */ diff --git a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc b/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc index 0326d732d..6607dc9cf 100644 --- a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc @@ -314,7 +314,7 @@ LenaFdMtFfMacSchedulerTestCase::DoRun (void) } /** * Check that the assignation is done in a "proportional fair" manner among users - * with equal SINRs: the bandwidht should be distributed according to the + * with equal SINRs: the bandwidth should be distributed according to the * ratio of the estimated throughput per TTI of each user; therefore equally * partitioning the whole bandwidth achievable from a single users in a TTI */ diff --git a/src/lte/test/lte-test-frequency-reuse.cc b/src/lte/test/lte-test-frequency-reuse.cc index ce767944a..93d7bb971 100644 --- a/src/lte/test/lte-test-frequency-reuse.cc +++ b/src/lte/test/lte-test-frequency-reuse.cc @@ -1528,7 +1528,7 @@ LteDistributedFfrAreaTestCase::DoRun (void) ueLteDevs.Add (ueDevs1); ueLteDevs.Add (ueDevs2); - // Add X2 inteface + // Add X2 interface lteHelper->AddX2Interface (enbNodes); // Install the IP stack on the UEs diff --git a/src/lte/test/lte-test-frequency-reuse.h b/src/lte/test/lte-test-frequency-reuse.h index 31217b784..606e5cb16 100644 --- a/src/lte/test/lte-test-frequency-reuse.h +++ b/src/lte/test/lte-test-frequency-reuse.h @@ -61,7 +61,7 @@ public: * \param dlBandwidth the DL bandwidth * \param ulBandwidth the UL bandwidth * \param availableDlRb the available DL per RB - * \param availableUlRb the avaialble UL per RB + * \param availableUlRb the available UL per RB */ LteFrTestCase (std::string name, uint32_t userNum,uint8_t dlBandwidth,uint8_t ulBandwidth, diff --git a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc index cdc8c5c21..127b2e79a 100644 --- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc @@ -313,7 +313,7 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void) } /** * Check that the assignation is done in a "proportional fair" manner among users - * with equal SINRs: the bandwidht should be distributed according to the + * with equal SINRs: the bandwidth should be distributed according to the * ratio of the estimated throughput per TTI of each user; therefore equally * partitioning the whole bandwidth achievable from a single users in a TTI */ @@ -338,7 +338,7 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void) } /** * Check that the assignation is done in a "proportional fair" manner among users - * with equal SINRs: the bandwidht should be distributed according to the + * with equal SINRs: the bandwidth should be distributed according to the * ratio of the estimated throughput per TTI of each user; therefore equally * partitioning the whole bandwidth achievable from a single users in a TTI */ @@ -477,7 +477,7 @@ LenaPfFfMacSchedulerTestCase2::DoRun (void) /** * Check that the assignation is done in a "proportional fair" manner among users - * with different SINRs: the bandwidht should be distributed according to the + * with different SINRs: the bandwidth should be distributed according to the * ratio of the estimated throughput per TTI of each user. */ for (int i = 0; i < m_nUser; i++) diff --git a/src/lte/test/lte-test-spectrum-value-helper.cc b/src/lte/test/lte-test-spectrum-value-helper.cc index 1bbe11d2b..358d56b8d 100644 --- a/src/lte/test/lte-test-spectrum-value-helper.cc +++ b/src/lte/test/lte-test-spectrum-value-helper.cc @@ -98,7 +98,7 @@ public: * \param earfcn * \param bw bandwidth * \param noiseFigureDb noise figure in dB - * \param expected exected spectrum value + * \param expected executed spectrum value */ LteNoisePsdTestCase (const char* str, uint16_t earfcn, uint8_t bw, double noiseFigureDb, SpectrumValue& expected); virtual ~LteNoisePsdTestCase (); @@ -152,7 +152,7 @@ public: * \param bw bandwidth * \param txPowerDbm tranmit power in dBm * \param activeRbs active RBs - * \param expected exected spectrum value + * \param expected executed spectrum value */ LteTxPsdTestCase (const char* str, uint16_t earfcn, uint8_t bw, double txPowerDbm, std::vector activeRbs, SpectrumValue& expected); virtual ~LteTxPsdTestCase (); diff --git a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc index 71b19b7c9..fcf4cfa52 100644 --- a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc @@ -322,7 +322,7 @@ LenaTdBetFfMacSchedulerTestCase1::DoRun (void) } /** * Check that the assignation is done in a "TD blind equal throughput" manner among users - * with equal SINRs: the bandwidht should be distributed according to the + * with equal SINRs: the bandwidth should be distributed according to the * ratio of the estimated throughput per TTI of each user; therefore equally * partitioning the whole bandwidth achievable from a single users in a TTI */ diff --git a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc index 95efda308..0aeb2d476 100644 --- a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc @@ -313,7 +313,7 @@ LenaTdMtFfMacSchedulerTestCase::DoRun (void) } /** * Check that the assignation is done in a "proportional fair" manner among users - * with equal SINRs: the bandwidht should be distributed according to the + * with equal SINRs: the bandwidth should be distributed according to the * ratio of the estimated throughput per TTI of each user; therefore equally * partitioning the whole bandwidth achievable from a single users in a TTI */ diff --git a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc index 3c73ce93a..bc94e1169 100644 --- a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc @@ -316,7 +316,7 @@ LenaTtaFfMacSchedulerTestCase::DoRun (void) } /** * Check that the assignation is done in a "proportional fair" manner among users - * with equal SINRs: the bandwidht should be distributed according to the + * with equal SINRs: the bandwidth should be distributed according to the * ratio of the estimated throughput per TTI of each user; therefore equally * partitioning the whole bandwidth achievable from a single users in a TTI */ diff --git a/src/lte/test/lte-test-ue-measurements.h b/src/lte/test/lte-test-ue-measurements.h index 6d5036a8d..eed90df33 100644 --- a/src/lte/test/lte-test-ue-measurements.h +++ b/src/lte/test/lte-test-ue-measurements.h @@ -141,7 +141,7 @@ public: * piecewise configuration and 120 ms report interval. During the simulation * the placement of UE is being changed several times. Four different * cases are considered: UE is very near to eNodeB, UE is near to eNodeB, - * UE is far from eNodeB and UE is very far from eNodeB. Test checkes + * UE is far from eNodeB and UE is very far from eNodeB. Test checks * if the measurments correspond to the real conditions of the UE, i.e. * wnen the signal from serving cell becomes weak, the measurements should * also start to correspond to the new channel conditions. Additionally, it @@ -285,7 +285,7 @@ public: * In this test UE is being transported several times during the simulation * duration. Then the test checks if measurement report contains correct * RSRP and RSRQ result, than if CQI info is correctly generated, if the - * reporting occurs at the corret time stamp in the simulation and according + * reporting occurs at the correct time stamp in the simulation and according * to the measurements configuration. It also checks if the reported values * of RSRP and RSRQ are equal to expected reference values. * diff --git a/src/lte/test/test-asn1-encoding.cc b/src/lte/test/test-asn1-encoding.cc index f3cb3de5d..03e7f2d24 100644 --- a/src/lte/test/test-asn1-encoding.cc +++ b/src/lte/test/test-asn1-encoding.cc @@ -123,7 +123,7 @@ public: RrcHeaderTestCase (std::string s); virtual void DoRun (void) = 0; /** - * \brief Create radio resoure config dedicated + * \brief Create radio resource config dedicated * \returns LteRrcSap::RadioResourceConfigDedicated */ LteRrcSap::RadioResourceConfigDedicated CreateRadioResourceConfigDedicated (); diff --git a/src/lte/test/test-lte-antenna.cc b/src/lte/test/test-lte-antenna.cc index f0adedb20..03e3cad90 100644 --- a/src/lte/test/test-lte-antenna.cc +++ b/src/lte/test/test-lte-antenna.cc @@ -50,7 +50,7 @@ NS_LOG_COMPONENT_DEFINE ("LteAntennaTest"); * \ingroup tests * * \brief Tests that the propagation model and the antenna parameters are - * generate the correct values. Different test cases are created by specifing different + * generate the correct values. Different test cases are created by specifying different * antenna configurations and it is tested if for the given information the pathloss * value is as expected. */ diff --git a/src/lte/test/test-lte-rlc-header.cc b/src/lte/test/test-lte-rlc-header.cc index a1d3f0cee..6628baf92 100644 --- a/src/lte/test/test-lte-rlc-header.cc +++ b/src/lte/test/test-lte-rlc-header.cc @@ -92,7 +92,7 @@ public: } /** - * Log packet infor function + * Log packet info function * \param source T * \param s text string to log */ diff --git a/src/lte/test/test-lte-rrc.cc b/src/lte/test/test-lte-rrc.cc index 37a1f8924..986fd588b 100644 --- a/src/lte/test/test-lte-rrc.cc +++ b/src/lte/test/test-lte-rrc.cc @@ -47,7 +47,7 @@ public: * \param tConnBase connection time base value for all UEs in ms * \param tConnIncrPerUe additional connection time increment for each UE index (0...nUes-1) in ms * \param delayDiscStart expected duration to perform connection establishment in ms - * \param errorExpected if true, test case will wait a bit longer to accomodate for transmission error + * \param errorExpected if true, test case will wait a bit longer to accommodate for transmission error * \param useIdealRrc If set to false, real RRC protocol model will be used * \param admitRrcConnectionRequest If set to false, eNb will not allow UE connections * \param description additional description of the test case diff --git a/src/lte/test/test-lte-x2-handover.cc b/src/lte/test/test-lte-x2-handover.cc index 7351fd7b9..d18e389b3 100644 --- a/src/lte/test/test-lte-x2-handover.cc +++ b/src/lte/test/test-lte-x2-handover.cc @@ -51,7 +51,7 @@ struct HandoverEvent * \ingroup tests * * \brief Test X2 Handover. In this test is used NoOpHandoverAlgorithm and - * the request for handover is generated mannually, and it is not based on measurements. + * the request for handover is generated manually, and it is not based on measurements. */ class LteX2HandoverTestCase : public TestCase { diff --git a/src/mobility/examples/main-grid-topology.cc b/src/mobility/examples/main-grid-topology.cc index 585cbe4f9..99f2fb796 100644 --- a/src/mobility/examples/main-grid-topology.cc +++ b/src/mobility/examples/main-grid-topology.cc @@ -34,7 +34,7 @@ int main (int argc, char *argv[]) nodes.Create (120); MobilityHelper mobility; - // setup the grid itself: objects are layed out + // setup the grid itself: objects are laid out // started from (-100,-100) with 20 objects per row, // the x interval between each object is 5 meters // and the y interval between each object is 20 meters diff --git a/src/mobility/helper/ns2-mobility-helper.cc b/src/mobility/helper/ns2-mobility-helper.cc index 16f966521..6c3578a89 100644 --- a/src/mobility/helper/ns2-mobility-helper.cc +++ b/src/mobility/helper/ns2-mobility-helper.cc @@ -539,7 +539,7 @@ TrimNs2Line (const std::string& s) while (ret.size () > 0 && isblank (ret[0])) { - ret.erase (0, 1); // Removes blank spaces at the begining of the line + ret.erase (0, 1); // Removes blank spaces at the beginning of the line } while (ret.size () > 0 && (isblank (ret[ret.size () - 1]) || (ret[ret.size () - 1] == ';'))) diff --git a/src/mobility/model/constant-acceleration-mobility-model.h b/src/mobility/model/constant-acceleration-mobility-model.h index 9de72aff2..768dc238a 100644 --- a/src/mobility/model/constant-acceleration-mobility-model.h +++ b/src/mobility/model/constant-acceleration-mobility-model.h @@ -26,7 +26,7 @@ namespace ns3 { /** * \ingroup mobility * - * \brief Mobility model for which the current acceleration does not change once it has been set and until it is set again explicitely to a new value. + * \brief Mobility model for which the current acceleration does not change once it has been set and until it is set again explicitly to a new value. */ class ConstantAccelerationMobilityModel : public MobilityModel { diff --git a/src/mobility/model/constant-position-mobility-model.h b/src/mobility/model/constant-position-mobility-model.h index 029546aac..0a6f70e0b 100644 --- a/src/mobility/model/constant-position-mobility-model.h +++ b/src/mobility/model/constant-position-mobility-model.h @@ -27,7 +27,7 @@ namespace ns3 { /** * \ingroup mobility * - * \brief Mobility model for which the current position does not change once it has been set and until it is set again explicitely to a new value. + * \brief Mobility model for which the current position does not change once it has been set and until it is set again explicitly to a new value. */ class ConstantPositionMobilityModel : public MobilityModel { diff --git a/src/mobility/model/constant-velocity-mobility-model.h b/src/mobility/model/constant-velocity-mobility-model.h index 32143b52b..a7f2151bb 100644 --- a/src/mobility/model/constant-velocity-mobility-model.h +++ b/src/mobility/model/constant-velocity-mobility-model.h @@ -30,7 +30,7 @@ namespace ns3 { /** * \ingroup mobility * - * \brief Mobility model for which the current speed does not change once it has been set and until it is set again explicitely to a new value. + * \brief Mobility model for which the current speed does not change once it has been set and until it is set again explicitly to a new value. */ class ConstantVelocityMobilityModel : public MobilityModel { diff --git a/src/mobility/model/hierarchical-mobility-model.cc b/src/mobility/model/hierarchical-mobility-model.cc index a2909c4a1..5a5a3ddff 100644 --- a/src/mobility/model/hierarchical-mobility-model.cc +++ b/src/mobility/model/hierarchical-mobility-model.cc @@ -129,7 +129,7 @@ HierarchicalMobilityModel::DoSetPosition (const Vector &position) { return; } - // This implementation of DoSetPosition is really an arbitraty choice. + // This implementation of DoSetPosition is really an arbitrary choice. // anything else would have been ok. if (m_parent) { diff --git a/src/mobility/model/position-allocator.cc b/src/mobility/model/position-allocator.cc index 5a01278f8..fbb449c62 100644 --- a/src/mobility/model/position-allocator.cc +++ b/src/mobility/model/position-allocator.cc @@ -102,7 +102,7 @@ GridPositionAllocator::GetTypeId (void) .SetParent () .SetGroupName ("Mobility") .AddConstructor () - .AddAttribute ("GridWidth", "The number of objects layed out on a line.", + .AddAttribute ("GridWidth", "The number of objects laid out on a line.", UintegerValue (10), MakeUintegerAccessor (&GridPositionAllocator::m_n), MakeUintegerChecker ()) diff --git a/src/mobility/model/random-walk-2d-mobility-model.h b/src/mobility/model/random-walk-2d-mobility-model.h index 2b8a7e23f..79614f527 100644 --- a/src/mobility/model/random-walk-2d-mobility-model.h +++ b/src/mobility/model/random-walk-2d-mobility-model.h @@ -35,7 +35,7 @@ namespace ns3 { * \ingroup mobility * \brief 2D random walk mobility model. * - * Each instance moves with a speed and direction choosen at random + * Each instance moves with a speed and direction chosen at random * with the user-provided random variables until * either a fixed distance has been walked or until a fixed amount * of time. If we hit one of the boundaries (specified by a rectangle), diff --git a/src/mobility/test/waypoint-mobility-model-test.cc b/src/mobility/test/waypoint-mobility-model-test.cc index 1fcbbd8c5..6fdfc4e10 100644 --- a/src/mobility/test/waypoint-mobility-model-test.cc +++ b/src/mobility/test/waypoint-mobility-model-test.cc @@ -62,7 +62,7 @@ private: /// Force updates void ForceUpdates (void); /** - * Course cange callback + * Course change callback * \param model the mobility model */ void CourseChangeCallback (Ptr model); diff --git a/src/network/doc/error-model.rst b/src/network/doc/error-model.rst index 9ce7e9c6f..d9aac6e2a 100644 --- a/src/network/doc/error-model.rst +++ b/src/network/doc/error-model.rst @@ -48,7 +48,7 @@ Error models are |ns3| objects and can be created using the typical pattern of ``CreateObject<>()``. They have configuration attributes. An ErrorModel can be applied anywhere, but are commonly deployed on -NetDevice models so that artificial losses (mimicing channel losses) +NetDevice models so that artificial losses (mimicking channel losses) can be induced. Scope and Limitations diff --git a/src/network/model/buffer.h b/src/network/model/buffer.h index 9c9bd1b55..1ce67ff5f 100644 --- a/src/network/model/buffer.h +++ b/src/network/model/buffer.h @@ -244,7 +244,7 @@ public: * Write the data delimited by start and end in internal buffer * and advance the iterator position by the number of bytes * copied. - * The input interators _must_ not point to the same Buffer as + * The input iterators _must_ not point to the same Buffer as * we do to avoid overlapping copies. This is enforced * in debug builds by asserts. */ @@ -333,7 +333,7 @@ public: * * Read data and advance the Iterator by the number of bytes * read. - * The data is read in least signficant byte format and returned in host format. + * The data is read in least significant byte format and returned in host format. */ uint64_t ReadLsbtohU64 (void); /** diff --git a/src/network/model/node.cc b/src/network/model/node.cc index eff3df88e..503829588 100644 --- a/src/network/model/node.cc +++ b/src/network/model/node.cc @@ -304,7 +304,7 @@ Node::ReceiveFromDevice (Ptr device, Ptr packet, uint16 NS_LOG_FUNCTION (this << device << packet << protocol << &from << &to << packetType << promiscuous); NS_ASSERT_MSG (Simulator::GetContext () == GetId (), "Received packet with erroneous context ; " << "make sure the channels in use are correctly updating events context " << - "when transfering events from one node to another."); + "when transferring events from one node to another."); NS_LOG_DEBUG ("Node " << GetId () << " ReceiveFromDevice: dev " << device->GetIfIndex () << " (type=" << device->GetInstanceTypeId ().GetName () << ") Packet UID " << packet->GetUid ()); diff --git a/src/network/model/packet-metadata.h b/src/network/model/packet-metadata.h index aa4af2917..2dfd35a62 100644 --- a/src/network/model/packet-metadata.h +++ b/src/network/model/packet-metadata.h @@ -106,12 +106,12 @@ public: */ uint32_t currentSize; /** - * how many bytes were trimed from the start of a fragment. + * how many bytes were trimmed from the start of a fragment. * if isFragment is true, this field is zero. */ uint32_t currentTrimedFromStart; /** - * how many bytes were trimed from the end of a fragment. + * how many bytes were trimmed from the end of a fragment. * if isFragment is true, this field is zero. */ uint32_t currentTrimedFromEnd; @@ -463,7 +463,7 @@ private: is used to test whether two items are equal in the sense that they represent the same header or trailer instance. That equality test is based on the typeUid and chunkUid - fields so, the likelyhood that two header instances + fields so, the likelihood that two header instances share the same chunkUid _and_ typeUid is very small unless they are really representations of the same header instance. diff --git a/src/network/model/tag-buffer.h b/src/network/model/tag-buffer.h index 23a6c4bc1..f6715d0f7 100644 --- a/src/network/model/tag-buffer.h +++ b/src/network/model/tag-buffer.h @@ -40,7 +40,7 @@ namespace ns3 { * This class allows subclasses of the ns3::Tag base class * to serialize and deserialize their data through a stream-like * API. This class keeps track of the "current" point in the - * buffer and advances that "current" point everytime data is + * buffer and advances that "current" point every time data is * written. The in-memory format of the data written by * this class is unspecified. * diff --git a/src/network/test/buffer-test.cc b/src/network/test/buffer-test.cc index 47932ac01..8d38e9481 100644 --- a/src/network/test/buffer-test.cc +++ b/src/network/test/buffer-test.cc @@ -42,7 +42,7 @@ private: * Checks the buffer content * \param b The buffer to check * \param n The number of bytes to check - * \param array The aray of bytes that should be in the buffer + * \param array The array of bytes that should be in the buffer * \param file The file name * \param line The line number */ diff --git a/src/network/utils/data-rate.h b/src/network/utils/data-rate.h index 5cca1c691..2f20ca1ef 100644 --- a/src/network/utils/data-rate.h +++ b/src/network/utils/data-rate.h @@ -140,7 +140,7 @@ public: bool operator > (const DataRate& rhs) const; /** - * \return true if this rate is greather than or equal to rhs + * \return true if this rate is greater than or equal to rhs * * \param rhs the datarate to compare to this datarate */ diff --git a/src/network/utils/mac8-address.h b/src/network/utils/mac8-address.h index 35827c9c1..6720f5fb1 100644 --- a/src/network/utils/mac8-address.h +++ b/src/network/utils/mac8-address.h @@ -65,7 +65,7 @@ public: * Check that a generic Address is compatible with Mac8Address. * * \param address Address to test. - * \return True if address given is consistant with Mac8Address. + * \return True if address given is consistent with Mac8Address. */ static bool IsMatchingType (const Address &address); diff --git a/src/network/utils/output-stream-wrapper.cc b/src/network/utils/output-stream-wrapper.cc index 4a9075ac1..e65c054dd 100644 --- a/src/network/utils/output-stream-wrapper.cc +++ b/src/network/utils/output-stream-wrapper.cc @@ -43,7 +43,7 @@ OutputStreamWrapper::OutputStreamWrapper (std::ostream* os) { NS_LOG_FUNCTION (this << os); FatalImpl::RegisterStream (m_ostream); - NS_ABORT_MSG_UNLESS (m_ostream->good (), "Output stream is not vaild for writing."); + NS_ABORT_MSG_UNLESS (m_ostream->good (), "Output stream is not valid for writing."); } OutputStreamWrapper::~OutputStreamWrapper () diff --git a/src/network/utils/packetbb.h b/src/network/utils/packetbb.h index ee96706f2..42ae1b7fb 100644 --- a/src/network/utils/packetbb.h +++ b/src/network/utils/packetbb.h @@ -1604,7 +1604,7 @@ private: */ bool HasZeroTail (const uint8_t *tail, uint8_t taillen) const; - std::list
m_addressList; //!< Addreses container + std::list
m_addressList; //!< Addresses container std::list m_prefixList; //!< Prefixes container PbbAddressTlvBlock m_addressTlvList; //!< PbbAddressTlv container }; diff --git a/src/network/utils/queue-size.h b/src/network/utils/queue-size.h index bdf745caf..12bb22e4b 100644 --- a/src/network/utils/queue-size.h +++ b/src/network/utils/queue-size.h @@ -144,7 +144,7 @@ public: bool operator > (const QueueSize& rhs) const; /** - * \return true if this size is greather than or equal to rhs + * \return true if this size is greater than or equal to rhs * * \param rhs the queue size to compare to this queue size */ diff --git a/src/point-to-point-layout/model/point-to-point-grid.h b/src/point-to-point-layout/model/point-to-point-grid.h index 1fb9697b0..d2c5af232 100644 --- a/src/point-to-point-layout/model/point-to-point-grid.h +++ b/src/point-to-point-layout/model/point-to-point-grid.h @@ -48,7 +48,7 @@ public: * * \param nRows total number of rows in the grid * - * \param nCols total number of colums in the grid + * \param nCols total number of columns in the grid * * \param pointToPoint the PointToPointHelper which is used * to connect all of the nodes together diff --git a/src/point-to-point/model/point-to-point-net-device.cc b/src/point-to-point/model/point-to-point-net-device.cc index a20467234..822b5f238 100644 --- a/src/point-to-point/model/point-to-point-net-device.cc +++ b/src/point-to-point/model/point-to-point-net-device.cc @@ -116,7 +116,7 @@ PointToPointNetDevice::GetTypeId (void) "ns3::Packet::TracedCallback") #endif // - // Trace souces at the "bottom" of the net device, where packets transition + // Trace sources at the "bottom" of the net device, where packets transition // to/from the channel. // .AddTraceSource ("PhyTxBegin", diff --git a/src/point-to-point/model/point-to-point-net-device.h b/src/point-to-point/model/point-to-point-net-device.h index dadd8c898..720edb417 100644 --- a/src/point-to-point/model/point-to-point-net-device.h +++ b/src/point-to-point/model/point-to-point-net-device.h @@ -107,7 +107,7 @@ public: * Attach the device to a channel. * * \param ch Ptr to the channel to which this object is being attached. - * \return true if the operation was successfull (always true actually) + * \return true if the operation was successful (always true actually) */ bool Attach (Ptr ch); diff --git a/src/propagation/doc/propagation.rst b/src/propagation/doc/propagation.rst index 05d3abb52..49f1a452b 100644 --- a/src/propagation/doc/propagation.rst +++ b/src/propagation/doc/propagation.rst @@ -310,7 +310,7 @@ MatrixPropagationLossModel ========================== The propagation loss is fixed for each pair of nodes and doesn't depend on their actual positions. -This model shoud be useful for synthetic tests. Note that by default the propagation loss is +This model should be useful for synthetic tests. Note that by default the propagation loss is assumed to be symmetric. RangePropagationLossModel diff --git a/src/propagation/model/propagation-loss-model.cc b/src/propagation/model/propagation-loss-model.cc index cf5666f4d..42b3cee89 100644 --- a/src/propagation/model/propagation-loss-model.cc +++ b/src/propagation/model/propagation-loss-model.cc @@ -105,7 +105,7 @@ RandomPropagationLossModel::GetTypeId (void) .SetParent () .SetGroupName ("Propagation") .AddConstructor () - .AddAttribute ("Variable", "The random variable used to pick a loss everytime CalcRxPower is invoked.", + .AddAttribute ("Variable", "The random variable used to pick a loss every time CalcRxPower is invoked.", StringValue ("ns3::ConstantRandomVariable[Constant=1.0]"), MakePointerAccessor (&RandomPropagationLossModel::m_variable), MakePointerChecker ()) diff --git a/src/stats/model/file-aggregator.h b/src/stats/model/file-aggregator.h index b650e625a..6f5bc4adc 100644 --- a/src/stats/model/file-aggregator.h +++ b/src/stats/model/file-aggregator.h @@ -309,7 +309,7 @@ public: * \param v6 sixth value for the new data point. * \param v7 seventh value for the new data point. * \param v8 eighth value for the new data point. - * \param v9 nineth value for the new data point. + * \param v9 ninth value for the new data point. * * \brief Writes 9 values to the file. */ @@ -334,7 +334,7 @@ public: * \param v6 sixth value for the new data point. * \param v7 seventh value for the new data point. * \param v8 eighth value for the new data point. - * \param v9 nineth value for the new data point. + * \param v9 ninth value for the new data point. * \param v10 tenth value for the new data point. * * \brief Writes 10 values to the file. diff --git a/src/stats/model/get-wildcard-matches.cc b/src/stats/model/get-wildcard-matches.cc index f4a325448..35739778e 100644 --- a/src/stats/model/get-wildcard-matches.cc +++ b/src/stats/model/get-wildcard-matches.cc @@ -125,7 +125,7 @@ GetWildcardMatches (const std::string &configPath, wildcardMatches += matchedPath.substr (matchStart, matchEnd - matchStart + 1); - // See if all of the wilcard matches have been set. + // See if all of the wildcard matches have been set. wildcardMatchesSet++; if (wildcardMatchesSet == wildcardCount) { diff --git a/src/stats/model/get-wildcard-matches.h b/src/stats/model/get-wildcard-matches.h index 66d9c56ca..d74584d03 100644 --- a/src/stats/model/get-wildcard-matches.h +++ b/src/stats/model/get-wildcard-matches.h @@ -28,7 +28,7 @@ namespace ns3 { /** * \param configPath Config path to access the probe. * \param matchedPath the path that matched the Config path. - * \param wildcardSeparator the text to put betwen the wildcard + * \param wildcardSeparator the text to put between the wildcard * matches. By default, a space is used. * \return String value of text matches * diff --git a/src/stats/model/gnuplot-aggregator.cc b/src/stats/model/gnuplot-aggregator.cc index f2ea8579c..b0a67c40b 100644 --- a/src/stats/model/gnuplot-aggregator.cc +++ b/src/stats/model/gnuplot-aggregator.cc @@ -318,7 +318,7 @@ void GnuplotAggregator::SetKeyLocation (enum GnuplotAggregator::KeyLocation keyLocation) { NS_LOG_FUNCTION (this << keyLocation); - // Set the specifed key location. + // Set the specified key location. switch (keyLocation) { case NO_KEY: diff --git a/src/stats/model/gnuplot.h b/src/stats/model/gnuplot.h index 622578827..4e4dc0042 100644 --- a/src/stats/model/gnuplot.h +++ b/src/stats/model/gnuplot.h @@ -438,7 +438,7 @@ public: /** * \param osControl the output stream on which the relevant gnuplot - * contol commands should be generated. Including output file and + * control commands should be generated. Including output file and * terminal headers. * \param osData the output stream on which the relevant gnuplot * data values should be generated. @@ -520,7 +520,7 @@ public: /** * \param osControl the output stream on which the relevant gnuplot - * contol commands should be generated. Including output file and + * control commands should be generated. Including output file and * terminal headers. * \param osData the output stream on which the relevant gnuplot * data values should be generated. diff --git a/src/stats/model/stats.h b/src/stats/model/stats.h index 7f63ba4f6..23fee7457 100644 --- a/src/stats/model/stats.h +++ b/src/stats/model/stats.h @@ -72,7 +72,7 @@ * \defgroup dataoutput Data Output * * Classes in Data Output group are used to collect and prepare and output data - * for subsequent ouput in a specific format, e.g., Omnet++, SQLite, etc. + * for subsequent output in a specific format, e.g., Omnet++, SQLite, etc. */ #endif /* STATS_H */ diff --git a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc index 434b602a2..522308dec 100644 --- a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc @@ -261,7 +261,7 @@ Ns3TcpInteroperabilityTestCase::DoRun (void) // // We need something to shove data down the pipe, so we create an on-off - // application on the soure node with the reference TCP implementation. + // application on the source node with the reference TCP implementation. // The default behavior is to send for one second, then go quiet for one // second, and repeat. // diff --git a/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc b/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc index 13d3df266..c203ea7f1 100644 --- a/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc +++ b/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc @@ -134,7 +134,7 @@ WifiMsduAggregatorThroughputTest::DoRun (void) // The packet source is an on-off application on the AP // device. Given that we have fixed the transmit rate at 1 Mbps - // above, a 1 Mbps stream at the transport layer should be sufficent + // above, a 1 Mbps stream at the transport layer should be sufficient // to determine whether aggregation is working or not. // // We configure this traffic stream to operate between 1 and 9 seconds. diff --git a/src/test/traced/traced-value-callback-typedef-test-suite.cc b/src/test/traced/traced-value-callback-typedef-test-suite.cc index 0c7f1c04b..86312afc9 100644 --- a/src/test/traced/traced-value-callback-typedef-test-suite.cc +++ b/src/test/traced/traced-value-callback-typedef-test-suite.cc @@ -163,7 +163,7 @@ private: // The endl is in the sink function. if (ok) - // Odd form here is to accomodate the uneven operator support + // Odd form here is to accommodate the uneven operator support // of Time and SequenceNumber32. m_value = m_value + (T) 1; else diff --git a/src/uan/examples/uan-rc-example.cc b/src/uan/examples/uan-rc-example.cc index 1f7d60fb4..1f73635ac 100644 --- a/src/uan/examples/uan-rc-example.cc +++ b/src/uan/examples/uan-rc-example.cc @@ -22,7 +22,7 @@ * \file uan-rc-example.cc * \ingroup UAN * This example uses UanMacRc and UanMacRcGw which combined form a system - * using what is reffered to as RC-MAC. Details of RC-MAC will be published + * using what is referred to as RC-MAC. Details of RC-MAC will be published * soon. In brief terms, RC-MAC is a dual channel protocol wherein the * available bandwidth is dynamically divided into two channels, * a reservation channel and a data channel. The network is assumed diff --git a/src/uan/examples/uan-rc-example.h b/src/uan/examples/uan-rc-example.h index 46047dd64..7164e610c 100644 --- a/src/uan/examples/uan-rc-example.h +++ b/src/uan/examples/uan-rc-example.h @@ -83,7 +83,7 @@ public: * * \param kass Fraction of total bandwidth assigned to mode. * \param fc Mode center frequency offset. - * \param upperblock Sign choise in setting the center frequency. + * \param upperblock Sign choice in setting the center frequency. * \param name Mode name. * \return The new mode. */ diff --git a/src/uan/helper/uan-helper.h b/src/uan/helper/uan-helper.h index 81618c554..f25211729 100644 --- a/src/uan/helper/uan-helper.h +++ b/src/uan/helper/uan-helper.h @@ -40,7 +40,7 @@ class UanChannel; class UanHelper { public: - UanHelper (); //!< Defalt constructor. + UanHelper (); //!< Default constructor. virtual ~UanHelper (); //!< Destructor. /** diff --git a/src/uan/model/acoustic-modem-energy-model.h b/src/uan/model/acoustic-modem-energy-model.h index 8b121bc0a..923a6841f 100644 --- a/src/uan/model/acoustic-modem-energy-model.h +++ b/src/uan/model/acoustic-modem-energy-model.h @@ -105,7 +105,7 @@ public: void SetTxPowerW (double txPowerW); /** - * Get the recieving power. + * Get the receiving power. * * \return The receiving power in Watts */ diff --git a/src/uan/model/uan-header-rc.h b/src/uan/model/uan-header-rc.h index fef104945..9e5a7646e 100644 --- a/src/uan/model/uan-header-rc.h +++ b/src/uan/model/uan-header-rc.h @@ -331,7 +331,7 @@ public: * \param rtsTs RX time of RTS packet at gateway. * \param delay Delay until transmission. * \param addr Destination of CTS packet. - * \note Times are serialized, with ms precission, into 32 bit fields. + * \note Times are serialized, with ms precision, into 32 bit fields. */ UanHeaderRcCts (uint8_t frameNo, uint8_t retryNo, Time rtsTs, Time delay, Mac8Address addr); /** Destructor */ diff --git a/src/uan/model/uan-mac-rc-gw.h b/src/uan/model/uan-mac-rc-gw.h index 48edd6d2d..4512af590 100644 --- a/src/uan/model/uan-mac-rc-gw.h +++ b/src/uan/model/uan-mac-rc-gw.h @@ -177,7 +177,7 @@ private: TracedCallback m_cycleLogger; /** - * PHY recieve ok callback. + * PHY receive ok callback. * * \param pkt The Packet to receive * \param sinr The SINR on the channel diff --git a/src/uan/model/uan-phy.h b/src/uan/model/uan-phy.h index f9d3828fb..85fe4b433 100644 --- a/src/uan/model/uan-phy.h +++ b/src/uan/model/uan-phy.h @@ -280,7 +280,7 @@ public: * * \deprecated See UanPhyPer. * - * \param thresh Threshold SINR for propper reception in dB re 1 uPa. + * \param thresh Threshold SINR for proper reception in dB re 1 uPa. */ virtual void SetRxThresholdDb (double thresh) = 0; @@ -363,7 +363,7 @@ public: /** * Called when a transmission is beginning - * on the attched transducer. + * on the attached transducer. * * \param packet Packet that is beginning transmission. * \param txPowerDb Transmit power of packet. @@ -373,7 +373,7 @@ public: /** * Called when there has been a change in the - * ammount of interference this node is experiencing + * amount of interference this node is experiencing * from other transmissions. */ virtual void NotifyIntChange (void) = 0; diff --git a/src/uan/model/uan-prop-model.h b/src/uan/model/uan-prop-model.h index b13a832ab..334f8fc87 100644 --- a/src/uan/model/uan-prop-model.h +++ b/src/uan/model/uan-prop-model.h @@ -127,7 +127,7 @@ public: * Set the arrival value for a tap. * * The delay time is the index multiplied by the resolution. - * The tap vector will be expanded to accomadate the requested + * The tap vector will be expanded to accommodate the requested * index. * * \param arrival Complex arrival value. diff --git a/src/uan/test/uan-test.cc b/src/uan/test/uan-test.cc index 2b8affc99..c2cede6d3 100644 --- a/src/uan/test/uan-test.cc +++ b/src/uan/test/uan-test.cc @@ -213,7 +213,7 @@ UanTest::DoPhyTests () // Should correctly receive first arriving packet NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (DoOnePhyTest (Seconds (1.0), Seconds (1.0126), 50, 50, prop), - 17, "Should have recieved 17 bytes from first arriving packet"); + 17, "Should have received 17 bytes from first arriving packet"); // Packets should collide and both be lost NS_TEST_ASSERT_MSG_EQ_RETURNS_BOOL (DoOnePhyTest (Seconds (1.0), Seconds (1.0 + 7.01 * (13.0 / 80.0)), 50, 50, prop), diff --git a/src/wifi/doc/source/wifi-design.rst b/src/wifi/doc/source/wifi-design.rst index dc50e19b6..0b95f451e 100644 --- a/src/wifi/doc/source/wifi-design.rst +++ b/src/wifi/doc/source/wifi-design.rst @@ -672,7 +672,7 @@ Depending on your goal, the common tasks are (in no particular order): ``Txop`` and ``QosTxop``. * Fragmentation and RTS threholds 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 hanled by ``MacLow``. + ``Txop`` or ``QosTxop`` while RTS/CTS transaction is handled by ``MacLow``. * Modifying or creating new rate control algorithms can be done by creating a new child class of Wi-Fi remote station manager or modifying the existing ones. diff --git a/src/wifi/doc/source/wifi-testing.rst b/src/wifi/doc/source/wifi-testing.rst index 8a3a6d3df..192603e29 100644 --- a/src/wifi/doc/source/wifi-testing.rst +++ b/src/wifi/doc/source/wifi-testing.rst @@ -84,7 +84,7 @@ MAC validation ************** Validation of the 802.11 DCF MAC layer has been performed in [baldo2010]_. -802.11 PCF operation has been verified by running 'wifi-pcf' example whith PCAP files generation enabled, and observing the frame exchange using Wireshark. +802.11 PCF operation has been verified by running 'wifi-pcf' example with PCAP files generation enabled, and observing the frame exchange using Wireshark. SpectrumWiFiPhy *************** diff --git a/src/wifi/doc/source/wifi-user.rst b/src/wifi/doc/source/wifi-user.rst index 59c392f84..67f27e077 100644 --- a/src/wifi/doc/source/wifi-user.rst +++ b/src/wifi/doc/source/wifi-user.rst @@ -351,7 +351,7 @@ is, by default, set to the value 0. The value 0 indicates that no channel number has been set by the user. In |ns3|, a ChannelNumber may be defined or unknown. These terms -are not found in the code; they are just used to describe behavoir herein. +are not found in the code; they are just used to describe behavior herein. If a ChannelNumber is defined, it means that WifiPhy has stored a map of ChannelNumber to the center frequency and channel width commonly @@ -596,7 +596,7 @@ the ``ns3::WifiMacHelper`` can be also used to set: * MSDU aggregation parameters for a particular Access Category (AC) in order to use 802.11n/ac A-MSDU feature; * MPDU aggregation parameters for a particular Access Category (AC) in order to use 802.11n/ac A-MPDU feature. -By defaut, MSDU aggregation feature is disabled for all ACs and MPDU aggregation is enabled for AC_VI and AC_BE, with a maximum aggregation size of 65535 bytes. +By default, MSDU aggregation feature is disabled for all ACs and MPDU aggregation is enabled for AC_VI and AC_BE, with a maximum aggregation size of 65535 bytes. For example the following user code configures a MAC that will be a non-AP STA with HT and QoS enabled, MPDU aggregation enabled for AC_VO with a maximum aggregation size of 65535 bytes, and MSDU aggregation enabled for AC_BE with a maximum aggregation size of 7935 bytes, in an infrastructure network where the AP has SSID ``ns-3-ssid``:: diff --git a/src/wifi/helper/athstats-helper.cc b/src/wifi/helper/athstats-helper.cc index b60bc873e..8feb60323 100644 --- a/src/wifi/helper/athstats-helper.cc +++ b/src/wifi/helper/athstats-helper.cc @@ -264,7 +264,7 @@ AthstatsWifiTraceSink::WriteStats () //I know C strings are ugly but that's the quickest way to use exactly the same format as in madwifi char str[200]; snprintf (str, 200, "%8u %8u %7u %7u %7u %6u %6u %6u %7u %4u %3uM\n", - (unsigned int) m_txCount, // /proc/net/dev transmitted packets to which we should subract mgmt frames + (unsigned int) m_txCount, // /proc/net/dev transmitted packets to which we should subtract mgmt frames (unsigned int) m_rxCount, // /proc/net/dev received packets but subracts mgmt frames from it (unsigned int) 0, // ast_tx_altrate (unsigned int) m_shortRetryCount, // ast_tx_shortretry diff --git a/src/wifi/helper/athstats-helper.h b/src/wifi/helper/athstats-helper.h index 56362b044..faecf674e 100644 --- a/src/wifi/helper/athstats-helper.h +++ b/src/wifi/helper/athstats-helper.h @@ -76,7 +76,7 @@ private: * * The AthstatsWifiTraceSink class is a trace sink to be connected to several of the traces * available within a wifi device. The purpose of AthstatsWifiTraceSink is to - * mimic the behavior of the athstats tool distributed wih the madwifi + * mimic the behavior of the athstats tool distributed with the madwifi * driver. In particular, the reproduced behavior is that obtained * when executing athstats without parameters: a report written in * text format is produced every fixed interval, based on the events diff --git a/src/wifi/model/aarf-wifi-manager.h b/src/wifi/model/aarf-wifi-manager.h index 309bec3f5..f132f9867 100644 --- a/src/wifi/model/aarf-wifi-manager.h +++ b/src/wifi/model/aarf-wifi-manager.h @@ -56,7 +56,7 @@ public: void SetHeSupported (bool enable); private: - //overriden from base class + //overridden from base class WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); diff --git a/src/wifi/model/aarfcd-wifi-manager.h b/src/wifi/model/aarfcd-wifi-manager.h index 62741cc61..3d6822af1 100644 --- a/src/wifi/model/aarfcd-wifi-manager.h +++ b/src/wifi/model/aarfcd-wifi-manager.h @@ -58,7 +58,7 @@ public: void SetHeSupported (bool enable); private: - // overriden from base class + // overridden from base class WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); diff --git a/src/wifi/model/amrr-wifi-manager.h b/src/wifi/model/amrr-wifi-manager.h index 403540fff..9cb656114 100644 --- a/src/wifi/model/amrr-wifi-manager.h +++ b/src/wifi/model/amrr-wifi-manager.h @@ -60,7 +60,7 @@ public: private: - //overriden from base class + //overridden from base class WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); diff --git a/src/wifi/model/amsdu-subframe-header.h b/src/wifi/model/amsdu-subframe-header.h index 974fa0aa0..af2d9407f 100644 --- a/src/wifi/model/amsdu-subframe-header.h +++ b/src/wifi/model/amsdu-subframe-header.h @@ -79,7 +79,7 @@ public: private: Mac48Address m_da; ///< destination address - Mac48Address m_sa; ///< source addresss + Mac48Address m_sa; ///< source address uint16_t m_length; ///< length }; diff --git a/src/wifi/model/aparf-wifi-manager.h b/src/wifi/model/aparf-wifi-manager.h index 51dcc3e11..2b42f5600 100644 --- a/src/wifi/model/aparf-wifi-manager.h +++ b/src/wifi/model/aparf-wifi-manager.h @@ -71,7 +71,7 @@ public: private: - //overriden from base class + //overridden from base class WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); diff --git a/src/wifi/model/arf-wifi-manager.cc b/src/wifi/model/arf-wifi-manager.cc index 4852359ed..592b82994 100644 --- a/src/wifi/model/arf-wifi-manager.cc +++ b/src/wifi/model/arf-wifi-manager.cc @@ -60,7 +60,7 @@ ArfWifiManager::GetTypeId (void) MakeUintegerAccessor (&ArfWifiManager::m_timerThreshold), MakeUintegerChecker ()) .AddAttribute ("SuccessThreshold", - "The minimum number of sucessfull transmissions to try a new rate.", + "The minimum number of successful transmissions to try a new rate.", UintegerValue (10), MakeUintegerAccessor (&ArfWifiManager::m_successThreshold), MakeUintegerChecker ()) diff --git a/src/wifi/model/arf-wifi-manager.h b/src/wifi/model/arf-wifi-manager.h index fb6479f60..0906dd7cb 100644 --- a/src/wifi/model/arf-wifi-manager.h +++ b/src/wifi/model/arf-wifi-manager.h @@ -63,7 +63,7 @@ public: private: - //overriden from base class + //overridden from base class WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); diff --git a/src/wifi/model/cara-wifi-manager.cc b/src/wifi/model/cara-wifi-manager.cc index 673e573f1..612b6ae3b 100644 --- a/src/wifi/model/cara-wifi-manager.cc +++ b/src/wifi/model/cara-wifi-manager.cc @@ -62,7 +62,7 @@ CaraWifiManager::GetTypeId (void) MakeUintegerAccessor (&CaraWifiManager::m_failureThreshold), MakeUintegerChecker ()) .AddAttribute ("SuccessThreshold", - "The minimum number of sucessfull transmissions to try a new rate.", + "The minimum number of successful transmissions to try a new rate.", UintegerValue (10), MakeUintegerAccessor (&CaraWifiManager::m_successThreshold), MakeUintegerChecker ()) diff --git a/src/wifi/model/cara-wifi-manager.h b/src/wifi/model/cara-wifi-manager.h index 66579b106..7d124fa3e 100644 --- a/src/wifi/model/cara-wifi-manager.h +++ b/src/wifi/model/cara-wifi-manager.h @@ -59,7 +59,7 @@ public: private: - //overriden from base class + //overridden from base class WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); diff --git a/src/wifi/model/channel-access-manager.h b/src/wifi/model/channel-access-manager.h index abc2b2043..a396cc10f 100644 --- a/src/wifi/model/channel-access-manager.h +++ b/src/wifi/model/channel-access-manager.h @@ -38,7 +38,7 @@ class MacLow; * * Handle a set of independent ns3::Txop, each of which represents * a single DCF within a MAC stack. Each ns3::Txop has a priority - * implicitely associated with it (the priority is determined when the + * implicitly associated with it (the priority is determined when the * ns3::Txop is added to the ChannelAccessManager: the first Txop to be * added gets the highest priority, the second, the second highest * priority, and so on.) which is used to handle "internal" collisions. @@ -196,7 +196,7 @@ public: */ void NotifyAckTimeoutStartNow (Time duration); /** - * Notify that ACK timer has resetted. + * Notify that ACK timer has reset. */ void NotifyAckTimeoutResetNow (); /** @@ -206,7 +206,7 @@ public: */ void NotifyCtsTimeoutStartNow (Time duration); /** - * Notify that CTS timer has resetted. + * Notify that CTS timer has reset. */ void NotifyCtsTimeoutResetNow (); diff --git a/src/wifi/model/constant-rate-wifi-manager.h b/src/wifi/model/constant-rate-wifi-manager.h index aedbb8fc1..a2b623627 100644 --- a/src/wifi/model/constant-rate-wifi-manager.h +++ b/src/wifi/model/constant-rate-wifi-manager.h @@ -45,7 +45,7 @@ public: private: - //overriden from base class + //overridden from base class WifiRemoteStation* DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); diff --git a/src/wifi/model/dsss-error-rate-model.h b/src/wifi/model/dsss-error-rate-model.h index bf7af6811..2ad567391 100644 --- a/src/wifi/model/dsss-error-rate-model.h +++ b/src/wifi/model/dsss-error-rate-model.h @@ -46,7 +46,7 @@ double IntegralFunction (double x, void *params); * * The 802.11b modulations: * - 1 Mbps mode is based on DBPSK. BER is from equation 5.2-69 from John G. Proakis - * Digitial Communications, 2001 edition + * Digital Communications, 2001 edition * - 2 Mbps model is based on DQPSK. Equation 8 from "Tight bounds and accurate * approximations for dqpsk transmission bit error rate", G. Ferrari and G.E. Corazza * ELECTRONICS LETTERS, 40(20):1284-1285, September 2004 diff --git a/src/wifi/model/he-capabilities.h b/src/wifi/model/he-capabilities.h index bc9665ebd..f8941cdfd 100644 --- a/src/wifi/model/he-capabilities.h +++ b/src/wifi/model/he-capabilities.h @@ -228,7 +228,7 @@ private: uint8_t m_broadcastTwtSupport; //!< broadcast TXT support uint8_t m_32bitBaBitmapSupport; //!< 32bit BA bitmap support uint8_t m_muCascadeSupport; //!< MU cascade support - uint8_t m_ackEnabledMultiTidAggregationSupport; //!< ack enabled multi TID aggregation suport + uint8_t m_ackEnabledMultiTidAggregationSupport; //!< ack enabled multi TID aggregation support uint8_t m_groupAddressedMultiStaBlockAckInDlMuSupport; //!< group addressed multi STA block ack in DL support uint8_t m_omiAcontrolSupport; //!< OMI A control support uint8_t m_ofdmaRaSupport; //!< OFDM RA support diff --git a/src/wifi/model/ht-capabilities.h b/src/wifi/model/ht-capabilities.h index 93bea8980..bc8e18767 100644 --- a/src/wifi/model/ht-capabilities.h +++ b/src/wifi/model/ht-capabilities.h @@ -228,7 +228,7 @@ public: /** * Return the supported channel width. * - * \return the supported chanel width + * \return the supported channel width */ uint8_t GetSupportedChannelWidth (void) const; /** diff --git a/src/wifi/model/ht-operation.h b/src/wifi/model/ht-operation.h index 609b20c9b..f5950dcd6 100644 --- a/src/wifi/model/ht-operation.h +++ b/src/wifi/model/ht-operation.h @@ -429,7 +429,7 @@ private: //Basic MCS Set field uint8_t m_reservedMcsSet1; ///< reserved MCS set 1 - uint16_t m_rxHighestSupportedDataRate; ///< receive highest suppoted data rate + uint16_t m_rxHighestSupportedDataRate; ///< receive highest supported data rate uint8_t m_reservedMcsSet2; ///< reserved MCS set2 uint8_t m_txMcsSetDefined; ///< transmit MCS set defined uint8_t m_txRxMcsSetUnequal; ///< transmit / receive MCS set unequal diff --git a/src/wifi/model/ideal-wifi-manager.h b/src/wifi/model/ideal-wifi-manager.h index 773372afa..4e2c75514 100644 --- a/src/wifi/model/ideal-wifi-manager.h +++ b/src/wifi/model/ideal-wifi-manager.h @@ -56,7 +56,7 @@ public: private: - //overriden from base class + //overridden from base class void DoInitialize (void); WifiRemoteStation* DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, diff --git a/src/wifi/model/mac-low.cc b/src/wifi/model/mac-low.cc index 4af95390d..f8ba84772 100644 --- a/src/wifi/model/mac-low.cc +++ b/src/wifi/model/mac-low.cc @@ -1891,7 +1891,7 @@ MacLow::SendDataAfterCts (Time duration) { NS_LOG_FUNCTION (this); /* send the third step in a - * RTS/CTS/DATA/ACK hanshake + * RTS/CTS/DATA/ACK handshake */ NS_ASSERT (m_currentPacket != 0); diff --git a/src/wifi/model/mac-low.h b/src/wifi/model/mac-low.h index e0f3922b5..f52fb7a94 100644 --- a/src/wifi/model/mac-low.h +++ b/src/wifi/model/mac-low.h @@ -336,7 +336,7 @@ public: * \param duration switching delay duration. * * This method is typically invoked by the PhyMacLowListener to notify - * the MAC layer that a channel switching occured. When a channel switching + * the MAC layer that a channel switching occurred. When a channel switching * occurs, pending MAC transmissions (RTS, CTS, DATA and ACK) are cancelled. */ void NotifySwitchingStartNow (Time duration); @@ -388,9 +388,9 @@ public: */ void RegisterEdcaForAc (AcIndex ac, Ptr edca); /** - * \param packet the packet to be aggregated. If the aggregation is succesfull, it corresponds either to the first data packet that will be aggregated or to the BAR that will be piggybacked at the end of the A-MPDU. + * \param packet the packet to be aggregated. If the aggregation is successful, it corresponds either to the first data packet that will be aggregated or to the BAR that will be piggybacked at the end of the A-MPDU. * \param hdr the WifiMacHeader for the packet. - * \return the A-MPDU packet if aggregation is successfull, the input packet otherwise + * \return the A-MPDU packet if aggregation is successful, the input packet otherwise * * This function adds the packets that will be added to an A-MPDU to an aggregate queue * @@ -438,7 +438,7 @@ public: * Start NAV with the given duration. * * \param duration the duration - * \return true if NAV is resetted + * \return true if NAV is reset */ bool DoNavStartNow (Time duration); /** @@ -627,7 +627,7 @@ private: */ void NotifyAckTimeoutStartNow (Time duration); /** - * Notify ChannelAccessManager that ACK timer should be resetted. + * Notify ChannelAccessManager that ACK timer should be reset. */ void NotifyAckTimeoutResetNow (); /** @@ -637,12 +637,12 @@ private: */ void NotifyCtsTimeoutStartNow (Time duration); /** - * Notify ChannelAccessManager that CTS timer should be resetted. + * Notify ChannelAccessManager that CTS timer should be reset. */ void NotifyCtsTimeoutResetNow (); /** * Reset NAV after CTS was missed when the NAV was - * setted with RTS. + * set with RTS. * * \param rtsEndRxTime */ diff --git a/src/wifi/model/mac-rx-middle.cc b/src/wifi/model/mac-rx-middle.cc index a32b716cb..1027a7b9f 100644 --- a/src/wifi/model/mac-rx-middle.cc +++ b/src/wifi/model/mac-rx-middle.cc @@ -306,7 +306,7 @@ MacRxMiddle::Receive (Ptr packet, const WifiMacHeader *hdr) } OriginatorRxStatus *originator = Lookup (hdr); /** - * The check below is really uneeded because it can fail in a lot of + * The check below is really unneeded because it can fail in a lot of * normal cases. Specifically, it is possible for sequence numbers to * loop back to zero once they reach 0xfff0 and to go up to 0xf7f0 in * which case the check below will report the two sequence numbers to @@ -327,8 +327,8 @@ MacRxMiddle::Receive (Ptr packet, const WifiMacHeader *hdr) ", frag=" << hdr->GetFragmentNumber ()); return; } - Ptr agregate = HandleFragments (packet, hdr, originator); - if (agregate == 0) + Ptr aggregate = HandleFragments (packet, hdr, originator); + if (aggregate == 0) { return; } @@ -339,7 +339,7 @@ MacRxMiddle::Receive (Ptr packet, const WifiMacHeader *hdr) { originator->SetSequenceControl (hdr->GetSequenceControl ()); } - m_callback (agregate, hdr); + m_callback (aggregate, hdr); } void diff --git a/src/wifi/model/mac-rx-middle.h b/src/wifi/model/mac-rx-middle.h index e9db130aa..3fb708ffd 100644 --- a/src/wifi/model/mac-rx-middle.h +++ b/src/wifi/model/mac-rx-middle.h @@ -122,11 +122,11 @@ private: */ typedef std::map , OriginatorRxStatus *, std::less > > QosOriginators; /** - * typedef for an interator for Originators + * typedef for an iterator for Originators */ typedef std::map >::iterator OriginatorsI; /** - * typedef for an interator for QosOriginators + * typedef for an iterator for QosOriginators */ typedef std::map , OriginatorRxStatus *, std::less > >::iterator QosOriginatorsI; diff --git a/src/wifi/model/mgt-headers.h b/src/wifi/model/mgt-headers.h index 893ed8ca3..86edbce80 100644 --- a/src/wifi/model/mgt-headers.h +++ b/src/wifi/model/mgt-headers.h @@ -1265,9 +1265,9 @@ public: uint32_t Deserialize (Buffer::Iterator start); /** - * Check if the initiator bit in the DELBA is setted. + * Check if the initiator bit in the DELBA is set. * - * \return true if the initiator bit in the DELBA is setted, + * \return true if the initiator bit in the DELBA is set, * false otherwise */ bool IsByOriginator (void) const; diff --git a/src/wifi/model/minstrel-ht-wifi-manager.cc b/src/wifi/model/minstrel-ht-wifi-manager.cc index ea8081f20..004fe0b30 100644 --- a/src/wifi/model/minstrel-ht-wifi-manager.cc +++ b/src/wifi/model/minstrel-ht-wifi-manager.cc @@ -1229,7 +1229,7 @@ MinstrelHtWifiManager::UpdateStats (MinstrelHtWifiRemoteStation *station) */ tempProb = (100 * station->m_groupsTable[j].m_ratesTable[i].numRateSuccess) / station->m_groupsTable[j].m_ratesTable[i].numRateAttempt; - /// Bookeeping. + /// Bookkeeping. station->m_groupsTable[j].m_ratesTable[i].prob = tempProb; if (station->m_groupsTable[j].m_ratesTable[i].successHist == 0) @@ -1256,7 +1256,7 @@ MinstrelHtWifiManager::UpdateStats (MinstrelHtWifiRemoteStation *station) station->m_groupsTable[j].m_ratesTable[i].numSamplesSkipped++; } - /// Bookeeping. + /// Bookkeeping. station->m_groupsTable[j].m_ratesTable[i].prevNumRateSuccess = station->m_groupsTable[j].m_ratesTable[i].numRateSuccess; station->m_groupsTable[j].m_ratesTable[i].prevNumRateAttempt = station->m_groupsTable[j].m_ratesTable[i].numRateAttempt; station->m_groupsTable[j].m_ratesTable[i].numRateSuccess = 0; @@ -1293,7 +1293,7 @@ MinstrelHtWifiManager::CalculateThroughput (MinstrelHtWifiRemoteStation *station { /** * Calculating throughput. - * Do not account throughput if sucess prob is below 10% + * Do not account throughput if success prob is below 10% * (as done in minstrel_ht linux implementation). */ if (ewmaProb < 10) diff --git a/src/wifi/model/minstrel-ht-wifi-manager.h b/src/wifi/model/minstrel-ht-wifi-manager.h index 41f1126d6..b46679e0f 100644 --- a/src/wifi/model/minstrel-ht-wifi-manager.h +++ b/src/wifi/model/minstrel-ht-wifi-manager.h @@ -222,7 +222,7 @@ public: private: - // Overriden from base class. + // Overridden from base class. void DoInitialize (void); WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, @@ -437,7 +437,7 @@ private: * Perform EWMSD (Exponentially Weighted Moving Standard Deviation) calculation. * * \param oldEwmsd the old EWMSD - * \param currentProb the current probabilty + * \param currentProb the current probability * \param ewmaProb the EWMA probability * \param weight the weight * \returns the EWMSD diff --git a/src/wifi/model/minstrel-wifi-manager.cc b/src/wifi/model/minstrel-wifi-manager.cc index 5093bd85a..5c699c81e 100644 --- a/src/wifi/model/minstrel-wifi-manager.cc +++ b/src/wifi/model/minstrel-wifi-manager.cc @@ -566,7 +566,7 @@ MinstrelWifiManager::UpdateStats (MinstrelWifiRemoteStation *station) */ tempProb = (station->m_minstrelTable[i].numRateSuccess * 18000) / station->m_minstrelTable[i].numRateAttempt; - //bookeeping + //bookkeeping station->m_minstrelTable[i].prob = tempProb; if (station->m_minstrelTable[i].successHist == 0) @@ -589,7 +589,7 @@ MinstrelWifiManager::UpdateStats (MinstrelWifiRemoteStation *station) station->m_minstrelTable[i].numSamplesSkipped++; } - //bookeeping + //bookkeeping station->m_minstrelTable[i].successHist += station->m_minstrelTable[i].numRateSuccess; station->m_minstrelTable[i].attemptHist += station->m_minstrelTable[i].numRateAttempt; station->m_minstrelTable[i].prevNumRateSuccess = station->m_minstrelTable[i].numRateSuccess; @@ -627,7 +627,7 @@ MinstrelWifiManager::UpdateStats (MinstrelWifiRemoteStation *station) } } - NS_LOG_DEBUG ("Attempt/success resetted to 0"); + NS_LOG_DEBUG ("Attempt/success reset to 0"); uint32_t max_tp = 0; uint8_t index_max_tp = 0, index_max_tp2 = 0; @@ -890,7 +890,7 @@ MinstrelWifiManager::GetNextSample (MinstrelWifiRemoteStation *station) uint8_t bitrate = station->m_sampleTable[station->m_index][station->m_col]; station->m_index++; - //bookeeping for m_index and m_col variables + //bookkeeping for m_index and m_col variables NS_ABORT_MSG_IF (station->m_nModes < 2, "Integer overflow detected"); if (station->m_index > station->m_nModes - 2) { diff --git a/src/wifi/model/minstrel-wifi-manager.h b/src/wifi/model/minstrel-wifi-manager.h index 559b1e5f2..ead64ce7e 100644 --- a/src/wifi/model/minstrel-wifi-manager.h +++ b/src/wifi/model/minstrel-wifi-manager.h @@ -139,9 +139,9 @@ struct MinstrelWifiRemoteStation : public WifiRemoteStation * to changes. * * Related to the previous, the logic for deciding when to sample random - * rates is as follows. When a sample rate is deffered to the second MRR + * rates is as follows. When a sample rate is deferred to the second MRR * chain stage, a new parameter (numSamplesDeferred) is increased. This - * paramters is used (jointly with sampleCount) to compare current + * parameters is used (jointly with sampleCount) to compare current * sample count with the lookaround rate. * * Also related with sampling, another parameter sampleLimit is added. @@ -258,7 +258,7 @@ public: void InitSampleTable (MinstrelWifiRemoteStation *station); private: - //overriden from base class + //overridden from base class WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); diff --git a/src/wifi/model/onoe-wifi-manager.h b/src/wifi/model/onoe-wifi-manager.h index 1e9870bb2..d275f7971 100644 --- a/src/wifi/model/onoe-wifi-manager.h +++ b/src/wifi/model/onoe-wifi-manager.h @@ -61,7 +61,7 @@ public: private: - //overriden from base class + //overridden from base class WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); diff --git a/src/wifi/model/parf-wifi-manager.h b/src/wifi/model/parf-wifi-manager.h index f9e8a32f5..d735420f7 100644 --- a/src/wifi/model/parf-wifi-manager.h +++ b/src/wifi/model/parf-wifi-manager.h @@ -59,7 +59,7 @@ public: private: - //overriden from base class + //overridden from base class WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); diff --git a/src/wifi/model/qos-txop.cc b/src/wifi/model/qos-txop.cc index d9d3eb868..9bc068633 100644 --- a/src/wifi/model/qos-txop.cc +++ b/src/wifi/model/qos-txop.cc @@ -637,7 +637,7 @@ QosTxop::MissedBlockAck (uint8_t nMpdus) } else { - //standard says when loosing a BlockAck originator may send a BAR page 139 + //standard says when losing a BlockAck originator may send a BAR page 139 NS_LOG_DEBUG ("Transmit Block Ack Request"); CtrlBAckRequestHeader reqHdr; reqHdr.SetType (COMPRESSED_BLOCK_ACK); diff --git a/src/wifi/model/regular-wifi-mac.h b/src/wifi/model/regular-wifi-mac.h index 91e00eb24..7b4fab4e1 100644 --- a/src/wifi/model/regular-wifi-mac.h +++ b/src/wifi/model/regular-wifi-mac.h @@ -256,7 +256,7 @@ public: * * \param packet the packet that has been received. * \param from the MAC address of the device that sent the packet. - * \param to the MAC address ot the device that the packet is destined for. + * \param to the MAC address of the device that the packet is destined for. */ typedef Callback, Mac48Address, Mac48Address> ForwardUpCallback; /** @@ -350,7 +350,7 @@ protected: * This method is called by ns3::WifiMac::ConfigureStandard to * complete the configuration process for a requested phy standard. * - * This method may be overriden by a derived class (e.g., in order + * This method may be overridden by a derived class (e.g., in order * to apply DCF or EDCA parameters specific to the usage model it is * dealing with), in which case the reimplementation may choose to * deal with certain values in the WifiPhyStandard enumeration, and @@ -382,9 +382,9 @@ protected: * invoked to notify us that a frame has been received. The * implementation is intended to capture logic that is going to be * common to all (or most) derived classes. Specifically, handling - * of Block Ack managment frames is dealt with here. + * of Block Ack management frames is dealt with here. * - * This method will need, however, to be overriden by derived + * This method will need, however, to be overridden by derived * classes so that they can perform their data handling before * invoking the base version. * diff --git a/src/wifi/model/rraa-wifi-manager.cc b/src/wifi/model/rraa-wifi-manager.cc index e3bf279e6..36c582360 100644 --- a/src/wifi/model/rraa-wifi-manager.cc +++ b/src/wifi/model/rraa-wifi-manager.cc @@ -63,7 +63,7 @@ RraaWifiManager::GetTypeId (void) .SetGroupName ("Wifi") .AddConstructor () .AddAttribute ("Basic", - "If true the RRAA-BASIC algorithm will be used, otherwise the RRAA wil be used", + "If true the RRAA-BASIC algorithm will be used, otherwise the RRAA will be used", BooleanValue (false), MakeBooleanAccessor (&RraaWifiManager::m_basic), MakeBooleanChecker ()) diff --git a/src/wifi/model/rraa-wifi-manager.h b/src/wifi/model/rraa-wifi-manager.h index 177f77ee2..bd991bf69 100644 --- a/src/wifi/model/rraa-wifi-manager.h +++ b/src/wifi/model/rraa-wifi-manager.h @@ -76,7 +76,7 @@ public: private: - //overriden from base class + //overridden from base class WifiRemoteStation * DoCreateStation (void) const; void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); @@ -109,7 +109,7 @@ private: */ uint8_t GetMaxRate (RraaWifiRemoteStation *station) const; /** - * Check if the counter should be resetted. + * Check if the counter should be reset. * * \param station */ diff --git a/src/wifi/model/rrpaa-wifi-manager.h b/src/wifi/model/rrpaa-wifi-manager.h index c0cb90b5d..2e3d26cfe 100644 --- a/src/wifi/model/rrpaa-wifi-manager.h +++ b/src/wifi/model/rrpaa-wifi-manager.h @@ -98,7 +98,7 @@ public: int64_t AssignStreams (int64_t stream); private: - //overriden from base class + //overridden from base class virtual WifiRemoteStation * DoCreateStation (void) const; virtual void DoReportRxOk (WifiRemoteStation *station, double rxSnr, WifiMode txMode); @@ -123,7 +123,7 @@ private: void CheckInit (RrpaaWifiRemoteStation *station); /** - * Check if the counter should be reseted. + * Check if the counter should be reset. * * \param station */ diff --git a/src/wifi/model/sta-wifi-mac.h b/src/wifi/model/sta-wifi-mac.h index 30e06fbc4..f5181edc6 100644 --- a/src/wifi/model/sta-wifi-mac.h +++ b/src/wifi/model/sta-wifi-mac.h @@ -236,7 +236,7 @@ private: void StartScanning (void); /** * This method is called after wait beacon timeout or wait probe request timeout has - * occured. This will trigger association process from beacons or probe responses + * occurred. This will trigger association process from beacons or probe responses * gathered while scanning. */ void ScanningTimeout (void); diff --git a/src/wifi/model/supported-rates.h b/src/wifi/model/supported-rates.h index 9e1c5d790..e52e71ee6 100644 --- a/src/wifi/model/supported-rates.h +++ b/src/wifi/model/supported-rates.h @@ -247,7 +247,7 @@ public: * extended. */ friend class ExtendedSupportedRatesIE; - ExtendedSupportedRatesIE extended; //!< extended suppoted rates info element + ExtendedSupportedRatesIE extended; //!< extended supported rates info element private: diff --git a/src/wifi/model/wifi-phy-listener.h b/src/wifi/model/wifi-phy-listener.h index 23c0d9464..ef5fe41e7 100644 --- a/src/wifi/model/wifi-phy-listener.h +++ b/src/wifi/model/wifi-phy-listener.h @@ -72,7 +72,7 @@ public: * We are about to send the first bit of the packet. * We do not send any event to notify the end of * transmission. Listeners should assume that the - * channel implicitely reverts to the idle state + * channel implicitly reverts to the idle state * unless they have received a cca busy report. */ virtual void NotifyTxStart (Time duration, double txPowerDbm) = 0; @@ -97,7 +97,7 @@ public: * * We do not send any event to notify the end of * channel switching. Listeners should assume that the - * channel implicitely reverts to the idle or busy states. + * channel implicitly reverts to the idle or busy states. */ virtual void NotifySwitchingStart (Time duration) = 0; /** diff --git a/src/wifi/model/wifi-phy.cc b/src/wifi/model/wifi-phy.cc index ca83085ff..7f9c89743 100644 --- a/src/wifi/model/wifi-phy.cc +++ b/src/wifi/model/wifi-phy.cc @@ -2285,7 +2285,7 @@ WifiPhy::SendPacket (Ptr packet, WifiTxVector txVector, MpduType m << +txVector.GetTxPowerLevel () << +mpdutype); /* Transmission can happen if: - * - we are syncing on a packet. It is the responsability of the + * - we are syncing on a packet. It is the responsibility of the * MAC layer to avoid doing this but the PHY does nothing to * prevent it. * - we are idle diff --git a/src/wifi/model/wifi-phy.h b/src/wifi/model/wifi-phy.h index e6e0958c7..42a97d792 100644 --- a/src/wifi/model/wifi-phy.h +++ b/src/wifi/model/wifi-phy.h @@ -1188,7 +1188,7 @@ public: * The energy of a received signal should be higher than * this threshold (dbm) to allow the PHY layer to detect the signal. * - * \param threshold the energy detction threshold in dBm + * \param threshold the energy detection threshold in dBm */ void SetEdThreshold (double threshold); /** diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc index 2e3377f1d..b1b52a1c5 100644 --- a/src/wifi/model/wifi-remote-station-manager.cc +++ b/src/wifi/model/wifi-remote-station-manager.cc @@ -435,7 +435,7 @@ WifiRemoteStationManager::SetupPhy (const Ptr phy) NS_LOG_FUNCTION (this << phy); //We need to track our PHY because it is the object that knows the //full set of transmit rates that are supported. We need to know - //this in order to find the relevant mandatory rates when chosing a + //this in order to find the relevant mandatory rates when choosing a //transmit rate for automatic control responses like //acknowledgements. m_wifiPhy = phy; diff --git a/src/wifi/model/wifi-remote-station-manager.h b/src/wifi/model/wifi-remote-station-manager.h index 12a1ed7f5..63020d6b9 100644 --- a/src/wifi/model/wifi-remote-station-manager.h +++ b/src/wifi/model/wifi-remote-station-manager.h @@ -78,7 +78,7 @@ private: double CalculateAveragingCoefficient (); /// averaging coefficient depends on the memory time Time m_memoryTime; - /// when last update has occured + /// when last update has occurred Time m_lastUpdate; /// moving percentage of failed frames double m_failAvg; @@ -520,7 +520,7 @@ public: */ void AddAllSupportedMcs (Mac48Address address); /** - * Invoked in a STA or AP to delete all of the suppported MCS by a destination. + * Invoked in a STA or AP to delete all of the supported MCS by a destination. * * \param address the address of the station being recorded */ diff --git a/src/wifi/model/yans-error-rate-model.h b/src/wifi/model/yans-error-rate-model.h index 111f3ae4e..3149c7d1c 100644 --- a/src/wifi/model/yans-error-rate-model.h +++ b/src/wifi/model/yans-error-rate-model.h @@ -39,7 +39,7 @@ namespace ns3 { * * The 802.11b modulations: * - 1 Mbps mode is based on DBPSK. BER is from equation 5.2-69 from John G. Proakis - * Digitial Communications, 2001 edition + * Digital Communications, 2001 edition * - 2 Mbps model is based on DQPSK. Equation 8 from "Tight bounds and accurate * approximations for dqpsk transmission bit error rate", G. Ferrari and G.E. Corazza * ELECTRONICS LETTERS, 40(20):1284-1285, September 2004 diff --git a/src/wifi/test/channel-access-manager-test.cc b/src/wifi/test/channel-access-manager-test.cc index 2918a0057..31c1ed081 100644 --- a/src/wifi/test/channel-access-manager-test.cc +++ b/src/wifi/test/channel-access-manager-test.cc @@ -710,7 +710,7 @@ ChannelAccessManagerTest::DoRun (void) ExpectCollision (30, 4, 0); //backoff: 4 slots EndTest (); - // Test an EIFS which is interupted by a successfull transmission. + // Test an EIFS which is interrupted by a successful transmission. // // 20 60 66 69 75 81 85 89 93 97 101 103 // | rx | sifs | | rx | sifs | aifsn | bslot0 | bslot1 | bslot2 | bslot3 | tx | diff --git a/src/wifi/test/power-rate-adaptation-test.cc b/src/wifi/test/power-rate-adaptation-test.cc index dfd3484db..3cc1e140d 100644 --- a/src/wifi/test/power-rate-adaptation-test.cc +++ b/src/wifi/test/power-rate-adaptation-test.cc @@ -539,7 +539,7 @@ PowerRateAdaptationTest::TestAparf () /* * As we are in state High we need 3 successful transmissions to increase rate or decrease power. - * After 10 power changes critical rate is reseted. + * After 10 power changes critical rate is reset. * So after 10*3 successful transmissions critical rate is set to 0. * And 3 successful transmissions more will make power increase to maximum and rate increase to the critical rate. */ diff --git a/src/wimax/doc/wimax.rst b/src/wimax/doc/wimax.rst index 2f811420b..93ab437ab 100644 --- a/src/wimax/doc/wimax.rst +++ b/src/wimax/doc/wimax.rst @@ -458,7 +458,7 @@ generate trace files used by the reception process to evaluate if a FEC block can be correctly decoded or not. Transmission Process: A burst is a set of WiMAX MAC PDUs. At the sending -process, a burst is converted into bit-streams and then splitted into smaller +process, a burst is converted into bit-streams and then split into smaller FEC blocks which are then sent to the channel with a power equal P_tx. Reception Process: The reception process includes the following operations: diff --git a/src/wimax/model/bandwidth-manager.h b/src/wimax/model/bandwidth-manager.h index d272f76b8..e669094e9 100644 --- a/src/wimax/model/bandwidth-manager.h +++ b/src/wimax/model/bandwidth-manager.h @@ -109,7 +109,7 @@ private: BandwidthManager& operator= (const BandwidthManager &); Ptr m_device; ///< the device - uint16_t m_nrBwReqsSent; ///< bandwith requests sent + uint16_t m_nrBwReqsSent; ///< bandwidth requests sent }; } // namespace ns3 diff --git a/src/wimax/model/bs-net-device.cc b/src/wimax/model/bs-net-device.cc index 16691e972..fb4d693bc 100644 --- a/src/wimax/model/bs-net-device.cc +++ b/src/wimax/model/bs-net-device.cc @@ -686,7 +686,7 @@ BaseStationNetDevice::DoReceive (Ptr packet) LlcSnapHeader llc; Ptr connection = 0; FragmentationSubheader fragSubhdr; - bool fragmentation = false; // it becames true when there is a fragmentation subheader + bool fragmentation = false; // it becomes true when there is a fragmentation subheader packet->RemoveHeader (gnrcMacHdr); if (gnrcMacHdr.GetHt () == MacHeaderType::HEADER_TYPE_GENERIC) diff --git a/src/wimax/model/bs-scheduler-rtps.h b/src/wimax/model/bs-scheduler-rtps.h index 3f0d49579..8387e526a 100644 --- a/src/wimax/model/bs-scheduler-rtps.h +++ b/src/wimax/model/bs-scheduler-rtps.h @@ -84,7 +84,7 @@ public: /** * \brief This function adds a downlink burst to the list of downlink bursts * scheduled for the next downlink sub-frame - * \param connection a pointer to connection in wich the burst will be sent + * \param connection a pointer to connection in which the burst will be sent * \param diuc downlink iuc * \param modulationType the modulation type of the burst * \param burst the downlink burst to add to the downlink sub frame @@ -98,7 +98,7 @@ public: /** * \brief Check for IR and Broadcast connections that have packets to transmit. * \param connection will point to a initial ranging or broadcast connection - * wich have packets to transmit + * which have packets to transmit * \returns false if no initial ranging or broadcast connection has packets * to transmit, true otherwise */ @@ -106,7 +106,7 @@ public: /** * \brief Check for Basic and Primary connections that have packets to transmit. * \param connection will point to a basic or primary connection - * wich have packets to transmit + * which have packets to transmit * \returns false if no basic or primary connection has packets * to transmit, true otherwise */ diff --git a/src/wimax/model/bs-scheduler-simple.h b/src/wimax/model/bs-scheduler-simple.h index d7abf3132..131054020 100644 --- a/src/wimax/model/bs-scheduler-simple.h +++ b/src/wimax/model/bs-scheduler-simple.h @@ -68,7 +68,7 @@ public: /** * \brief This function adds a downlink burst to the list of downlink bursts * scheduled for the next downlink sub-frame - * \param connection a pointer to connection in wich the burst will be sent + * \param connection a pointer to connection in which the burst will be sent * \param diuc downlink iuc * \param modulationType the modulation type of the burst * \param burst the downlink burst to add to the downlink sub frame diff --git a/src/wimax/model/bs-scheduler.h b/src/wimax/model/bs-scheduler.h index cba8638ac..717534b23 100644 --- a/src/wimax/model/bs-scheduler.h +++ b/src/wimax/model/bs-scheduler.h @@ -68,7 +68,7 @@ public: /** * \brief This function adds a downlink burst to the list of downlink bursts * scheduled for the next downlink sub-frame - * \param connection a pointer to connection in wich the burst will be sent + * \param connection a pointer to connection in which the burst will be sent * \param diuc downlink iuc * \param modulationType the modulation type of the burst * \param burst the downlink burst to add to the downlink sub frame diff --git a/src/wimax/model/bs-uplink-scheduler-mbqos.cc b/src/wimax/model/bs-uplink-scheduler-mbqos.cc index ee7a4f16d..161af1f83 100644 --- a/src/wimax/model/bs-uplink-scheduler-mbqos.cc +++ b/src/wimax/model/bs-uplink-scheduler-mbqos.cc @@ -88,7 +88,7 @@ UplinkSchedulerMBQoS::GetChannelDescriptorsToUpdate (bool &updateDcd, { /* DCD and UCD shall actually be updated when channel or burst profile definitions change. burst profiles are updated based on number of SSs, network conditions and etc. - for now temporarily assuming DCD/UCD shall be updated everytime */ + for now temporarily assuming DCD/UCD shall be updated every time */ uint32_t randNr = rand (); if (randNr % 5 == 0 || GetBs ()->GetNrDcdSent () == 0) diff --git a/src/wimax/model/bs-uplink-scheduler-rtps.cc b/src/wimax/model/bs-uplink-scheduler-rtps.cc index 99b4f22b6..1df7c2de6 100644 --- a/src/wimax/model/bs-uplink-scheduler-rtps.cc +++ b/src/wimax/model/bs-uplink-scheduler-rtps.cc @@ -90,7 +90,7 @@ UplinkSchedulerRtps::GetChannelDescriptorsToUpdate (bool &updateDcd, bool &updat { /*DCD and UCD shall actually be updated when channel or burst profile definitions change. burst profiles are updated based on number of SSs, network conditions and etc. - for now temporarily assuming DCD/UCD shall be updated everytime */ + for now temporarily assuming DCD/UCD shall be updated every time */ uint32_t randNr = rand (); if (randNr % 5 == 0 || GetBs ()->GetNrDcdSent () == 0) diff --git a/src/wimax/model/bs-uplink-scheduler-rtps.h b/src/wimax/model/bs-uplink-scheduler-rtps.h index 6d608c911..e5743dd30 100644 --- a/src/wimax/model/bs-uplink-scheduler-rtps.h +++ b/src/wimax/model/bs-uplink-scheduler-rtps.h @@ -158,7 +158,7 @@ public: * This method represent the UL Scheduler for rtPS connections. * The scheduler is designed to serve all rtPS connections that * have at least one packet to transmit, every UL Subframe. - * The methos selects all rtPS connection that have al least one + * The method selects all rtPS connection that have al least one * packet to transmit. To each rtPS connections are allocated, * at the beginning, the bandwidth to transmit a quota of data equal * to (RequestedBandwidth - GrantedBandwidth). diff --git a/src/wimax/model/bs-uplink-scheduler-simple.cc b/src/wimax/model/bs-uplink-scheduler-simple.cc index 31e55128b..43e55dea8 100644 --- a/src/wimax/model/bs-uplink-scheduler-simple.cc +++ b/src/wimax/model/bs-uplink-scheduler-simple.cc @@ -97,7 +97,7 @@ UplinkSchedulerSimple::GetChannelDescriptorsToUpdate (bool &updateDcd, { /*DCD and UCD shall actually be updated when channel or burst profile definitions change. burst profiles are updated based on number of SSs, network conditions and etc. - for now temporarily assuming DCD/UCD shall be updated everytime */ + for now temporarily assuming DCD/UCD shall be updated every time */ uint32_t randNr = rand (); if (randNr % 5 == 0 || GetBs ()->GetNrDcdSent () == 0) diff --git a/src/wimax/model/connection-manager.h b/src/wimax/model/connection-manager.h index af7059cc0..ace56b0ad 100644 --- a/src/wimax/model/connection-manager.h +++ b/src/wimax/model/connection-manager.h @@ -59,7 +59,7 @@ public: void SetCidFactory (CidFactory *cidFactory); /** * \brief allocates the management connection for an ss record. This method is only used by BS - * \param ssRecord the ss record to wich the management connection will be allocated + * \param ssRecord the ss record to which the management connection will be allocated * \param rngrsp the ranging response message */ void AllocateManagementConnections (SSRecord *ssRecord, RngRsp *rngrsp); diff --git a/src/wimax/model/default-traces.h b/src/wimax/model/default-traces.h index a6cd65650..90651d61b 100644 --- a/src/wimax/model/default-traces.h +++ b/src/wimax/model/default-traces.h @@ -62,7 +62,7 @@ namespace ns3 { * ... ... ... ... ... ... * * - * Aditional notes: from Esteban Municio + * Additional notes: from Esteban Municio * * This trace file has been edited for the 16 QAM 3/4 modulation (modulation4) since the original SNR traces for * this modulation were not long enough, giving inflated BER and BLER figures for typical SNR values. Due to the impossibility diff --git a/src/wimax/model/dl-mac-messages.h b/src/wimax/model/dl-mac-messages.h index 63094f781..23a3d5101 100644 --- a/src/wimax/model/dl-mac-messages.h +++ b/src/wimax/model/dl-mac-messages.h @@ -68,7 +68,7 @@ public: */ uint16_t GetEirxPIrMax (void) const; /** - * Get frequency functon + * Get frequency function * \returns the frequency */ uint32_t GetFrequency (void) const; @@ -296,7 +296,7 @@ public: void SetFecCodeType (uint8_t fecCodeType); /** - * Get type functon + * Get type function * \returns the type */ uint8_t GetType (void) const; @@ -450,7 +450,7 @@ public: ~OfdmDlMapIe (void); /** - * Set CID functon + * Set CID function * \param cid the CID */ void SetCid (Cid cid); diff --git a/src/wimax/model/ipcs-classifier.h b/src/wimax/model/ipcs-classifier.h index 98f0e37fe..7c3651371 100644 --- a/src/wimax/model/ipcs-classifier.h +++ b/src/wimax/model/ipcs-classifier.h @@ -48,7 +48,7 @@ public: * \brief classify a packet in a service flow * \param packet the packet to classify * \param sfm the service flow manager to be used to classify packets - * \param dir The direction on wich the packet should be sent (UP or DOWN) + * \param dir The direction on which the packet should be sent (UP or DOWN) * \return The service flow that should be used to send this packet */ ServiceFlow * Classify (Ptr packet, Ptr sfm, ServiceFlow::Direction dir); diff --git a/src/wimax/model/service-flow-record.h b/src/wimax/model/service-flow-record.h index 716d08f7d..568ad6528 100644 --- a/src/wimax/model/service-flow-record.h +++ b/src/wimax/model/service-flow-record.h @@ -176,7 +176,7 @@ public: void SetBwSinceLastExpiry (uint32_t bwSinceLastExpiry); /** * \brief update BW since last expiry - * \param bwSinceLastExpiry bandwith since last expiry + * \param bwSinceLastExpiry bandwidth since last expiry */ void UpdateBwSinceLastExpiry (uint32_t bwSinceLastExpiry); /** diff --git a/src/wimax/model/service-flow.h b/src/wimax/model/service-flow.h index 7044dc743..05214423c 100644 --- a/src/wimax/model/service-flow.h +++ b/src/wimax/model/service-flow.h @@ -349,7 +349,7 @@ public: uint16_t GetArqBlockLifeTime (void) const; /** * Get ARQ sync loss - * \returns the ARQ snyc loss value + * \returns the ARQ sync loss value */ uint16_t GetArqSyncLoss (void) const; /** @@ -564,7 +564,7 @@ private: uint32_t m_requestTransmissionPolicy; ///< request transmission policy uint32_t m_toleratedJitter; ///< tolerated jitter uint32_t m_maximumLatency; ///< maximum latency - uint8_t m_fixedversusVariableSduIndicator; ///< fixed versus varaible SDI indicator + uint8_t m_fixedversusVariableSduIndicator; ///< fixed versus variable SDI indicator uint8_t m_sduSize; ///< SDU size uint16_t m_targetSAID; ///< traget SAID uint8_t m_arqEnable; ///< ARQ enable diff --git a/src/wimax/model/simple-ofdm-send-param.h b/src/wimax/model/simple-ofdm-send-param.h index be62b4213..c639ee691 100644 --- a/src/wimax/model/simple-ofdm-send-param.h +++ b/src/wimax/model/simple-ofdm-send-param.h @@ -84,7 +84,7 @@ public: */ void SetIsFirstBlock (bool isFirstBlock); /** - * \param Frequency set the frequency of the channel in wich this fec block will be sent + * \param Frequency set the frequency of the channel in which this fec block will be sent */ void SetFrequency (uint64_t Frequency); /** @@ -135,7 +135,7 @@ public: private: bvec m_fecBlock; ///< FEC block uint32_t m_burstSize; ///< burst size - bool m_isFirstBlock; ///< is frist block + bool m_isFirstBlock; ///< is first block uint64_t m_frequency; ///< frequency WimaxPhy::ModulationType m_modulationType; ///< modulation type uint8_t m_direction; ///< direction diff --git a/src/wimax/model/simple-ofdm-wimax-phy.cc b/src/wimax/model/simple-ofdm-wimax-phy.cc index 387443f55..5b8a2341d 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.cc +++ b/src/wimax/model/simple-ofdm-wimax-phy.cc @@ -914,7 +914,7 @@ SimpleOfdmWimaxPhy::DoGetFrameDuration (uint8_t frameDurationCode) const } /* - Retruns number of blocks (FEC blocks) the burst will be splitted in. + Retruns number of blocks (FEC blocks) the burst will be split in. The size of the block is specific for each modulation type. */ uint16_t diff --git a/src/wimax/model/simple-ofdm-wimax-phy.h b/src/wimax/model/simple-ofdm-wimax-phy.h index f6a5f1be3..869eae753 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.h +++ b/src/wimax/model/simple-ofdm-wimax-phy.h @@ -115,7 +115,7 @@ public: * \brief start the reception of a fec block * \param burstSize the burst size * \param isFirstBlock true if this block is the first one, false otherwise - * \param frequency the frequency in wich the fec block is being received + * \param frequency the frequency in which the fec block is being received * \param modulationType the modulation used to transmit this fec Block * \param direction set to uplink and downlink * \param rxPower the received power. diff --git a/src/wimax/model/snr-to-block-error-rate-manager.h b/src/wimax/model/snr-to-block-error-rate-manager.h index a9b68d3fe..bdaac9da2 100644 --- a/src/wimax/model/snr-to-block-error-rate-manager.h +++ b/src/wimax/model/snr-to-block-error-rate-manager.h @@ -82,7 +82,7 @@ public: */ GetSNRToBlockErrorRateRecord (double SNR, uint8_t modulation); /** - * \brief Loads the traces form the repository specified in the constructor or setted by SetTraceFilePath function. If + * \brief Loads the traces form the repository specified in the constructor or set by SetTraceFilePath function. If * no repository is provided, default traces will be loaded from default-traces.h file */ diff --git a/src/wimax/model/snr-to-block-error-rate-record.h b/src/wimax/model/snr-to-block-error-rate-record.h index d769d0902..14b43b7c6 100644 --- a/src/wimax/model/snr-to-block-error-rate-record.h +++ b/src/wimax/model/snr-to-block-error-rate-record.h @@ -100,7 +100,7 @@ public: void SetI2 (double); private: - double m_snrValue; ///< SNR vaue + double m_snrValue; ///< SNR value double m_bitErrorRate; ///< bit error rate double m_blockErrorRate; ///< block error rate double m_sigma2; ///< sigma2 diff --git a/src/wimax/model/ss-link-manager.cc b/src/wimax/model/ss-link-manager.cc index ace463949..a5a2ffa2f 100644 --- a/src/wimax/model/ss-link-manager.cc +++ b/src/wimax/model/ss-link-manager.cc @@ -441,7 +441,7 @@ SSLinkManager::DeleteUplinkParameters (void) bool SSLinkManager::IsUlChannelUsable (void) { - // dont know how to check if usable, see Figure 58. + // don't know how to check if usable, see Figure 58. return true; // temporarily assuming usable } @@ -466,7 +466,7 @@ SSLinkManager::AdjustRangingParameters (const RngRsp &rngrsp) void SSLinkManager::NegotiateBasicCapabilities (void) { - // code to nagotiate basic capabilites goes here, ignored until very advanced stages + // code to nagotiate basic capabilities goes here, ignored until very advanced stages } uint16_t @@ -490,7 +490,7 @@ SSLinkManager::CalculateMaxIRSignalStrength (void) uint16_t SSLinkManager::GetMinTransmitPowerLevel (void) { - // code to calculate minimum transmit power level of the SS, see page 189 of ammendment + // code to calculate minimum transmit power level of the SS, see page 189 of amendment return 10; // temp } diff --git a/src/wimax/model/ss-link-manager.h b/src/wimax/model/ss-link-manager.h index ca50f0a13..c181c741b 100644 --- a/src/wimax/model/ss-link-manager.h +++ b/src/wimax/model/ss-link-manager.h @@ -114,7 +114,7 @@ public: void SendRangingRequest (uint8_t uiuc, uint16_t allocationSize); /// Start contention resolution void StartContentionResolution (void); - /// Perfrom backoff + /// Perform backoff void PerformBackoff (void); /** * Is UL channel usable diff --git a/src/wimax/model/ss-net-device.cc b/src/wimax/model/ss-net-device.cc index d715d986e..38a5b14ef 100644 --- a/src/wimax/model/ss-net-device.cc +++ b/src/wimax/model/ss-net-device.cc @@ -746,7 +746,7 @@ SubscriberStationNetDevice::DoReceive (Ptr packet) uint32_t pktSize = packet->GetSize (); packet->RemoveHeader (gnrcMacHdr); FragmentationSubheader fragSubhdr; - bool fragmentation = false; // it becames true when there is a fragmentation subheader + bool fragmentation = false; // it becomes true when there is a fragmentation subheader if (gnrcMacHdr.GetHt () == MacHeaderType::HEADER_TYPE_GENERIC) { @@ -1191,7 +1191,7 @@ SubscriberStationNetDevice::ProcessDcd (const Dcd &dcd) m_nrDcdRecvd++; if (dcd.GetConfigurationChangeCount () == GetCurrentDcd ().GetConfigurationChangeCount ()) { - return; // nothing new in DCD so dont read + return; // nothing new in DCD so don't read } SetCurrentDcd (dcd); diff --git a/src/wimax/model/ss-net-device.h b/src/wimax/model/ss-net-device.h index 33fd73c8d..38ca3e099 100644 --- a/src/wimax/model/ss-net-device.h +++ b/src/wimax/model/ss-net-device.h @@ -412,7 +412,7 @@ private: uint16_t m_nrDlMapElements; ///< number DL Map elements uint16_t m_nrUlMapElements; ///< number UL Map elements - Ptr m_basicConnection; ///< basci connection + Ptr m_basicConnection; ///< basic connection Ptr m_primaryConnection; ///< primary connection EventId m_lostDlMapEvent; ///< lost DL map event @@ -430,7 +430,7 @@ private: OfdmUlBurstProfile *m_ulBurstProfile; ///< UL burst profile /*represents the (least robust) modulation type of the SS which it then requests in RNG-REQ and if accepted by BS uses it for receiving and - transmiting. currently it is set by user in simulation script, shall actually be determined based on SS's distance, power, signal etc*/ + transmitting. currently it is set by user in simulation script, shall actually be determined based on SS's distance, power, signal etc*/ WimaxPhy::ModulationType m_modulationType; ///< modulation type bool m_areManagementConnectionsAllocated; ///< are management connections allocated diff --git a/src/wimax/model/ss-record.h b/src/wimax/model/ss-record.h index d277c47e8..8820945c2 100644 --- a/src/wimax/model/ss-record.h +++ b/src/wimax/model/ss-record.h @@ -132,7 +132,7 @@ public: */ WimaxNetDevice::RangingStatus GetRangingStatus (void) const; - /// Enable poll for ranging funtion + /// Enable poll for ranging function void EnablePollForRanging (void); /// Disable poll for ranging void DisablePollForRanging (void); diff --git a/src/wimax/model/ss-scheduler.h b/src/wimax/model/ss-scheduler.h index b84f08691..ee30dc94d 100644 --- a/src/wimax/model/ss-scheduler.h +++ b/src/wimax/model/ss-scheduler.h @@ -70,7 +70,7 @@ public: * \param availableSymbols the available resources in symbols * \param modulationType the used modulation * \param packetType the type of packets to select from - * \param connection the connection from wich packets will be selected + * \param connection the connection from which packets will be selected */ Ptr Schedule (uint16_t availableSymbols, WimaxPhy::ModulationType modulationType, @@ -89,7 +89,7 @@ private: SSScheduler & operator= (const SSScheduler &); /** - * Select connnection + * Select connection * \returns pointer to the wimax connection */ Ptr SelectConnection (void); diff --git a/src/wimax/model/ul-mac-messages.h b/src/wimax/model/ul-mac-messages.h index 345566494..9de945189 100644 --- a/src/wimax/model/ul-mac-messages.h +++ b/src/wimax/model/ul-mac-messages.h @@ -532,7 +532,7 @@ public: /** * Read item * \param start the iterator - * \returns the udpated iterator + * \returns the updated iterator */ Buffer::Iterator Read (Buffer::Iterator start); private: diff --git a/src/wimax/model/wimax-phy.h b/src/wimax/model/wimax-phy.h index 91cc82735..c8db47db6 100644 --- a/src/wimax/model/wimax-phy.h +++ b/src/wimax/model/wimax-phy.h @@ -279,7 +279,7 @@ public: /** * \brief scan a frequency for maximum timeout seconds and call the callback if the frequency can be used * \param frequency the frequency to scan - * \param timeout the timout before considering the channel as unusable + * \param timeout the timeout before considering the channel as unusable * \param callback the function to call if the channel could be used */ void StartScanning (uint64_t frequency, Time timeout, Callback callback); diff --git a/test.py b/test.py index f0e9ab120..7b66a22a7 100755 --- a/test.py +++ b/test.py @@ -159,7 +159,7 @@ def parse_examples_to_run_file( cpp_examples = get_list_from_file(examples_to_run_path, "cpp_examples") for example_name, do_run, do_valgrind_run in cpp_examples: - # Seperate the example name from its arguments. + # Separate the example name from its arguments. example_name_original = example_name example_name_parts = example_name.split(' ', 1) if len(example_name_parts) == 1: @@ -204,7 +204,7 @@ def parse_examples_to_run_file( # python_examples = get_list_from_file(examples_to_run_path, "python_examples") for example_name, do_run in python_examples: - # Seperate the example name from its arguments. + # Separate the example name from its arguments. example_name_parts = example_name.split(' ', 1) if len(example_name_parts) == 1: example_name = example_name_parts[0] @@ -340,7 +340,7 @@ def translate_to_html(results_file, html_file): # # If the suite crashed or is skipped, there is no further information, so just - # delare a new table row with the result (CRASH or SKIP) in it. Looks like: + # declare a new table row with the result (CRASH or SKIP) in it. Looks like: # # +--------+ # | Result | @@ -572,7 +572,7 @@ def sigint_hook(signal, frame): # for relevant configuration items. # # XXX This function pokes around in the waf internal state file. To be a -# little less hacky, we should add a commmand to waf to return this info +# little less hacky, we should add a command to waf to return this info # and use that result. # def read_waf_config(): @@ -733,7 +733,7 @@ def make_paths(): # I added the following to the testpy.supp file for this particular error: # # { -# Supress invalid read size errors in SendPreq() when using HwmpProtocolMac +# Suppress invalid read size errors in SendPreq() when using HwmpProtocolMac # Memcheck:Addr8 # fun:*HwmpProtocolMac*SendPreq* # } @@ -857,7 +857,7 @@ class Job: self.build_path = build_path # - # This is the dispaly name of the job, typically the test suite or example + # This is the display name of the job, typically the test suite or example # name. For example, # # "some-test-suite" or "udp-echo" @@ -1217,7 +1217,7 @@ def run_tests(): # pass. # # The second main use case is when detailed status is requested (with the - # --text or --html options). Typicall this will be text if a developer + # --text or --html options). Typically this will be text if a developer # finds a problem, or HTML for nightly builds. In these cases, an # XML file is written containing the status messages from the test suites. # This file is then read and translated into text or HTML. It is expected @@ -1572,7 +1572,7 @@ def run_tests(): # well together, so we skip them under valgrind. # We go through the trouble of doing all of this # work to report the skipped tests in a consistent - # way throught the output formatter. + # way through the output formatter. # if options.valgrind: job.set_is_skip (True) diff --git a/utils/lcov/genhtml b/utils/lcov/genhtml index d74063a4f..a2f4422b5 100755 --- a/utils/lcov/genhtml +++ b/utils/lcov/genhtml @@ -643,7 +643,7 @@ sub print_overall_rate($$$$$$$$$) # Generate a set of HTML pages from contents of .info file INFO_FILENAME. # Files will be written to the current directory. If provided, test case # descriptions will be read from .tests file TEST_FILENAME and included -# in ouput. +# in output. # # Die on error. # diff --git a/utils/python-unit-tests.py b/utils/python-unit-tests.py index c4f30fd43..3ab1b1fbd 100644 --- a/utils/python-unit-tests.py +++ b/utils/python-unit-tests.py @@ -119,7 +119,7 @@ class TestSimulator(unittest.TestCase): def testTimeNumericOperations(self): """! Test numeric operations - @param self ths object + @param self this object @return none """ self.assertEqual(Seconds(10) + Seconds(5), Seconds(15)) @@ -198,7 +198,7 @@ class TestSimulator(unittest.TestCase): def testIdentity(self): """! Test identify - @param self thsi object + @param self this object @return none """ csma = ns.csma.CsmaNetDevice()