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 afd6b8a87..5cb4373a7 100644 --- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc @@ -46,6 +46,7 @@ #include "ns3/double.h" #include #include +#include NS_LOG_COMPONENT_DEFINE ("LenaTestPfFfMacCheduler"); @@ -205,6 +206,8 @@ LenaPfFfMacSchedulerTestCase1::~LenaPfFfMacSchedulerTestCase1 () void LenaPfFfMacSchedulerTestCase1::DoRun (void) { + Config::SetDefault ("ns3::LteSpectrumPhy::PemEnabled", BooleanValue (false)); + LogComponentDisableAll (LOG_LEVEL_ALL); // LogComponentEnable ("LteEnbRrc", LOG_LEVEL_ALL); // LogComponentEnable ("LteUeRrc", LOG_LEVEL_ALL); // LogComponentEnable ("LteEnbMac", LOG_LEVEL_ALL); diff --git a/src/lte/test/lte-test-phy-error-model.cc b/src/lte/test/lte-test-phy-error-model.cc index 9106a6d49..afeb656c5 100644 --- a/src/lte/test/lte-test-phy-error-model.cc +++ b/src/lte/test/lte-test-phy-error-model.cc @@ -44,6 +44,7 @@ #include #include #include +#include @@ -108,6 +109,7 @@ LenaPhyErrorModelTestCase::DoRun (void) double ber = 0.01; Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (ber)); + Config::SetDefault ("ns3::LteSpectrumPhy::PemEnabled", BooleanValue (true)); // LogComponentEnable ("LteEnbRrc", LOG_LEVEL_ALL); // LogComponentEnable ("LteUeRrc", LOG_LEVEL_ALL); 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 d373f6e68..558b19055 100644 --- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc @@ -42,6 +42,7 @@ #include "ns3/double.h" #include #include +#include NS_LOG_COMPONENT_DEFINE ("LenaTestRrFfMacCheduler"); @@ -189,6 +190,7 @@ LenaRrFfMacSchedulerTestCase::~LenaRrFfMacSchedulerTestCase () void LenaRrFfMacSchedulerTestCase::DoRun (void) { + Config::SetDefault ("ns3::LteSpectrumPhy::PemEnabled", BooleanValue (false)); LogComponentDisableAll (LOG_LEVEL_ALL); // LogComponentEnable ("LteEnbRrc", LOG_LEVEL_ALL); // LogComponentEnable ("LteUeRrc", LOG_LEVEL_ALL); @@ -217,8 +219,9 @@ LenaRrFfMacSchedulerTestCase::DoRun (void) // LogComponentEnable ("RrFfMacScheduler", LOG_LEVEL_ALL); LogComponentEnable ("LenaTestRrFfMacCheduler", LOG_LEVEL_ALL); +// LogComponentEnable ("LteMiErrorModel", LOG_LEVEL_ALL); // LogComponentEnable ("LenaHelper", LOG_LEVEL_ALL); -// LogComponentEnable ("RlcStatsCalculator", LOG_LEVEL_ALL); +// LogComponentEnable ("LteSpectrumPhy", LOG_LEVEL_ALL); /** @@ -310,8 +313,9 @@ LenaRrFfMacSchedulerTestCase::DoRun (void) uint64_t imsi = ueDevs.Get (i)->GetObject ()->GetImsi (); // get the lcId uint8_t lcId = ueDevs.Get (i)->GetObject ()->GetRrc ()->GetLcIdVector ().at (0); + double txed = rlcStats->GetUlTxData (imsi, lcId); ulDataRxed.push_back (rlcStats->GetUlRxData (imsi, lcId)); - NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " bytes txed " << (double)ulDataRxed.at (i) << " thr " << (double)ulDataRxed.at (i) / simulationTime << " ref " << m_thrRefUl); + NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " bytes txed " << (double)ulDataRxed.at (i) << " thr " << (double)ulDataRxed.at (i) / simulationTime << " ref " << m_thrRefUl << " txed " << txed / simulationTime); NS_TEST_ASSERT_MSG_EQ_TOL ((double)ulDataRxed.at (i) / simulationTime, m_thrRefUl, m_thrRefUl * tolerance, " Unfair Throughput!"); }