F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lte: rename m_fadingModule to m_fadingModel

Browse Source
This commit is contained in:
Alexander Krotov
2019-02-28 12:23:23 +03:00
parent 6eae98fbca
commit bddff8ee90
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lte/helper/lte-helper.cc
View File

@@ -261,10 +261,10 @@ LteHelper::ChannelModelInitialization (void)
}
if (!m_fadingModelType.empty ())
{
m_fadingModule = m_fadingModelFactory.Create<SpectrumPropagationLossModel> ();
m_fadingModule->Initialize ();
m_downlinkChannel->AddSpectrumPropagationLossModel (m_fadingModule);
m_uplinkChannel->AddSpectrumPropagationLossModel (m_fadingModule);
m_fadingModel = m_fadingModelFactory.Create<SpectrumPropagationLossModel> ();
m_fadingModel->Initialize ();
m_downlinkChannel->AddSpectrumPropagationLossModel (m_fadingModel);
m_uplinkChannel->AddSpectrumPropagationLossModel (m_fadingModel);
}
}
@@ -1443,9 +1443,9 @@ int64_t
LteHelper::AssignStreams (NetDeviceContainer c, int64_t stream)
{
int64_t currentStream = stream;
if ((m_fadingModule != 0) && (m_fadingStreamsAssigned == false))
if ((m_fadingModel != 0) && (m_fadingStreamsAssigned == false))
{
Ptr<TraceFadingLossModel> tflm = m_fadingModule->GetObject<TraceFadingLossModel> ();
Ptr<TraceFadingLossModel> tflm = m_fadingModel->GetObject<TraceFadingLossModel> ();
if (tflm != 0)
{
currentStream += tflm->AssignStreams (currentStream);

2
src/lte/helper/lte-helper.h
View File

@@ -770,7 +770,7 @@ private:
/// Factory of fading model object for both the downlink and uplink channels.
ObjectFactory m_fadingModelFactory;
/// The fading model used in both the downlink and uplink channels.
Ptr<SpectrumPropagationLossModel> m_fadingModule;
Ptr<SpectrumPropagationLossModel> m_fadingModel;
/**
* True if a random variable stream number has been assigned for the fading
* model. Used to prevent such assignment to be done more than once.