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

meaninfgul name strings for RR and PF test cases

Browse Source
This commit is contained in:
Nicola Baldo
2011-05-19 12:54:46 +02:00
parent 902618b1ad
commit 76d68cf736
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,10 @@
* Author: Marco Miozzo <marco.miozzo@cttc.es>
*/
#include <iostream>
#include <sstream>
#include <string>
#include <ns3/object.h>
#include <ns3/spectrum-interference.h>
#include <ns3/spectrum-error-model.h>
@@ -26,7 +30,6 @@
#include <ns3/simulator.h>
#include <ns3/packet.h>
#include <ns3/ptr.h>
#include <iostream>
#include "ns3/rlc-stats-calculator.h"
#include <ns3/constant-position-mobility-model.h>
#include "ns3/lte-test-pf-ff-mac-scheduler.h"
@@ -177,14 +180,16 @@ static LenaTestPfFfMacSchedulerSuite lenaTestPfFfMacSchedulerSuite;
// --------------- T E S T - C A S E # 1 ------------------------------
LenaPfFfMacSchedulerTestCase1::LenaPfFfMacSchedulerTestCase1 (uint16_t nUser, uint16_t nLc, uint16_t dist, double thrRefDl, double thrRefUl)
: TestCase ("Proportional Fair (PF) Mac Scheduler Test Case"),
: TestCase (""),
m_nUser (nUser),
m_nLc (nLc),
m_dist (dist),
m_thrRefDl (thrRefDl),
m_thrRefUl (thrRefUl)
{
std::ostringstream oss;
oss << nUser << " UEs, distance " << dist << " m" ;
SetName (oss.str ());
}
LenaPfFfMacSchedulerTestCase1::~LenaPfFfMacSchedulerTestCase1 ()
@@ -347,12 +352,20 @@ LenaPfFfMacSchedulerTestCase1::DoRun (void)
LenaPfFfMacSchedulerTestCase2::LenaPfFfMacSchedulerTestCase2 (uint16_t nUser, std::vector<uint16_t> dist, std::vector<uint32_t> estThrPfDl, std::vector<uint32_t> estThrPfUl)
: TestCase ("Proportional Fair (PF) Mac Scheduler Test Case"),
: TestCase (""),
m_nUser (nUser),
m_dist (dist),
m_estThrPfDl (estThrPfDl),
m_estThrPfUl (estThrPfUl)
{
std::ostringstream oss;
oss << nUser << " UEs, distances (m) = [ " ;
for (std::vector<uint16_t>::iterator it = m_dist.begin (); it != m_dist.end (); ++it)
{
oss << *it << " ";
}
oss << "]";
SetName (oss.str ());
}
LenaPfFfMacSchedulerTestCase2::~LenaPfFfMacSchedulerTestCase2 ()

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

@@ -166,13 +166,16 @@ LenaTestRrFfMacSchedulerSuite::LenaTestRrFfMacSchedulerSuite ()
static LenaTestRrFfMacSchedulerSuite lenaTestRrFfMacSchedulerSuite;
LenaRrFfMacSchedulerTestCase::LenaRrFfMacSchedulerTestCase (uint16_t nUser, uint16_t nLc, uint16_t dist, double thrRefDl, double thrRefUl)
: TestCase ("Round Robin (RR) Mac Scheduler Test Case"),
: TestCase (""),
m_nUser (nUser),
m_nLc (nLc),
m_dist (dist),
m_thrRefDl (thrRefDl),
m_thrRefUl (thrRefUl)
{
std::ostringstream oss;
oss << nUser << " UEs, distance " << dist << " m" ;
SetName (oss.str ());
}
LenaRrFfMacSchedulerTestCase::~LenaRrFfMacSchedulerTestCase ()