From 0c747045f821fc0f82e5d71cd9f1a44e4bd9eed2 Mon Sep 17 00:00:00 2001 From: mmiozzo Date: Fri, 14 Dec 2012 18:02:45 +0100 Subject: [PATCH] RR and PF scheduler tests updated with flag for real RRC --- src/lte/test/lte-test-pf-ff-mac-scheduler.cc | 3 ++- src/lte/test/lte-test-rr-ff-mac-scheduler.cc | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc index e36d3e851..26798e0d4 100644 --- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc @@ -212,6 +212,7 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void) 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 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void) Ptr lteHelper = CreateObject (); - lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); // Create Nodes: eNodeB and UE @@ -375,6 +375,7 @@ LenaPfFfMacSchedulerTestCase2::DoRun (void) 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 diff --git a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc index 9449f8378..510d6b463 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -58,6 +58,8 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite () { 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 @@ LenaRrFfMacSchedulerTestCase::DoRun (void) 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