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.
RR and PF scheduler tests updated with flag for real RRC
authormmiozzo
Fri, 14 Dec 2012 18:02:45 +0100
changeset 9549 b445d95326c0
parent 9548 2da2fa2fcbd6
child 9550 b730871cb5d1
RR and PF scheduler tests updated with flag for real RRC
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	Fri Dec 14 14:52:40 2012 +0100
+++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc	Fri Dec 14 18:02:45 2012 +0100
@@ -212,6 +212,7 @@
   Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));  
   Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));
   Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));
+  Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (false));
 
   /**
    * Initialize Simulation Scenario: 1 eNB and m_nUser UEs
@@ -219,7 +220,6 @@
 
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  
   lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
@@ -375,6 +375,7 @@
   Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));  
   Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));
   Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));
+  Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (false));
 
   /**
   * Initialize Simulation Scenario: 1 eNB and m_nUser UEs
--- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc	Fri Dec 14 14:52:40 2012 +0100
+++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc	Fri Dec 14 18:02:45 2012 +0100
@@ -58,6 +58,8 @@
 {
   NS_LOG_INFO ("creating LenaRrFfMacSchedulerTestCase");
 
+  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,15000,22000,15000));
+
   
   // 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
@@ -198,6 +200,7 @@
   Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));  
   Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));
   Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));
+  Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (false));
 
   /**
    * Initialize Simulation Scenario: 1 eNB and m_nUser UEs
ns-3.24