From db39e9df6faed55ef42ea7473642102f8274a4c6 Mon Sep 17 00:00:00 2001 From: mmiozzo Date: Thu, 13 Dec 2012 18:45:27 +0100 Subject: [PATCH] Update PF and RR schedulers for working with RRC attachment procedures --- src/lte/test/lte-test-pf-ff-mac-scheduler.cc | 6 +++--- src/lte/test/lte-test-rr-ff-mac-scheduler.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) 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 ff76b77df..e36d3e851 100644 --- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc @@ -268,7 +268,7 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void) } - double statsStartTime = 0.100; // need to allow for RRC connection establishment + SRS + double statsStartTime = 0.300; // need to allow for RRC connection establishment + SRS double statsDuration = 0.6; double tolerance = 0.1; Simulator::Stop (Seconds (statsStartTime + statsDuration - 0.000001)); @@ -428,10 +428,10 @@ LenaPfFfMacSchedulerTestCase2::DoRun (void) uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0)); } - double statsStartTime = 0.100; // need to allow for RRC connection establishment + SRS + double statsStartTime = 0.300; // need to allow for RRC connection establishment + SRS double statsDuration = 0.4; double tolerance = 0.1; - Simulator::Stop (Seconds (statsStartTime + statsDuration + 0.000001)); + Simulator::Stop (Seconds (statsStartTime + statsDuration - 0.000001)); lteHelper->EnableRlcTraces (); Ptr rlcStats = lteHelper->GetRlcStats (); 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 80ab9d693..9449f8378 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -203,7 +203,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void) * Initialize Simulation Scenario: 1 eNB and m_nUser UEs */ - +LogComponentEnable ("PfFfMacScheduler", LOG_LEVEL_ALL); Ptr lteHelper = CreateObject (); lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel")); @@ -254,7 +254,7 @@ LenaRrFfMacSchedulerTestCase::DoRun (void) } - double statsStartTime = 0.100; // need to allow for RRC connection establishment + SRS + double statsStartTime = 0.300; // need to allow for RRC connection establishment + SRS double statsDuration = 0.4; double tolerance = 0.1; Simulator::Stop (Seconds (statsStartTime + statsDuration - 0.0001));