From bddff8ee9011b6aaca01e0ae53229ba50819cec4 Mon Sep 17 00:00:00 2001 From: Alexander Krotov Date: Thu, 28 Feb 2019 12:23:23 +0300 Subject: [PATCH] lte: rename m_fadingModule to m_fadingModel --- src/lte/helper/lte-helper.cc | 12 ++++++------ src/lte/helper/lte-helper.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc index 9f9fe0903..dde823e4b 100644 --- a/src/lte/helper/lte-helper.cc +++ b/src/lte/helper/lte-helper.cc @@ -261,10 +261,10 @@ LteHelper::ChannelModelInitialization (void) } if (!m_fadingModelType.empty ()) { - m_fadingModule = m_fadingModelFactory.Create (); - m_fadingModule->Initialize (); - m_downlinkChannel->AddSpectrumPropagationLossModel (m_fadingModule); - m_uplinkChannel->AddSpectrumPropagationLossModel (m_fadingModule); + m_fadingModel = m_fadingModelFactory.Create (); + 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 tflm = m_fadingModule->GetObject (); + Ptr tflm = m_fadingModel->GetObject (); if (tflm != 0) { currentStream += tflm->AssignStreams (currentStream); diff --git a/src/lte/helper/lte-helper.h b/src/lte/helper/lte-helper.h index d5ac6d1f2..cb3700ce0 100644 --- a/src/lte/helper/lte-helper.h +++ b/src/lte/helper/lte-helper.h @@ -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 m_fadingModule; + Ptr 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.