lte: spelling fixes
This commit is contained in:
@@ -734,7 +734,7 @@ private:
|
||||
*/
|
||||
void DoDeActivateDedicatedEpsBearer (Ptr<NetDevice> ueDevice, Ptr<NetDevice> 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;
|
||||
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> 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 <uint16_t, uint8_t> m_dlHarqCurrentProcessId; ///< DL HARQ process ID
|
||||
//HARQ status
|
||||
// 0: process Id available
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -184,7 +184,7 @@ public:
|
||||
void SetBearers (std::vector <EpcX2Sap::ErabToBeSetupItem> 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 <EpcX2Sap::ErabToBeSetupItem> 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;
|
||||
/**
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> m_uesTxMode; ///< txMode of the UEs
|
||||
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> m_uesTxMode; ///< txMode of the UEs
|
||||
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> m_uesTxMode; ///< txMode of the UEs
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -172,7 +172,7 @@ protected:
|
||||
|
||||
std::map <uint16_t, std::map<uint8_t, LteMacSapUser*> > m_ueAttached;//!< The map that contains the rnti, lcid, SAP of the RLC instance
|
||||
std::map <uint16_t, std::map<uint8_t, LteEnbCmacSapProvider::LcInfo> > m_rlcLcInstantiated; //!< This map contains logical channel configuration per flow Id (rnti, lcid).
|
||||
std::map <uint16_t, uint8_t> m_enabledComponentCarrier; //!< This map tells for each rnti the number of enabled component carrier.s
|
||||
std::map <uint16_t, uint8_t> m_enabledComponentCarrier; //!< This map tells for each RNTI the number of enabled component carriers.
|
||||
std::map <uint16_t, uint8_t> 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
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
@@ -64,7 +64,7 @@ class LteEnbMac : public Object
|
||||
friend class EnbMacMemberFfMacCschedSapUser;
|
||||
/// allow EnbMacMemberLteEnbPhySapUser class friend access
|
||||
friend class EnbMacMemberLteEnbPhySapUser;
|
||||
/// allow MemberLteCcmMacSapProvider<LteEnbMac> class friend ccess
|
||||
/// allow MemberLteCcmMacSapProvider<LteEnbMac> class friend access
|
||||
friend class MemberLteCcmMacSapProvider<LteEnbMac>;
|
||||
|
||||
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
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -50,7 +50,7 @@ typedef std::vector <HarqProcessInfoElement_t> 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<LteHarqPhy>
|
||||
@@ -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
|
||||
|
||||
@@ -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?
|
||||
|
||||
/**
|
||||
|
||||
@@ -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
|
||||
{
|
||||
|
||||
@@ -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
|
||||
};
|
||||
|
||||
@@ -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?
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> m_uesTxMode; ///< txMode of the UEs
|
||||
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> m_uesTxMode; ///< txMode of the UEs
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> m_uesTxMode; ///< txMode of the UEs
|
||||
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> m_uesTxMode; ///< txMode of the UEs
|
||||
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> m_uesTxMode; ///< txMode of the UEs
|
||||
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> m_uesTxMode; ///< txMode of the UEs
|
||||
|
||||
|
||||
@@ -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 <uint16_t,uint8_t> m_uesTxMode; ///< txMode of the UEs
|
||||
|
||||
|
||||
@@ -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"));
|
||||
|
||||
|
||||
@@ -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"));
|
||||
|
||||
|
||||
@@ -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"));
|
||||
|
||||
|
||||
@@ -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"));
|
||||
|
||||
|
||||
@@ -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<LteEnbNetDevice> 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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user