From 92ca282b27dec4680878e55d378a60e7f01bafb4 Mon Sep 17 00:00:00 2001 From: Marco Miozzo Date: Thu, 17 Nov 2011 17:45:16 +0100 Subject: [PATCH] Renaming of LenaHelper Attribute from PropagationModel to PathlossModel with related usage in files and documentation --- src/lte/doc/source/lte-user.rst | 6 +++--- src/lte/examples/inter-cell-interference.cc | 2 +- src/lte/examples/lena-cqi-threshold.cc | 2 +- src/lte/examples/lena-extract-pathloss.cc | 2 +- src/lte/examples/lena-rlc-calculator.cc | 2 +- src/lte/examples/lena-runtime-profiler.cc | 4 ++-- src/lte/helper/lena-helper.cc | 6 +++--- src/lte/helper/lena-helper.h | 2 +- src/lte/test/lte-test-fading.cc | 2 +- src/lte/test/lte-test-interference.cc | 2 +- src/lte/test/lte-test-link-adaptation.cc | 4 ++-- src/lte/test/lte-test-pathloss-model.cc | 8 ++++---- src/lte/test/lte-test-pf-ff-mac-scheduler.cc | 4 ++-- src/lte/test/lte-test-rr-ff-mac-scheduler.cc | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/lte/doc/source/lte-user.rst b/src/lte/doc/source/lte-user.rst index cd27026f8..666b63e27 100644 --- a/src/lte/doc/source/lte-user.rst +++ b/src/lte/doc/source/lte-user.rst @@ -161,7 +161,7 @@ Now create a text file named (for example) ``input-defaults.txt`` specifying the new default values that you want to use for some attributes:: default ns3::LenaHelper::Scheduler "ns3::PfFfMacScheduler" - default ns3::LenaHelper::PropagationModel "ns3::FriisSpectrumPropagationLossModel" + default ns3::LenaHelper::PathlossModel "ns3::FriisSpectrumPropagationLossModel" default ns3::LteEnbNetDevice::UlBandwidth "25" default ns3::LteEnbNetDevice::DlBandwidth "25" default ns3::LteEnbNetDevice::DlEarfcn "100" @@ -352,11 +352,11 @@ We now explain by examples how to use the buildings model (in particular, the `` #include #include -#. Propagation model selection:: +#. Pathloss model selection:: Ptr lena = CreateObject (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::BuildingsPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::BuildingsPropagationLossModel")); #. EUTRA Band Selection diff --git a/src/lte/examples/inter-cell-interference.cc b/src/lte/examples/inter-cell-interference.cc index 9ff6ad496..72b0b716c 100644 --- a/src/lte/examples/inter-cell-interference.cc +++ b/src/lte/examples/inter-cell-interference.cc @@ -65,7 +65,7 @@ int main (int argc, char *argv[]) Ptr lena = CreateObject (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); // Create Nodes: eNodeB and UE NodeContainer enbNodes; diff --git a/src/lte/examples/lena-cqi-threshold.cc b/src/lte/examples/lena-cqi-threshold.cc index 856a8bc4f..49c93a06b 100644 --- a/src/lte/examples/lena-cqi-threshold.cc +++ b/src/lte/examples/lena-cqi-threshold.cc @@ -78,7 +78,7 @@ int main (int argc, char *argv[]) cmd.Parse (argc, argv); Ptr lena = CreateObject (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); //lena->EnableLogComponents (); // LogComponentEnable ("LtePhy", LOG_LEVEL_ALL); diff --git a/src/lte/examples/lena-extract-pathloss.cc b/src/lte/examples/lena-extract-pathloss.cc index e9025832c..c1cbf4fec 100644 --- a/src/lte/examples/lena-extract-pathloss.cc +++ b/src/lte/examples/lena-extract-pathloss.cc @@ -177,7 +177,7 @@ int main (int argc, char *argv[]) // but it WON'T work if you ONLY use SpectrumPropagationLossModels such as: // ns3::FriisSpectrumPropagationLossModel // ns3::ConstantSpectrumPropagationLossModel - lena->SetAttribute ("PropagationModel", StringValue ("ns3::Cost231PropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::Cost231PropagationLossModel")); // Create Nodes: eNodeB and UE diff --git a/src/lte/examples/lena-rlc-calculator.cc b/src/lte/examples/lena-rlc-calculator.cc index 4bb25d980..a749f5e7a 100644 --- a/src/lte/examples/lena-rlc-calculator.cc +++ b/src/lte/examples/lena-rlc-calculator.cc @@ -43,7 +43,7 @@ int main (int argc, char *argv[]) Ptr lena = CreateObject (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); // Enable LTE log components //lena->EnableLogComponents (); diff --git a/src/lte/examples/lena-runtime-profiler.cc b/src/lte/examples/lena-runtime-profiler.cc index ce207f858..027acca2f 100644 --- a/src/lte/examples/lena-runtime-profiler.cc +++ b/src/lte/examples/lena-runtime-profiler.cc @@ -72,13 +72,13 @@ main (int argc, char *argv[]) //LogComponentEnable ("BuildingsPropagationLossModel", LOG_LEVEL_ALL); if (nFloors == 0) { - lena->SetAttribute("PropagationModel", + lena->SetAttribute("PathlossModel", StringValue("ns3::FriisPropagationLossModel")); nEnb = nEnbPerFloor; } else { - lena->SetAttribute("PropagationModel", + lena->SetAttribute("PathlossModel", StringValue("ns3::BuildingsPropagationLossModel")); nEnb = nFloors * nEnbPerFloor; } diff --git a/src/lte/helper/lena-helper.cc b/src/lte/helper/lena-helper.cc index 6b43a91bb..7d09f68e3 100644 --- a/src/lte/helper/lena-helper.cc +++ b/src/lte/helper/lena-helper.cc @@ -144,8 +144,8 @@ TypeId LenaHelper::GetTypeId (void) StringValue ("ns3::PfFfMacScheduler"), MakeStringAccessor (&LenaHelper::SetSchedulerType), MakeStringChecker ()) - .AddAttribute ("PropagationModel", - "The type of propagation model to be used", + .AddAttribute ("PathlossModel", + "The type of pathloss model to be used", StringValue ("ns3::BuildingsPropagationLossModel"), MakeStringAccessor (&LenaHelper::SetPropagationModelType), MakeStringChecker ()) @@ -185,7 +185,7 @@ LenaHelper::SetPropagationModelType (std::string type) } void -LenaHelper::SetPropagationModelAttribute (std::string n, const AttributeValue &v) +LenaHelper::SetPathlossModelAttribute (std::string n, const AttributeValue &v) { NS_LOG_FUNCTION (this << n); m_dlPropagationModelFactory.Set (n, v); diff --git a/src/lte/helper/lena-helper.h b/src/lte/helper/lena-helper.h index 1a08db2d0..ffe002d42 100644 --- a/src/lte/helper/lena-helper.h +++ b/src/lte/helper/lena-helper.h @@ -145,7 +145,7 @@ public: /** * set an attribute for the propagation model to be created */ - void SetPropagationModelAttribute (std::string n, const AttributeValue &v); + void SetPathlossModelAttribute (std::string n, const AttributeValue &v); /** * diff --git a/src/lte/test/lte-test-fading.cc b/src/lte/test/lte-test-fading.cc index cf31512e4..0eece5fb5 100644 --- a/src/lte/test/lte-test-fading.cc +++ b/src/lte/test/lte-test-fading.cc @@ -85,7 +85,7 @@ LteFadingTestSuite::LteFadingTestSuite () Ptr lena = CreateObject (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::BuildingsPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::BuildingsPropagationLossModel")); // Create Nodes: eNodeB, home eNB, UE and home UE (UE attached to HeNB) NodeContainer enbNodes; diff --git a/src/lte/test/lte-test-interference.cc b/src/lte/test/lte-test-interference.cc index 515870d25..c5efa5c40 100644 --- a/src/lte/test/lte-test-interference.cc +++ b/src/lte/test/lte-test-interference.cc @@ -116,7 +116,7 @@ LteInterferenceTestCase::DoRun (void) // lena->EnableLogComponents (); lena->EnableMacTraces (); lena->EnableRlcTraces (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); // Create Nodes: eNodeB and UE NodeContainer enbNodes; diff --git a/src/lte/test/lte-test-link-adaptation.cc b/src/lte/test/lte-test-link-adaptation.cc index ecaaff8d3..114fbb7aa 100644 --- a/src/lte/test/lte-test-link-adaptation.cc +++ b/src/lte/test/lte-test-link-adaptation.cc @@ -162,9 +162,9 @@ LteLinkAdaptationTestCase::DoRun (void) // lena->EnableLogComponents (); lena->EnableMacTraces (); lena->EnableRlcTraces (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::ConstantSpectrumPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::ConstantSpectrumPropagationLossModel")); NS_LOG_INFO ("SNR = " << m_snrDb << " LOSS = " << m_loss); - lena->SetPropagationModelAttribute ("Loss", DoubleValue (m_loss)); + lena->SetPathlossModelAttribute ("Loss", DoubleValue (m_loss)); // Create Nodes: eNodeB and UE NodeContainer enbNodes; diff --git a/src/lte/test/lte-test-pathloss-model.cc b/src/lte/test/lte-test-pathloss-model.cc index 9428311ec..65dd9d408 100644 --- a/src/lte/test/lte-test-pathloss-model.cc +++ b/src/lte/test/lte-test-pathloss-model.cc @@ -208,16 +208,16 @@ LtePathlossModelSystemTestCase::DoRun (void) // lena->EnableLogComponents (); lena->EnableMacTraces (); lena->EnableRlcTraces (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::BuildingsPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::BuildingsPropagationLossModel")); // set frequency. This is important because it changes the behavior of the pathloss model lena->SetEnbDeviceAttribute ("DlEarfcn", UintegerValue (200)); // remove shadowing component - lena->SetPropagationModelAttribute ("ShadowSigmaOutdoor", DoubleValue (0.0)); - lena->SetPropagationModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0)); - lena->SetPropagationModelAttribute ("ShadowSigmaExtWalls", DoubleValue (0.0)); + lena->SetPathlossModelAttribute ("ShadowSigmaOutdoor", DoubleValue (0.0)); + lena->SetPathlossModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0)); + lena->SetPathlossModelAttribute ("ShadowSigmaExtWalls", DoubleValue (0.0)); // Create Nodes: eNodeB and UE NodeContainer enbNodes; diff --git a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc index ea0935bee..afd6b8a87 100644 --- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc @@ -241,7 +241,7 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void) Ptr lena = CreateObject (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); // Create Nodes: eNodeB and UE NodeContainer enbNodes; @@ -422,7 +422,7 @@ LenaPfFfMacSchedulerTestCase2::DoRun (void) Ptr lena = CreateObject (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); // Create Nodes: eNodeB and UE NodeContainer enbNodes; diff --git a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc index 83cf5d3f1..85e1aade7 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -229,7 +229,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void) Ptr lena = CreateObject (); - lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); + lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); // Create Nodes: eNodeB and UE NodeContainer enbNodes;