Remove dependences from SpectrumPropagationLossModel
authorMarco Miozzo <marco.miozzo@cttc.es>
Thu, 07 Jul 2011 16:47:45 +0200
changeset 8191 02ce2fb4883b
parent 8190 3a2b83d7210d
child 8192 0d4ca39493cb
Remove dependences from SpectrumPropagationLossModel
src/lte/examples/lena-first-sim.cc
src/lte/helper/lena-helper.cc
src/lte/test/lte-test-pathloss-model.cc
--- a/src/lte/examples/lena-first-sim.cc	Thu Jul 07 13:36:22 2011 +0200
+++ b/src/lte/examples/lena-first-sim.cc	Thu Jul 07 16:47:45 2011 +0200
@@ -56,8 +56,6 @@
   LogComponentEnable ("BuildingsPropagationLossModel", LOG_LEVEL_ALL);
   LogComponentEnable ("BuildingsPropagationLossModel", LOG_LEVEL_ALL);
  
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::SingleModelSpectrumChannel"));
-
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;
   NodeContainer ueNodes;
--- a/src/lte/helper/lena-helper.cc	Thu Jul 07 13:36:22 2011 +0200
+++ b/src/lte/helper/lena-helper.cc	Thu Jul 07 16:47:45 2011 +0200
@@ -65,12 +65,17 @@
   NS_LOG_FUNCTION (this);
   m_downlinkChannel = CreateObject<SingleModelSpectrumChannel> ();
   m_uplinkChannel = CreateObject<SingleModelSpectrumChannel> ();
-  Ptr<SpectrumPropagationLossModel> dlPropagationModel = m_propagationModelFactory.Create<SpectrumPropagationLossModel> ();
-  Ptr<SpectrumPropagationLossModel> ulPropagationModel = m_propagationModelFactory.Create<SpectrumPropagationLossModel> ();
-  m_downlinkChannel->AddSpectrumPropagationLossModel (dlPropagationModel);
-  m_uplinkChannel->AddSpectrumPropagationLossModel (ulPropagationModel);
+  //Ptr<SpectrumPropagationLossModel> dlPropagationModel = m_propagationModelFactory.Create<SpectrumPropagationLossModel> ();
+  //Ptr<SpectrumPropagationLossModel> ulPropagationModel = m_propagationModelFactory.Create<SpectrumPropagationLossModel> ();
+  //m_downlinkChannel->AddSpectrumPropagationLossModel (dlPropagationModel);
+  //m_uplinkChannel->AddSpectrumPropagationLossModel (ulPropagationModel);
   m_downlinkPropagationLossModel = CreateObject<BuildingsPropagationLossModel> ();
+  m_downlinkPropagationLossModel->SetAttribute ("Frequency", DoubleValue (2.1140e9)); // E_UTRA BAND #1 see table 5.5-1 of 36.101
+  m_downlinkPropagationLossModel->SetAttribute ("Lambda", DoubleValue (300000000.0 /2.1140e9)); // E_UTRA BAND #1 see table 5.5-1 of 36.101
   m_uplinkPropagationLossModel = CreateObject<BuildingsPropagationLossModel> ();
+  m_uplinkPropagationLossModel = CreateObject<BuildingsPropagationLossModel> ();
+  m_uplinkPropagationLossModel->SetAttribute ("Frequency", DoubleValue (1.950e9)); // E_UTRA BAND #1 see table 5.5-1 of 36.101
+  m_downlinkPropagationLossModel->SetAttribute ("Lambda", DoubleValue (300000000.0 /1.950e9)); // E_UTRA BAND #1 see table 5.5-1 of 36.101
   m_downlinkChannel->AddPropagationLossModel (m_downlinkPropagationLossModel);
   m_uplinkChannel->AddPropagationLossModel (m_uplinkPropagationLossModel);
   m_macStats = CreateObject<MacStatsCalculator> ();
--- a/src/lte/test/lte-test-pathloss-model.cc	Thu Jul 07 13:36:22 2011 +0200
+++ b/src/lte/test/lte-test-pathloss-model.cc	Thu Jul 07 16:47:45 2011 +0200
@@ -163,6 +163,19 @@
 
   Ptr<LteCqiSinrChunkProcessor> chunkProcessor = Create<LteCqiSinrChunkProcessor> (uePhy->GetObject<LtePhy> ());
   dlPhy->AddSinrChunkProcessor (chunkProcessor);
+  
+//   Ptr<SpectrumChannel> m_downlinkChannel = CreateObject<SingleModelSpectrumChannel> ();
+//   Ptr<SpectrumChannel> m_uplinkChannel = CreateObject<SingleModelSpectrumChannel> ();
+//   Ptr<SpectrumPropagationLossModel> dlPropagationModel = Create<BuildingsSpectrumPropagationLossModel> ();
+//   Ptr<SpectrumPropagationLossModel> ulPropagationModel = Create<BuildingsSpectrumPropagationLossModel> ();
+//   m_downlinkChannel->AddSpectrumPropagationLossModel (dlPropagationModel);
+//   m_uplinkChannel->AddSpectrumPropagationLossModel (ulPropagationModel);
+//   m_downlinkPropagationLossModel = CreateObject<BuildingsPropagationLossModel> ();
+//   m_uplinkPropagationLossModel = CreateObject<BuildingsPropagationLossModel> ();
+//   m_downlinkChannel->AddPropagationLossModel (m_downlinkPropagationLossModel);
+//   m_uplinkChannel->AddPropagationLossModel (m_uplinkPropagationLossModel);
+  
+  
 
   /**
    * Generate several calls to LteSpectrumPhy::StartRx corresponding to several signals.