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

Renaming of LenaHelper Attribute from PropagationModel to PathlossModel with related usage in files and documentation

Browse Source
This commit is contained in:
Marco Miozzo
2011-11-17 17:45:16 +01:00
parent 32681bd710
commit 92ca282b27
14 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/lte/doc/source/lte-user.rst
View File

@@ -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 <ns3/buildings-propagation-loss-model.h>
#include <ns3/building.h>
#. Propagation model selection::
#. Pathloss model selection::
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
lena->SetAttribute ("PropagationModel", StringValue ("ns3::BuildingsPropagationLossModel"));
lena->SetAttribute ("PathlossModel", StringValue ("ns3::BuildingsPropagationLossModel"));
#. EUTRA Band Selection

2
src/lte/examples/inter-cell-interference.cc
View File

@@ -65,7 +65,7 @@ int main (int argc, char *argv[])
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
// Create Nodes: eNodeB and UE
NodeContainer enbNodes;

2
src/lte/examples/lena-cqi-threshold.cc
View File

@@ -78,7 +78,7 @@ int main (int argc, char *argv[])
cmd.Parse (argc, argv);
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
//lena->EnableLogComponents ();
// LogComponentEnable ("LtePhy", LOG_LEVEL_ALL);

2
src/lte/examples/lena-extract-pathloss.cc
View File

@@ -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

2
src/lte/examples/lena-rlc-calculator.cc
View File

@@ -43,7 +43,7 @@ int main (int argc, char *argv[])
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
// Enable LTE log components
//lena->EnableLogComponents ();

4
src/lte/examples/lena-runtime-profiler.cc
View File

@@ -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;
}

6
src/lte/helper/lena-helper.cc
View File

@@ -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);

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

@@ -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);
/**
*

2
src/lte/test/lte-test-fading.cc
View File

@@ -85,7 +85,7 @@ LteFadingTestSuite::LteFadingTestSuite ()
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
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;

2
src/lte/test/lte-test-interference.cc
View File

@@ -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;

4
src/lte/test/lte-test-link-adaptation.cc
View File

@@ -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;

8
src/lte/test/lte-test-pathloss-model.cc
View File

@@ -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;

4
src/lte/test/lte-test-pf-ff-mac-scheduler.cc
View File

@@ -241,7 +241,7 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void)
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
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<LenaHelper> lena = CreateObject<LenaHelper> ();
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
// Create Nodes: eNodeB and UE
NodeContainer enbNodes;

2
src/lte/test/lte-test-rr-ff-mac-scheduler.cc
View File

@@ -229,7 +229,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void)
Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
lena->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
// Create Nodes: eNodeB and UE
NodeContainer enbNodes;