From 456dddbf01408f7003cd98973e01e23c70ea4c00 Mon Sep 17 00:00:00 2001 From: Marco Miozzo Date: Thu, 27 Oct 2011 16:29:25 +0200 Subject: [PATCH] Adjust naming --- doc/models/Makefile | 2 ++ src/lte/examples/lena-fading.cc | 6 +++--- src/lte/helper/lena-helper.cc | 7 ++++--- src/lte/model/fading-traces/fading_trace_generator.m | 1 - 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/doc/models/Makefile b/doc/models/Makefile index 28e7c4577..ba6b676da 100644 --- a/doc/models/Makefile +++ b/doc/models/Makefile @@ -83,6 +83,8 @@ SOURCEFIGS = \ $(SRC)/lte/doc/source/figures/lenaThrTestCase2.eps \ $(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)/uan/doc/auvmobility-classes.dia \ $(SRC)/stats/doc/Stat-framework-arch.png \ $(SRC)/stats/doc/Wifi-default.png \ diff --git a/src/lte/examples/lena-fading.cc b/src/lte/examples/lena-fading.cc index 648062ef6..e030215ce 100644 --- a/src/lte/examples/lena-fading.cc +++ b/src/lte/examples/lena-fading.cc @@ -57,16 +57,16 @@ int main (int argc, char *argv[]) lena->SetAttribute ("FadingModel", StringValue ("ns3::TraceFadingLossModel")); std::ifstream ifTraceFile; - ifTraceFile.open ("../../src/lte/model/FadingTraces/fading_trace_EPA_3kmph.fad", std::ifstream::in); + ifTraceFile.open ("../../src/lte/model/fading-traces/fading_trace_EPA_3kmph.fad", std::ifstream::in); if (ifTraceFile.good ()) { // script launched by test.py - lena->SetFadingModelAttribute ("TraceFilename", StringValue ("../../src/lte/model/FadingTraces/fading_trace_EPA_3kmph.fad")); + lena->SetFadingModelAttribute ("TraceFilename", StringValue ("../../src/lte/model/fading-traces/fading_trace_EPA_3kmph.fad")); } else { // script launched as an example - lena->SetFadingModelAttribute ("TraceFilename", StringValue ("src/lte/model/FadingTraces/fading_trace_EPA_3kmph.fad")); + lena->SetFadingModelAttribute ("TraceFilename", StringValue ("src/lte/model/fading-traces/fading_trace_EPA_3kmph.fad")); } // these parameters have to setted only in case of the trace format diff --git a/src/lte/helper/lena-helper.cc b/src/lte/helper/lena-helper.cc index 3e15e3d07..717cba4ac 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_fadingModelFactory.GetTypeId ().GetName ().compare ( "ns3::TraceFadingLossModel") == 0) + if (m_fadingModelType.compare ( "ns3::TraceFadingLossModel") == 0) { m_fadingModule = m_fadingModelFactory.Create (); m_downlinkChannel->AddSpectrumPropagationLossModel (m_fadingModule); @@ -192,8 +192,9 @@ void LenaHelper::SetFadingModel (std::string type) { NS_LOG_FUNCTION (this << type); + m_fadingModelType = type; m_fadingModelFactory = ObjectFactory (); - m_fadingModelFactory.SetTypeId (type); + m_fadingModelFactory.SetTypeId (m_fadingModelType); } void @@ -393,7 +394,7 @@ LenaHelper::Attach (Ptr ueDevice, Ptr enbDevice) Ptr uePhy = ueDevice->GetObject ()->GetPhy (); enbPhy->AddUePhy (rnti, uePhy); - if (m_fadingModelFactory.GetTypeId ().GetName ().compare ( "ns3::TraceFadingLossModel") == 0) + if (m_fadingModelType.compare ( "ns3::TraceFadingLossModel") == 0) { Ptr mm_enb_dl = enbPhy->GetDownlinkSpectrumPhy ()->GetMobility ()->GetObject (); Ptr mm_ue_ul = uePhy->GetUplinkSpectrumPhy ()->GetMobility ()->GetObject (); diff --git a/src/lte/model/fading-traces/fading_trace_generator.m b/src/lte/model/fading-traces/fading_trace_generator.m index 5acae62f2..abae5b280 100644 --- a/src/lte/model/fading-traces/fading_trace_generator.m +++ b/src/lte/model/fading-traces/fading_trace_generator.m @@ -22,7 +22,6 @@ fc = 1930e6; lambda = c/fc; v_km_h = 3.0; % speed of mobile node -%v_m_s = v_km_h * 3.600 ; % SURE????? v_m_s = v_km_h / 3.6; fd = v_m_s / lambda; % doppler shift