Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update M1 scheduler test suites for working with new LenaHelper
authorMarco Miozzo <marco.miozzo@cttc.es>
Mon, 19 Sep 2011 11:31:00 +0200
changeset 8241 6b3ef9a2baed
parent 8240 b77560c84e4f
child 8242 495d0f70868a
Update M1 scheduler test suites for working with new LenaHelper
src/lte/test/lte-test-pf-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions
src/lte/test/lte-test-rr-ff-mac-scheduler.cc file | annotate | diff | comparison | revisions 
--- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc	Mon Sep 19 11:29:32 2011 +0200
+++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc	Mon Sep 19 11:31:00 2011 +0200
@@ -235,6 +235,8 @@
 
   SetVerbose (true);
   Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
+  
+  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;
@@ -264,8 +266,6 @@
   EpsBearer bearer (q);
   lena->ActivateEpsBearer (ueDevs, bearer);
 
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
-
   Ptr<LteEnbNetDevice> lteEnbDev = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ();
   Ptr<LteEnbPhy> enbPhy = lteEnbDev->GetPhy ();
   enbPhy->SetAttribute ("TxPower", DoubleValue (30.0));
@@ -411,6 +411,8 @@
 
   SetVerbose (true);
   Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
+  
+  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;
@@ -440,8 +442,6 @@
   EpsBearer bearer (q);
   lena->ActivateEpsBearer (ueDevs, bearer);
 
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
-
   Ptr<LteEnbNetDevice> lteEnbDev = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ();
   Ptr<LteEnbPhy> enbPhy = lteEnbDev->GetPhy ();
   enbPhy->SetAttribute ("TxPower", DoubleValue (30.0));
--- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc	Mon Sep 19 11:29:32 2011 +0200
+++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc	Mon Sep 19 11:31:00 2011 +0200
@@ -56,6 +56,8 @@
   NS_LOG_INFO ("creating LenaRrFfMacSchedulerTestCase");
 
 
+  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
+  
   // DOWNLINK- DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.213)
   // 1 user -> 24 PRB at Itbs 26 -> 2196 -> 2196000 bytes/sec
   // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 bytes/sec
@@ -212,7 +214,7 @@
 
 //   LogComponentEnable ("RrFfMacScheduler", LOG_LEVEL_ALL);
   LogComponentEnable ("LenaTestRrFfMacCheduler", LOG_LEVEL_ALL);
-//   LogComponentEnable ("LteAmc", LOG_LEVEL_ALL);
+//   LogComponentEnable ("LenaHelper", LOG_LEVEL_ALL);
 //   LogComponentEnable ("RlcStatsCalculator", LOG_LEVEL_ALL);
 
 
@@ -223,6 +225,8 @@
   SetVerbose (true);
 
   Ptr<LenaHelper> lena = CreateObject<LenaHelper> ();
+  
+  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
   NodeContainer enbNodes;
@@ -251,8 +255,7 @@
   enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
   EpsBearer bearer (q);
   lena->ActivateEpsBearer (ueDevs, bearer);
-
-  lena->SetAttribute ("PropagationModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
+  
 
   Ptr<LteEnbNetDevice> lteEnbDev = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ();
   Ptr<LteEnbPhy> enbPhy = lteEnbDev->GetPhy ();
ns-3.24