From aef8ff47ee810ea9c0bc105fc06d4565356167e8 Mon Sep 17 00:00:00 2001 From: Marco Miozzo Date: Fri, 28 Oct 2011 11:48:42 +0200 Subject: [PATCH] Update documentation with vehicular and urban traces --- doc/models/Makefile | 3 ++- src/lte/doc/source/lte-user.rst | 18 ++++++++++++++++-- src/lte/helper/lena-helper.cc | 4 ++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/doc/models/Makefile b/doc/models/Makefile index ba6b676da..56a41bd7c 100644 --- a/doc/models/Makefile +++ b/doc/models/Makefile @@ -84,7 +84,8 @@ SOURCEFIGS = \ $(SRC)/lte/doc/source/figures/simulationTime.eps \ $(SRC)/lte/doc/source/figures/memoryUsage.eps \ $(SRC)/lte/doc/source/figures/fading_pedestrian.pdf \ - $(SRC)/lte/doc/source/figures/fading_pedestrian.png \ + $(SRC)/lte/doc/source/figures/fading_vehicular.pdf \ + $(SRC)/lte/doc/source/figures/fading_urban_3kmph.pdf \ $(SRC)/uan/doc/auvmobility-classes.dia \ $(SRC)/stats/doc/Stat-framework-arch.png \ $(SRC)/stats/doc/Wifi-default.png \ diff --git a/src/lte/doc/source/lte-user.rst b/src/lte/doc/source/lte-user.rst index 80ee79de3..5d5bd9f69 100644 --- a/src/lte/doc/source/lte-user.rst +++ b/src/lte/doc/source/lte-user.rst @@ -365,7 +365,7 @@ While, for setting the parameters:: lena->SetFadingModelAttribute ("WindowSize", TimeValue (Seconds (0.5))); lena->SetFadingModelAttribute ("RbNum", UintegerValue (100)); -It has to be noted that, ``TraceFilename`` does not have a default value, therefore is has to be always set for using the fading module in the simulator. The simulator provide natively a fading trace generated according to the pedestrian behavior defined in in Annex B.2 of [TS36.104]_ (available at ``src/lte/model/FadingTraces/fading_trace_EPA_3kmph.fad``); a sample of such trace is reported in `fig-fadingPedestrianTrace`_. +It has to be noted that, ``TraceFilename`` does not have a default value, therefore is has to be always set for using the fading module in the simulator. The simulator provide natively three fading traces generated according to the configurations defined in in Annex B.2 of [TS36.104]_ (available in the folder ``src/lte/model/FadingTraces/``); examples of such traces are reported in `fig-fadingPedestrianTrace_`, `fig-fadingVehicularTrace_` and `fig-fadingUrbanTrace_`. .. _fig-fadingPedestrianTrace: @@ -373,6 +373,20 @@ It has to be noted that, ``TraceFilename`` does not have a default value, theref .. figure:: figures/fading_pedestrian.* :align: center - Example of the fading trace included in the simulator. + Example of the fading trace included in the simulator for a pedestrian scenario (speed of 3 kmph). + +.. _fig-fadingVehicularTrace: + +.. figure:: figures/fading_vehicular.* + :align: center + + Example of the fading trace included in the simulator for a vehicular scenario (speed of 60 kmph). + +.. _fig-fadingUrbanTrace: + +.. figure:: figures/fading_urban_3kmph.* + :align: center + + Example of the fading trace included in the simulator for an urban scenario (speed of 3 kmph). diff --git a/src/lte/helper/lena-helper.cc b/src/lte/helper/lena-helper.cc index 0bc554434..3e15e3d07 100644 --- a/src/lte/helper/lena-helper.cc +++ b/src/lte/helper/lena-helper.cc @@ -100,7 +100,7 @@ LenaHelper::DoStart (void) m_uplinkChannel->AddPropagationLossModel (ulPlm); } - if (m_fadingModelType.compare ( "ns3::TraceFadingLossModel") == 0) + if (m_fadingModelFactory.GetTypeId ().GetName ().compare ( "ns3::TraceFadingLossModel") == 0) { m_fadingModule = m_fadingModelFactory.Create (); m_downlinkChannel->AddSpectrumPropagationLossModel (m_fadingModule); @@ -393,7 +393,7 @@ LenaHelper::Attach (Ptr ueDevice, Ptr enbDevice) Ptr uePhy = ueDevice->GetObject ()->GetPhy (); enbPhy->AddUePhy (rnti, uePhy); - if (m_fadingModelType.compare ( "ns3::TraceFadingLossModel") == 0) + if (m_fadingModelFactory.GetTypeId ().GetName ().compare ( "ns3::TraceFadingLossModel") == 0) { Ptr mm_enb_dl = enbPhy->GetDownlinkSpectrumPhy ()->GetMobility ()->GetObject (); Ptr mm_ue_ul = uePhy->GetUplinkSpectrumPhy ()->GetMobility ()->GetObject ();