From 8f180a8e49cb34b1ed26deef3b49e1cdfee0f45f Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Wed, 16 Aug 2017 19:13:57 +0300 Subject: [PATCH] lte: spelling fixes --- src/lte/helper/lte-helper.h | 4 ++-- src/lte/model/cqa-ff-mac-scheduler.h | 4 ++-- src/lte/model/epc-s1ap-sap.h | 2 +- src/lte/model/epc-x2-header.h | 8 ++++---- src/lte/model/epc-x2-sap.h | 4 ++-- src/lte/model/eps-bearer.h | 4 ++-- src/lte/model/fdbet-ff-mac-scheduler.h | 6 +++--- src/lte/model/fdmt-ff-mac-scheduler.h | 2 +- src/lte/model/fdtbfq-ff-mac-scheduler.h | 2 +- src/lte/model/lte-amc.h | 2 +- src/lte/model/lte-control-messages.h | 2 +- src/lte/model/lte-enb-component-carrier-manager.h | 2 +- src/lte/model/lte-enb-cphy-sap.h | 2 +- src/lte/model/lte-enb-mac.h | 4 ++-- src/lte/model/lte-ffr-soft-algorithm.h | 2 +- src/lte/model/lte-handover-algorithm.h | 2 +- src/lte/model/lte-harq-phy.h | 14 +++++++------- src/lte/model/lte-rlc-am.h | 2 +- src/lte/model/lte-rlc-sap.h | 2 +- src/lte/model/lte-rrc-sap.h | 10 +++++----- src/lte/model/lte-ue-phy.h | 2 +- src/lte/model/pf-ff-mac-scheduler.h | 2 +- src/lte/model/pss-ff-mac-scheduler.h | 2 +- src/lte/model/rem-spectrum-phy.h | 4 ++-- src/lte/model/rr-ff-mac-scheduler.h | 2 +- src/lte/model/tdbet-ff-mac-scheduler.h | 2 +- src/lte/model/tdmt-ff-mac-scheduler.h | 2 +- src/lte/model/tdtbfq-ff-mac-scheduler.h | 2 +- src/lte/model/tta-ff-mac-scheduler.h | 2 +- src/lte/test/lte-test-cqa-ff-mac-scheduler.cc | 4 ++-- src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc | 4 ++-- src/lte/test/lte-test-pss-ff-mac-scheduler.cc | 4 ++-- src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc | 4 ++-- src/lte/test/test-lte-handover-target.cc | 10 +++++----- 34 files changed, 63 insertions(+), 63 deletions(-) diff --git a/src/lte/helper/lte-helper.h b/src/lte/helper/lte-helper.h index 946a3266a..d10d1d402 100644 --- a/src/lte/helper/lte-helper.h +++ b/src/lte/helper/lte-helper.h @@ -734,7 +734,7 @@ private: */ void DoDeActivateDedicatedEpsBearer (Ptr ueDevice, Ptr enbDevice, uint8_t bearerId); - /// Function that performs a channel model initialization of all componment carriers + /// Function that performs a channel model initialization of all component carriers void ChannelModelInitialization (void); /** @@ -841,7 +841,7 @@ private: * The `UseCa` attribute. If true, Carrier Aggregation is enabled. * Hence, the helper will expect a valid component carrier map * If it is false, the component carrier will be created within the LteHelper - * this is to mantain the backwards compatibility with user script + * this is to maintain the backwards compatibility with user script */ bool m_useCa; diff --git a/src/lte/model/cqa-ff-mac-scheduler.h b/src/lte/model/cqa-ff-mac-scheduler.h index ba895769c..dfa5cc86d 100644 --- a/src/lte/model/cqa-ff-mac-scheduler.h +++ b/src/lte/model/cqa-ff-mac-scheduler.h @@ -375,12 +375,12 @@ private: uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs // HARQ attributes - bool m_harqOn; ///< m_harqOn when false inhibit te HARQ mechanisms (by default active) + bool m_harqOn; ///< m_harqOn when false inhibit the HARQ mechanisms (by default active) std::map m_dlHarqCurrentProcessId; ///< DL HARQ process ID //HARQ status // 0: process Id available diff --git a/src/lte/model/epc-s1ap-sap.h b/src/lte/model/epc-s1ap-sap.h index f7ff7e309..5feb86580 100644 --- a/src/lte/model/epc-s1ap-sap.h +++ b/src/lte/model/epc-s1ap-sap.h @@ -34,7 +34,7 @@ namespace ns3 { /** * \ingroup lte * - * Base class that definces EPC S1-AP Service Access Point (SAP) interface. + * Base class that defines EPC S1-AP Service Access Point (SAP) interface. */ class EpcS1apSap { diff --git a/src/lte/model/epc-x2-header.h b/src/lte/model/epc-x2-header.h index 59cdaaa85..25ea28449 100644 --- a/src/lte/model/epc-x2-header.h +++ b/src/lte/model/epc-x2-header.h @@ -184,7 +184,7 @@ public: void SetBearers (std::vector bearers); /** - * Get UE Aggregrate Max Bit Rate Downlink function + * Get UE Aggregate Max Bit Rate Downlink function * \returns the UE aggregate max bit rate downlink */ uint64_t GetUeAggregateMaxBitRateDownlink () const; @@ -224,8 +224,8 @@ private: uint16_t m_cause; ///< cause uint16_t m_targetCellId; ///< target cell ID uint32_t m_mmeUeS1apId; ///< MME UE S1 AP ID - uint64_t m_ueAggregateMaxBitRateDownlink; ///< aggregrate max bit rate downlink - uint64_t m_ueAggregateMaxBitRateUplink; ///< aggregrate max bit rate upink + uint64_t m_ueAggregateMaxBitRateDownlink; ///< aggregate max bit rate downlink + uint64_t m_ueAggregateMaxBitRateUplink; ///< aggregate max bit rate uplink std::vector m_erabsToBeSetupList; ///< ERAB to be setup list }; @@ -361,7 +361,7 @@ public: /** * Get criticality diagnostics function - * \returns the criticality diagnsotics + * \returns the criticality diagnostics */ uint16_t GetCriticalityDiagnostics () const; /** diff --git a/src/lte/model/epc-x2-sap.h b/src/lte/model/epc-x2-sap.h index d675d578f..329fd32eb 100644 --- a/src/lte/model/epc-x2-sap.h +++ b/src/lte/model/epc-x2-sap.h @@ -181,7 +181,7 @@ public: */ struct CompositeAvailCapacity { - uint16_t cellCapacityClassValue; ///< cell cparacity class value + uint16_t cellCapacityClassValue; ///< cell capacity class value uint16_t capacityValue; ///< capacity value }; @@ -656,7 +656,7 @@ public: virtual void RecvLoadInformation (LoadInformationParams params); /** - * Receive resource status update functiion + * Receive resource status update function * \param params the receive resource status update */ virtual void RecvResourceStatusUpdate (ResourceStatusUpdateParams params); diff --git a/src/lte/model/eps-bearer.h b/src/lte/model/eps-bearer.h index cd77022e5..297329c7a 100644 --- a/src/lte/model/eps-bearer.h +++ b/src/lte/model/eps-bearer.h @@ -33,7 +33,7 @@ namespace ns3 { struct GbrQosInformation { /** - * Default constructor, inizializes member variables to zero or equivalent + * Default constructor, initializes member variables to zero or equivalent */ GbrQosInformation (); @@ -51,7 +51,7 @@ struct GbrQosInformation struct AllocationRetentionPriority { /** - * Default constructor, inizializes member variables to zero or equivalent + * Default constructor, initializes member variables to zero or equivalent */ AllocationRetentionPriority (); uint8_t priorityLevel; ///< 1-15; 1 = highest diff --git a/src/lte/model/fdbet-ff-mac-scheduler.h b/src/lte/model/fdbet-ff-mac-scheduler.h index 8527e5681..80311240d 100644 --- a/src/lte/model/fdbet-ff-mac-scheduler.h +++ b/src/lte/model/fdbet-ff-mac-scheduler.h @@ -135,7 +135,7 @@ private: /** * Csched LC config request function - * \param params the CSched LC config requst parameters + * \param params the CSched LC config request parameters */ void DoCschedLcConfigReq (const struct FfMacCschedSapProvider::CschedLcConfigReqParameters& params); @@ -200,7 +200,7 @@ private: void DoSchedUlTriggerReq (const struct FfMacSchedSapProvider::SchedUlTriggerReqParameters& params); /** - * Sched UL noise inteference request function + * Sched UL noise interference request function * \param params the Sched UL noise interference request parameters */ void DoSchedUlNoiseInterferenceReq (const struct FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters& params); @@ -364,7 +364,7 @@ private: uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs diff --git a/src/lte/model/fdmt-ff-mac-scheduler.h b/src/lte/model/fdmt-ff-mac-scheduler.h index bedac4e30..97f7864a4 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.h +++ b/src/lte/model/fdmt-ff-mac-scheduler.h @@ -357,7 +357,7 @@ private: uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.h b/src/lte/model/fdtbfq-ff-mac-scheduler.h index 3d83c38c1..b57fe3736 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.h +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.h @@ -396,7 +396,7 @@ private: uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs diff --git a/src/lte/model/lte-amc.h b/src/lte/model/lte-amc.h index a298e7f2a..bb3811bf1 100644 --- a/src/lte/model/lte-amc.h +++ b/src/lte/model/lte-amc.h @@ -104,7 +104,7 @@ public: uint8_t rbgSize = 0); /** - * \brief Get a proper CQI for the spectrale efficiency value. + * \brief Get a proper CQI for the spectral efficiency value. * In order to assure a fewer block error rate, the AMC chooses the lower CQI value * for a given spectral efficiency * \param s the spectral efficiency diff --git a/src/lte/model/lte-control-messages.h b/src/lte/model/lte-control-messages.h index 29afec9d6..2a2ac394b 100644 --- a/src/lte/model/lte-control-messages.h +++ b/src/lte/model/lte-control-messages.h @@ -49,7 +49,7 @@ public: * LteEnbPhy::ReceiveLteControlMessageList in order to remove the ones * that has been already handoff by the eNB for avoiding propagation of * spurious messages. When new messaged have to been added, consider to - * update the switch statement implementing teh filtering. + * update the switch statement implementing the filtering. */ enum MessageType { diff --git a/src/lte/model/lte-enb-component-carrier-manager.h b/src/lte/model/lte-enb-component-carrier-manager.h index cb19b927b..216e0e82b 100644 --- a/src/lte/model/lte-enb-component-carrier-manager.h +++ b/src/lte/model/lte-enb-component-carrier-manager.h @@ -172,7 +172,7 @@ protected: std::map > m_ueAttached;//!< The map that contains the rnti, lcid, SAP of the RLC instance std::map > m_rlcLcInstantiated; //!< This map contains logical channel configuration per flow Id (rnti, lcid). - std::map m_enabledComponentCarrier; //!< This map tells for each rnti the number of enabled component carrier.s + std::map m_enabledComponentCarrier; //!< This map tells for each RNTI the number of enabled component carriers. std::map m_ueState; //!< Map of RRC states per UE (rnti, state), e.g. CONNECTED_NORMALLY uint16_t m_noOfComponentCarriers; //!< The number component of carriers that are supported by this eNb. // pointer to RRC object for direct function calls, e.g. when CCM needs to obtain diff --git a/src/lte/model/lte-enb-cphy-sap.h b/src/lte/model/lte-enb-cphy-sap.h index 392c08522..a4e9c3082 100644 --- a/src/lte/model/lte-enb-cphy-sap.h +++ b/src/lte/model/lte-enb-cphy-sap.h @@ -73,7 +73,7 @@ public: virtual void AddUe (uint16_t rnti) = 0; /** - * Remove an UE from the the cell + * Remove an UE from the cell * * \param rnti the UE id relative to this cell */ diff --git a/src/lte/model/lte-enb-mac.h b/src/lte/model/lte-enb-mac.h index aaf9634f4..89dd5a50f 100644 --- a/src/lte/model/lte-enb-mac.h +++ b/src/lte/model/lte-enb-mac.h @@ -64,7 +64,7 @@ class LteEnbMac : public Object friend class EnbMacMemberFfMacCschedSapUser; /// allow EnbMacMemberLteEnbPhySapUser class friend access friend class EnbMacMemberLteEnbPhySapUser; - /// allow MemberLteCcmMacSapProvider class friend ccess + /// allow MemberLteCcmMacSapProvider class friend access friend class MemberLteCcmMacSapProvider; public: @@ -442,7 +442,7 @@ private: }; /** - * map storing as key the random acccess preamble IDs allocated for + * map storing as key the random access preamble IDs allocated for * non-contention based access, and as value the associated info * */ diff --git a/src/lte/model/lte-ffr-soft-algorithm.h b/src/lte/model/lte-ffr-soft-algorithm.h index e02ac6b02..4ba4bd466 100644 --- a/src/lte/model/lte-ffr-soft-algorithm.h +++ b/src/lte/model/lte-ffr-soft-algorithm.h @@ -121,7 +121,7 @@ private: uint8_t m_dlEdgeSubBandOffset; ///< DL edge subband offset uint8_t m_dlEdgeSubBandwidth; ///< DL edge subbandwidth - uint8_t m_ulCommonSubBandwidth; ///< UL commmon subbandwidth + uint8_t m_ulCommonSubBandwidth; ///< UL common subbandwidth uint8_t m_ulEdgeSubBandOffset; ///< UL edge subband offset uint8_t m_ulEdgeSubBandwidth; ///< UL edge subbandwidth diff --git a/src/lte/model/lte-handover-algorithm.h b/src/lte/model/lte-handover-algorithm.h index 909066da7..0cc85f2e2 100644 --- a/src/lte/model/lte-handover-algorithm.h +++ b/src/lte/model/lte-handover-algorithm.h @@ -36,7 +36,7 @@ class LteHandoverManagementSapProvider; * \brief The abstract base class of a handover algorithm that operates using * the Handover Management SAP interface. * - * Handover algorithm receives measurement reports from an eNode RRC instance + * Handover algorithm receives measurement reports from an eNodeB RRC instance * and tells the eNodeB RRC instance when to do a handover. * * This class is an abstract class intended to be inherited by subclasses that diff --git a/src/lte/model/lte-harq-phy.h b/src/lte/model/lte-harq-phy.h index 172038a35..f45ef2bec 100644 --- a/src/lte/model/lte-harq-phy.h +++ b/src/lte/model/lte-harq-phy.h @@ -50,7 +50,7 @@ typedef std::vector HarqProcessInfoList_t; ///< HarqP /** * \ingroup lte * \brief The LteHarqPhy class implements the HARQ functionalities related to PHY layer - *(i.e., decodification buffers for incremental redundancy managment) + *(i.e., decodification buffers for incremental redundancy management) * */ class LteHarqPhy : public SimpleRefCount @@ -67,7 +67,7 @@ public: void SubframeIndication (uint32_t frameNo, uint32_t subframeNo); /** - * \brief Return the cumulated MI of the HARQ procId in case of retranmissions + * \brief Return the cumulated MI of the HARQ procId in case of retransmissions * for DL (asynchronous) * \param harqProcId the HARQ proc id * \param layer layer no. (for MIMO spatial multiplexing) @@ -76,16 +76,16 @@ public: double GetAccumulatedMiDl (uint8_t harqProcId, uint8_t layer); /** - * \brief Return the info of the HARQ procId in case of retranmissions + * \brief Return the info of the HARQ procId in case of retransmissions * for DL (asynchronous) * \param harqProcId the HARQ proc id - * \param layer layer no. (for MIMO spatail multiplexing) + * \param layer layer no. (for MIMO spatial multiplexing) * \return the vector of the info related to HARQ proc Id */ HarqProcessInfoList_t GetHarqProcessInfoDl (uint8_t harqProcId, uint8_t layer); /** - * \brief Return the cumulated MI of the HARQ procId in case of retranmissions + * \brief Return the cumulated MI of the HARQ procId in case of retransmissions * for UL (synchronous) * \param rnti the RNTI of the transmitter * \return the MI accumulated @@ -93,7 +93,7 @@ public: double GetAccumulatedMiUl (uint16_t rnti); /** - * \brief Return the info of the HARQ procId in case of retranmissions + * \brief Return the info of the HARQ procId in case of retransmissions * for UL (asynchronous) * \param rnti the RNTI of the transmitter * \param harqProcId the HARQ proc id @@ -105,7 +105,7 @@ public: * \brief Update the Info associated to the decodification of an HARQ process * for DL (asynchronous) * \param id the HARQ proc id - * \param layer layer no. (for MIMO spatail multiplexing) + * \param layer layer no. (for MIMO spatial multiplexing) * \param mi the new MI * \param infoBytes the no. of bytes of info * \param codeBytes the total no. of bytes txed diff --git a/src/lte/model/lte-rlc-am.h b/src/lte/model/lte-rlc-am.h index fdd42958e..383c64332 100644 --- a/src/lte/model/lte-rlc-am.h +++ b/src/lte/model/lte-rlc-am.h @@ -197,7 +197,7 @@ private: uint16_t m_pollPdu; ///< poll PDU uint16_t m_pollByte; ///< poll byte - bool m_txOpportunityForRetxAlwaysBigEnough; ///< transmit opportinity for retransmit? + bool m_txOpportunityForRetxAlwaysBigEnough; ///< transmit opportunity for retransmit? bool m_pollRetransmitTimerJustExpired; ///< poll retransmit timer just expired? /** diff --git a/src/lte/model/lte-rlc-sap.h b/src/lte/model/lte-rlc-sap.h index 7e23cc2f7..8b42fcc22 100644 --- a/src/lte/model/lte-rlc-sap.h +++ b/src/lte/model/lte-rlc-sap.h @@ -62,7 +62,7 @@ public: * See 3GPP 36.322 Radio Link Control (RLC) protocol specification * * This is the RLC SAP User - * (i.e. the part of the SAP that contains the PDCP methos called by the RLC) + * (i.e. the part of the SAP that contains the PDCP methods called by the RLC) */ class LteRlcSapUser { diff --git a/src/lte/model/lte-rrc-sap.h b/src/lte/model/lte-rrc-sap.h index 106c343b2..5e4abc4d1 100644 --- a/src/lte/model/lte-rrc-sap.h +++ b/src/lte/model/lte-rrc-sap.h @@ -504,7 +504,7 @@ public: RESET } type; ///< action type MobilityStateParameters mobilityStateParameters; ///< mobility state parameters - SpeedStateScaleFactors timeToTriggerSf; ///< time to triffer scale factors + SpeedStateScaleFactors timeToTriggerSf; ///< time to trigger scale factors }; /// MeasConfig structure @@ -522,8 +522,8 @@ public: MeasGapConfig measGapConfig; ///< measure gap config bool haveSmeasure; ///< have S measure? uint8_t sMeasure; ///< S measure - bool haveSpeedStatePars; ///< have speed state pars? - SpeedStatePars speedStatePars; ///< spped state pars + bool haveSpeedStatePars; ///< have speed state parameters? + SpeedStatePars speedStatePars; ///< speed state parameters }; /// CarrierFreqEutra structure @@ -787,7 +787,7 @@ public: bool haveUlConfiguration; ///< have UL configuration? bool haveAntennaInfoUlDedicated; ///< have antenna info UL dedicated? AntennaInfoDedicated antennaInfoUl; ///< antenna info UL - PuschConfigDedicatedSCell pushConfigDedicatedSCell; ///< PUSCH configu dedicated SCell + PuschConfigDedicatedSCell pushConfigDedicatedSCell; ///< PUSCH config dedicated SCell UlPowerControlDedicatedSCell ulPowerControlDedicatedSCell; ///< UL power control dedicated SCell bool haveSoundingRsUlConfigDedicated; ///< have sounding RS UL config dedicated? SoundingRsUlConfigDedicated soundingRsUlConfigDedicated; ///< sounding RS UL config dedicated @@ -813,7 +813,7 @@ public: { uint32_t sCellIndex; ///< SCell index CellIdentification cellIdentification; ///< cell identification - RadioResourceConfigCommonSCell radioResourceConfigCommonSCell; ///< radio resurce config common SCell + RadioResourceConfigCommonSCell radioResourceConfigCommonSCell; ///< radio resource config common SCell bool haveRadioResourceConfigDedicatedSCell; ///< have radio resource config dedicated SCell? RadioResourceConfigDedicatedSCell radioResourceConfigDedicateSCell; ///< radio resource config dedicated SCell }; diff --git a/src/lte/model/lte-ue-phy.h b/src/lte/model/lte-ue-phy.h index c0227fa58..36fe46098 100644 --- a/src/lte/model/lte-ue-phy.h +++ b/src/lte/model/lte-ue-phy.h @@ -519,7 +519,7 @@ private: /// \todo Can be removed. uint8_t m_subframeNo; - bool m_rsReceivedPowerUpdated; ///< RS reveive power updated? + bool m_rsReceivedPowerUpdated; ///< RS receive power updated? SpectrumValue m_rsReceivedPower; ///< RS receive power bool m_rsInterferencePowerUpdated; ///< RS interference power updated? diff --git a/src/lte/model/pf-ff-mac-scheduler.h b/src/lte/model/pf-ff-mac-scheduler.h index bcff993d9..07398886d 100644 --- a/src/lte/model/pf-ff-mac-scheduler.h +++ b/src/lte/model/pf-ff-mac-scheduler.h @@ -381,7 +381,7 @@ private: uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs diff --git a/src/lte/model/pss-ff-mac-scheduler.h b/src/lte/model/pss-ff-mac-scheduler.h index 8078246f4..b6c3405db 100644 --- a/src/lte/model/pss-ff-mac-scheduler.h +++ b/src/lte/model/pss-ff-mac-scheduler.h @@ -389,7 +389,7 @@ private: uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs diff --git a/src/lte/model/rem-spectrum-phy.h b/src/lte/model/rem-spectrum-phy.h index 8a90a1a75..b8444a766 100644 --- a/src/lte/model/rem-spectrum-phy.h +++ b/src/lte/model/rem-spectrum-phy.h @@ -37,7 +37,7 @@ namespace ns3 { /** * - * This minimal SpectrumPhy implemetation calculates the SINR with + * This minimal SpectrumPhy implementation calculates the SINR with * respect to the strongest signal for a given point. The original * purpose of this class is to be used to generate a * Radio Environment Map (REM) by locating several instances in a grid @@ -45,7 +45,7 @@ namespace ns3 { * amount of time. * * The assumption on which this class works is that the system - * being considered is an infrastructured radio access network using + * being considered is an infrastructure radio access network using * FDD, hence all signals will be transmitted simultaneously. */ class RemSpectrumPhy : public SpectrumPhy diff --git a/src/lte/model/rr-ff-mac-scheduler.h b/src/lte/model/rr-ff-mac-scheduler.h index fb1979a69..79705b7c2 100644 --- a/src/lte/model/rr-ff-mac-scheduler.h +++ b/src/lte/model/rr-ff-mac-scheduler.h @@ -318,7 +318,7 @@ private: uint16_t m_nextRntiDl; ///< RNTI of the next user to be served next scheduling in DL uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs diff --git a/src/lte/model/tdbet-ff-mac-scheduler.h b/src/lte/model/tdbet-ff-mac-scheduler.h index 96f04f54a..5e8809e01 100644 --- a/src/lte/model/tdbet-ff-mac-scheduler.h +++ b/src/lte/model/tdbet-ff-mac-scheduler.h @@ -360,7 +360,7 @@ private: uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs diff --git a/src/lte/model/tdmt-ff-mac-scheduler.h b/src/lte/model/tdmt-ff-mac-scheduler.h index cfe98a7a8..da6a982fc 100644 --- a/src/lte/model/tdmt-ff-mac-scheduler.h +++ b/src/lte/model/tdmt-ff-mac-scheduler.h @@ -349,7 +349,7 @@ private: uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.h b/src/lte/model/tdtbfq-ff-mac-scheduler.h index 4815cccf1..def8d0091 100644 --- a/src/lte/model/tdtbfq-ff-mac-scheduler.h +++ b/src/lte/model/tdtbfq-ff-mac-scheduler.h @@ -364,7 +364,7 @@ private: uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs diff --git a/src/lte/model/tta-ff-mac-scheduler.h b/src/lte/model/tta-ff-mac-scheduler.h index 54736fdbf..67feca9b0 100644 --- a/src/lte/model/tta-ff-mac-scheduler.h +++ b/src/lte/model/tta-ff-mac-scheduler.h @@ -349,7 +349,7 @@ private: uint16_t m_nextRntiUl; ///< RNTI of the next user to be served next scheduling in UL - uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI canbe considered valid + uint32_t m_cqiTimersThreshold; ///< # of TTIs for which a CQI can be considered valid std::map m_uesTxMode; ///< txMode of the UEs diff --git a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc index 0b49bc98d..a82d300e1 100644 --- a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc @@ -313,7 +313,7 @@ LenaCqaFfMacSchedulerTestCase1::DoRun (void) //Config::SetDefault ("ns3::LteEnbRrc::EpsBearerToRlcMapping", EnumValue (LteHelper::RLC_UM_ALWAYS)); // LogComponentDisableAll (LOG_LEVEL_ALL); - //LogComponentEnable ("LenaTestCqaFfMacCheduler", LOG_LEVEL_ALL); + //LogComponentEnable ("LenaTestCqaFfMacScheduler", LOG_LEVEL_ALL); lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); @@ -550,7 +550,7 @@ LenaCqaFfMacSchedulerTestCase2::DoRun (void) // LogComponentDisableAll (LOG_LEVEL_ALL); - //LogComponentEnable ("LenaTestCqaFfMacCheduler", LOG_LEVEL_ALL); + //LogComponentEnable ("LenaTestCqaFfMacScheduler", LOG_LEVEL_ALL); lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); diff --git a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc index 501b7f148..23a8a9454 100644 --- a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc @@ -309,7 +309,7 @@ LenaFdTbfqFfMacSchedulerTestCase1::DoRun (void) //Config::SetDefault ("ns3::LteEnbRrc::EpsBearerToRlcMapping", EnumValue (LteHelper::RLC_UM_ALWAYS)); // LogComponentDisableAll (LOG_LEVEL_ALL); - //LogComponentEnable ("LenaTestFdTbfqFfMacCheduler", LOG_LEVEL_ALL); + //LogComponentEnable ("LenaTestFdTbfqFfMacScheduler", LOG_LEVEL_ALL); lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); @@ -549,7 +549,7 @@ LenaFdTbfqFfMacSchedulerTestCase2::DoRun (void) // LogComponentDisableAll (LOG_LEVEL_ALL); - //LogComponentEnable ("LenaTestFdTbfqFfMacCheduler", LOG_LEVEL_ALL); + //LogComponentEnable ("LenaTestFdTbfqFfMacScheduler", LOG_LEVEL_ALL); lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); diff --git a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc index 6871384c8..fe8d1a1b5 100644 --- a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc @@ -310,7 +310,7 @@ LenaPssFfMacSchedulerTestCase1::DoRun (void) //Config::SetDefault ("ns3::LteEnbRrc::EpsBearerToRlcMapping", EnumValue (LteHelper::RLC_UM_ALWAYS)); // LogComponentDisableAll (LOG_LEVEL_ALL); - //LogComponentEnable ("LenaTestPssFfMacCheduler", LOG_LEVEL_ALL); + //LogComponentEnable ("LenaTestPssFfMacScheduler", LOG_LEVEL_ALL); lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); @@ -550,7 +550,7 @@ LenaPssFfMacSchedulerTestCase2::DoRun (void) // LogComponentDisableAll (LOG_LEVEL_ALL); - //LogComponentEnable ("LenaTestPssFfMacCheduler", LOG_LEVEL_ALL); + //LogComponentEnable ("LenaTestPssFfMacScheduler", LOG_LEVEL_ALL); lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); diff --git a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc index bb84dfccb..c47f52b28 100644 --- a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc @@ -309,7 +309,7 @@ LenaTdTbfqFfMacSchedulerTestCase1::DoRun (void) //Config::SetDefault ("ns3::LteEnbRrc::EpsBearerToRlcMapping", EnumValue (LteHelper::RLC_UM_ALWAYS)); // LogComponentDisableAll (LOG_LEVEL_ALL); - //LogComponentEnable ("LenaTestTdTbfqFfMacCheduler", LOG_LEVEL_ALL); + //LogComponentEnable ("LenaTestTdTbfqFfMacScheduler", LOG_LEVEL_ALL); lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); @@ -549,7 +549,7 @@ LenaTdTbfqFfMacSchedulerTestCase2::DoRun (void) // LogComponentDisableAll (LOG_LEVEL_ALL); - //LogComponentEnable ("LenaTestTdTbfqFfMacCheduler", LOG_LEVEL_ALL); + //LogComponentEnable ("LenaTestTdTbfqFfMacScheduler", LOG_LEVEL_ALL); lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); diff --git a/src/lte/test/test-lte-handover-target.cc b/src/lte/test/test-lte-handover-target.cc index a717f2727..013532c4a 100644 --- a/src/lte/test/test-lte-handover-target.cc +++ b/src/lte/test/test-lte-handover-target.cc @@ -135,11 +135,11 @@ private: uint8_t m_gridSizeX; ///< X grid size uint8_t m_gridSizeY; ///< Y grid size uint16_t m_sourceCellId; ///< source cell ID - uint16_t m_targetCellId; ///< target celll ID + uint16_t m_targetCellId; ///< target cell ID std::string m_handoverAlgorithmType; ///< handover algorithm type Ptr m_sourceEnbDev; ///< source ENB device - bool m_hasHandoverOccurred; ///< has handover occured? + bool m_hasHandoverOccurred; ///< has handover occurred? }; // end of class LteHandoverTargetTestCase @@ -191,11 +191,11 @@ LteHandoverTargetTestCase::HandoverStartCallback (std::string context, uint64_t uint64_t timeNowMs = Simulator::Now ().GetMilliSeconds (); NS_TEST_ASSERT_MSG_GT (timeNowMs, 500, - "Handover occured but too early"); + "Handover occurred but too early"); NS_TEST_ASSERT_MSG_EQ (sourceCellId, m_sourceCellId, - "Handover occured but with wrong source cell"); + "Handover occurred but with wrong source cell"); NS_TEST_ASSERT_MSG_EQ (targetCellId, m_targetCellId, - "Handover occured but with wrong target cell"); + "Handover occurred but with wrong target cell"); m_hasHandoverOccurred = true; }