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

Adjust naming

Browse Source
This commit is contained in:
Marco Miozzo
2011-10-27 16:29:25 +02:00
parent b2c3d7fc8f
commit 456dddbf01
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/models/Makefile
View File

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

6
src/lte/examples/lena-fading.cc
View File

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

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

@@ -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<TraceFadingLossModel> ();
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<NetDevice> ueDevice, Ptr<NetDevice> enbDevice)
Ptr<LteUePhy> uePhy = ueDevice->GetObject<LteUeNetDevice> ()->GetPhy ();
enbPhy->AddUePhy (rnti, uePhy);
if (m_fadingModelFactory.GetTypeId ().GetName ().compare ( "ns3::TraceFadingLossModel") == 0)
if (m_fadingModelType.compare ( "ns3::TraceFadingLossModel") == 0)
{
Ptr<MobilityModel> mm_enb_dl = enbPhy->GetDownlinkSpectrumPhy ()->GetMobility ()->GetObject<MobilityModel> ();
Ptr<MobilityModel> mm_ue_ul = uePhy->GetUplinkSpectrumPhy ()->GetMobility ()->GetObject<MobilityModel> ();

1
src/lte/model/fading-traces/fading_trace_generator.m
View File

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