From 933f5583465b6992c9017da18cea52752ef0aaf2 Mon Sep 17 00:00:00 2001 From: Nicola Baldo Date: Fri, 18 Nov 2011 18:02:29 +0100 Subject: [PATCH] fixed some leftover PropagationModel -> Pathloss naming issues in LenaHelper --- src/lte/helper/lena-helper.cc | 46 +++++++++++++++++------------------ src/lte/helper/lena-helper.h | 16 ++++++------ 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/lte/helper/lena-helper.cc b/src/lte/helper/lena-helper.cc index 2fa4827fb..45025910a 100644 --- a/src/lte/helper/lena-helper.cc +++ b/src/lte/helper/lena-helper.cc @@ -62,8 +62,8 @@ LenaHelper::DoStart (void) m_downlinkChannel = CreateObject (); m_uplinkChannel = CreateObject (); - m_downlinkPropagationModel = m_dlPropagationModelFactory.Create (); - Ptr dlSplm = m_downlinkPropagationModel->GetObject (); + m_downlinkPathlossModel = m_dlPathlossModelFactory.Create (); + Ptr dlSplm = m_downlinkPathlossModel->GetObject (); if (dlSplm != 0) { NS_LOG_LOGIC (this << " using a SpectrumPropagationLossModel in DL"); @@ -72,13 +72,13 @@ LenaHelper::DoStart (void) else { NS_LOG_LOGIC (this << " using a PropagationLossModel in DL"); - Ptr dlPlm = m_downlinkPropagationModel->GetObject (); - NS_ASSERT_MSG (dlPlm != 0, " " << m_downlinkPropagationModel << " is neither PropagationLossModel nor SpectrumPropagationLossModel"); + Ptr dlPlm = m_downlinkPathlossModel->GetObject (); + NS_ASSERT_MSG (dlPlm != 0, " " << m_downlinkPathlossModel << " is neither PropagationLossModel nor SpectrumPropagationLossModel"); m_downlinkChannel->AddPropagationLossModel (dlPlm); } - m_uplinkPropagationModel = m_ulPropagationModelFactory.Create (); - Ptr ulSplm = m_uplinkPropagationModel->GetObject (); + m_uplinkPathlossModel = m_ulPathlossModelFactory.Create (); + Ptr ulSplm = m_uplinkPathlossModel->GetObject (); if (ulSplm != 0) { NS_LOG_LOGIC (this << " using a SpectrumPropagationLossModel in UL"); @@ -87,8 +87,8 @@ LenaHelper::DoStart (void) else { NS_LOG_LOGIC (this << " using a PropagationLossModel in UL"); - Ptr ulPlm = m_uplinkPropagationModel->GetObject (); - NS_ASSERT_MSG (ulPlm != 0, " " << m_uplinkPropagationModel << " is neither PropagationLossModel nor SpectrumPropagationLossModel"); + Ptr ulPlm = m_uplinkPathlossModel->GetObject (); + NS_ASSERT_MSG (ulPlm != 0, " " << m_uplinkPathlossModel << " is neither PropagationLossModel nor SpectrumPropagationLossModel"); m_uplinkChannel->AddPropagationLossModel (ulPlm); } @@ -139,7 +139,7 @@ TypeId LenaHelper::GetTypeId (void) .AddAttribute ("PathlossModel", "The type of pathloss model to be used", StringValue ("ns3::BuildingsPropagationLossModel"), - MakeStringAccessor (&LenaHelper::SetPropagationModelType), + MakeStringAccessor (&LenaHelper::SetPathlossModelType), MakeStringChecker ()) .AddAttribute ("FadingModel", "The type of fading model to be used", @@ -167,21 +167,21 @@ LenaHelper::SetSchedulerAttribute (std::string n, const AttributeValue &v) void -LenaHelper::SetPropagationModelType (std::string type) +LenaHelper::SetPathlossModelType (std::string type) { NS_LOG_FUNCTION (this << type); - m_dlPropagationModelFactory = ObjectFactory (); - m_dlPropagationModelFactory.SetTypeId (type); - m_ulPropagationModelFactory = ObjectFactory (); - m_ulPropagationModelFactory.SetTypeId (type); + m_dlPathlossModelFactory = ObjectFactory (); + m_dlPathlossModelFactory.SetTypeId (type); + m_ulPathlossModelFactory = ObjectFactory (); + m_ulPathlossModelFactory.SetTypeId (type); } void LenaHelper::SetPathlossModelAttribute (std::string n, const AttributeValue &v) { NS_LOG_FUNCTION (this << n); - m_dlPropagationModelFactory.Set (n, v); - m_ulPropagationModelFactory.Set (n, v); + m_dlPathlossModelFactory.Set (n, v); + m_ulPathlossModelFactory.Set (n, v); } @@ -303,21 +303,21 @@ LenaHelper::InstallSingleEnbDevice (Ptr n) ulPhy->SetGenericPhyRxEndOkCallback (MakeCallback (&LteEnbPhy::PhyPduReceived, phy)); NS_LOG_LOGIC ("set the propagation model frequencies"); - if (m_downlinkPropagationModel->GetObject () != 0) + if (m_downlinkPathlossModel->GetObject () != 0) { double dlFreq = LteSpectrumValueHelper::GetCarrierFrequency (dev->GetDlEarfcn ()); NS_LOG_LOGIC ("DL freq: " << dlFreq); - m_downlinkPropagationModel->SetAttribute ("Frequency", DoubleValue (dlFreq)); + m_downlinkPathlossModel->SetAttribute ("Frequency", DoubleValue (dlFreq)); } else { - NS_LOG_LOGIC ("DL propagation model: " << m_downlinkPropagationModel->GetTypeId ()); + NS_LOG_LOGIC ("DL propagation model: " << m_downlinkPathlossModel->GetTypeId ()); } - if (m_uplinkPropagationModel->GetObject () != 0) + if (m_uplinkPathlossModel->GetObject () != 0) { double ulFreq = LteSpectrumValueHelper::GetCarrierFrequency (dev->GetUlEarfcn ()); NS_LOG_LOGIC ("UL freq: " << ulFreq); - m_uplinkPropagationModel->SetAttribute ("Frequency", DoubleValue (ulFreq)); + m_uplinkPathlossModel->SetAttribute ("Frequency", DoubleValue (ulFreq)); } dev->Start (); @@ -461,9 +461,9 @@ LenaHelper::EnableLogComponents (void) LogComponentEnable ("LteInterference", LOG_LEVEL_ALL); LogComponentEnable ("LteSinrChunkProcessor", LOG_LEVEL_ALL); - std::string propModelStr = m_dlPropagationModelFactory.GetTypeId ().GetName ().erase (0,5).c_str (); + std::string propModelStr = m_dlPathlossModelFactory.GetTypeId ().GetName ().erase (0,5).c_str (); - const char* propModel = m_dlPropagationModelFactory.GetTypeId ().GetName ().erase (0,5).c_str (); + const char* propModel = m_dlPathlossModelFactory.GetTypeId ().GetName ().erase (0,5).c_str (); LogComponentEnable (propModel, LOG_LEVEL_ALL); if (m_fadingModelType.compare ( "ns3::TraceFadingLossModel") == 0) { diff --git a/src/lte/helper/lena-helper.h b/src/lte/helper/lena-helper.h index ffe002d42..241059577 100644 --- a/src/lte/helper/lena-helper.h +++ b/src/lte/helper/lena-helper.h @@ -138,19 +138,19 @@ public: /** * * - * \param type the type of propagation model to be used for the eNBs + * \param type the type of pathloss model to be used for the eNBs */ - void SetPropagationModelType (std::string type); + void SetPathlossModelType (std::string type); /** - * set an attribute for the propagation model to be created + * set an attribute for the pathloss model to be created */ void SetPathlossModelAttribute (std::string n, const AttributeValue &v); /** * * - * \param type the fading modul to be used + * \param type the fading model to be used */ void SetFadingModel (std::string model); @@ -214,15 +214,15 @@ private: Ptr m_downlinkChannel; Ptr m_uplinkChannel; - Ptr m_downlinkPropagationModel; - Ptr m_uplinkPropagationModel; + Ptr m_downlinkPathlossModel; + Ptr m_uplinkPathlossModel; ObjectFactory m_schedulerFactory; ObjectFactory m_propagationModelFactory; ObjectFactory m_enbNetDeviceFactory; - ObjectFactory m_dlPropagationModelFactory; - ObjectFactory m_ulPropagationModelFactory; + ObjectFactory m_dlPathlossModelFactory; + ObjectFactory m_ulPathlossModelFactory; std::string m_fadingModelType; ObjectFactory m_fadingModelFactory;