F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update PEM and RR/PF Scheduler tests with PemEnabled flag

Browse Source
This commit is contained in:
Marco Miozzo
2012-01-12 17:43:49 +01:00
parent 40443eb692
commit ab7663e85a
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lte/test/lte-test-pf-ff-mac-scheduler.cc
View File

@@ -46,6 +46,7 @@
#include "ns3/double.h"
#include <ns3/lte-enb-phy.h>
#include <ns3/lte-ue-phy.h>
#include <ns3/boolean.h>
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);

2
src/lte/test/lte-test-phy-error-model.cc
View File

@@ -44,6 +44,7 @@
#include <ns3/lte-enb-phy.h>
#include <ns3/lte-ue-phy.h>
#include <ns3/config.h>
#include <ns3/boolean.h>
@@ -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);

8
src/lte/test/lte-test-rr-ff-mac-scheduler.cc
View File

@@ -42,6 +42,7 @@
#include "ns3/double.h"
#include <ns3/lte-enb-phy.h>
#include <ns3/lte-ue-phy.h>
#include <ns3/boolean.h>
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<LteUeNetDevice> ()->GetImsi ();
// get the lcId
uint8_t lcId = ueDevs.Get (i)->GetObject<LteUeNetDevice> ()->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!");
}