src/lte/test/lte-test-tta-ff-mac-scheduler.cc
changeset 9654 cd7eb841e50e
parent 9653 382d27da8905
child 9673 da69cd4f2c93
--- a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc	Mon Feb 04 18:47:25 2013 +0100
+++ b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc	Tue Apr 02 19:58:36 2013 +0200
@@ -51,7 +51,9 @@
 #include <ns3/enum.h>
 
 
-NS_LOG_COMPONENT_DEFINE ("LenaTestTtaFfMacCheduler");
+#include "lte-test-tta-ff-mac-scheduler.h"
+
+NS_LOG_COMPONENT_DEFINE ("LenaTestTtaFfMacScheduler");
 
 using namespace ns3;
 
@@ -60,99 +62,94 @@
 {
   NS_LOG_INFO ("creating LenaTestTtaFfMacSchedulerSuite");
 
+  bool errorModel = false;
+
   //Test Case : AMC works in TTA
 
+  //Note: here the MCS is calculated by the narrowband CQI
+
   // 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 for first UE; 0 bytes/sec for other UEs
-  // 3 users -> 2196000 among 3 users -> 2196000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 6 users -> 2196000 among 6 users -> 2196000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 12 users -> 2196000 among 12 users -> 2196000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 15 users -> 2196000 among 15 users -> 2196000 bytes/sec for first UE; 0 bytes/sec for other UEs
+  // 1 user -> 24 PRB at Itbs 26 -> 2196 -> 2196000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 3 users -> 2196000 among 3 users -> 2196000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 6 users -> 2196000 among 6 users -> 2196000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 12 users -> 2196000 among 12 users -> 2196000 bytes/sec for one UE; 0 bytes/sec for other UEs
   // UPLINK- DISTANCE 0 -> MCS 28 -> Itbs 26 (from table 7.1.7.2.1-1 of 36.213)
   // 1 user -> 25 PRB at Itbs 26 -> 2292 -> 2292000 bytes/sec
   // 3 users -> 8 PRB at Itbs 26 -> 749 -> 749000 bytes/sec
   // 6 users -> 4 PRB at Itbs 26 -> 373 -> 373000 bytes/sec
-  // 12 users -> 2 PRB at Itbs 26 -> 185 -> 185000 bytes/sec
-  // 15 users -> 1 PRB at Itbs 26 -> 89 -> 89000 bytes/sec
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,0,2196000,2292000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,0,2196000,749000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,0,2196000,373000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,0,2196000,185000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,0,2196000,89000));
- 
-  // DOWNLINK - DISTANCE 3000 -> MCS 24 -> Itbs 30 (from table 7.1.7.2.1-1 of 36.213)
-  // 1 user -> 24 PRB at Itbs 20 -> 1383 -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 3 users -> 1383000 among 3 users -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 6 users -> 1383000 among 6 users -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 12 users -> 1383000 among 12 users -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 15 users -> 1383000 among 15 users -> 1383000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // UPLINK - DISTANCE 3000 -> MCS 20 -> Itbs 18 (from table 7.1.7.2.1-1 of 36.213)
-  // 1 user -> 25 PRB at Itbs 18 -> 1239 -> 1239000 bytes/sec
-  // 3 users -> 8 PRB at Itbs 18 -> 389 -> 389000 bytes/sec
-  // 6 users -> 4 PRB at Itbs 18 -> 193 -> 193000 bytes/sec
-  // 12 users -> 2 PRB at Itbs 18 -> 97 -> 97000 bytes/sec
-  // 15 users -> 1 PRB at Itbs 18 -> 47 -> 47000 bytes/sec 
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,3000,1383000,1239000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,3000,1383000,389000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,3000,1383000,193000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,3000,1383000,97000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,3000,1383000,47000));
- 
+  // after the patch enforcing min 3 PRBs per UE:
+  // 12 users -> 3 PRB at Itbs 26 -> 277 bytes * 8/12 UE/TTI -> 184670 bytes/sec
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,0,2196000,2292000, errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,0,2196000,749000,errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,0,2196000,373000, errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,0,2196000,184670, errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,0,2196000,147730, errorModel));
+
+  // DOWNLINK - DISTANCE 4800 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
+  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 3 users -> 903000 among 3 users -> 903000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 6 users -> 903000 among 6 users -> 903000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 12 users -> 903000 among 12 users -> 903000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // UPLINK - DISTANCE 4800 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
+  // 1 user -> 25 PRB at Itbs 13 -> 807 -> 807000 bytes/sec
+  // 3 users -> 8 PRB at Itbs 13 -> 253 -> 253000 bytes/sec
+  // 6 users -> 4 PRB at Itbs 13 -> 125 -> 125000 bytes/sec
+  // after the patch enforcing min 3 PRBs per UE:
+  // 12 users -> 3 PRB at Itbs 13 -> 93  bytes * 8/12 UE/TTI  -> 62000 bytes/sec
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,4800,903000,807000,errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,4800,903000,253000,errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,4800,903000,125000,errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,4800,903000,62000,errorModel));
+
+
   // DOWNLINK - DISTANCE 6000 -> MCS 16 -> Itbs 15 (from table 7.1.7.2.1-1 of 36.213)
-  // 1 user -> 24 PRB at Itbs 15 -> 903 -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 3 users -> 903000 among 3 users -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 6 users -> 903000 among 6 users -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 12 users -> 903000 among 12 users -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
-  // 15 users -> 903000 among 15 users -> 903000 bytes/sec for first UE; 0 bytes/sec for other UEs
+  // 1 user -> 24 PRB at Itbs 15 -> 775 -> 775000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 3 users -> 775000 among 3 users -> 775000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 6 users -> 775000 among 6 users -> 775000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 12 users ->7753000 among 12 users -> 775000 bytes/sec for one UE; 0 bytes/sec for other UEs
   // UPLINK - DISTANCE 6000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
   // 1 user -> 25 PRB at Itbs 11 -> 621 -> 621000 bytes/sec
   // 3 users -> 8 PRB at Itbs 11 -> 201 -> 201000 bytes/sec
   // 6 users -> 4 PRB at Itbs 11 -> 97 -> 97000 bytes/sec
-  // 12 users -> 2 PRB at Itbs 11 -> 47 -> 47000 bytes/sec
-  // 15 users -> 1 PRB at Itbs 11 -> 22 -> 22000 bytes/sec
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,6000,903000,621000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,6000,903000,201000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,6000,903000,97000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,6000,903000,47000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,6000,903000,22000));
- 
-  // DOWNLINK - DISTANCE 9000 -> MCS 12 -> Itbs 11 (from table 7.1.7.2.1-1 of 36.213)
-  // 1 user -> 24 PRB at Itbs 11 -> 597 -> 597000 bytes/sec
-  // 3 users -> 597000 among 3 users -> 199000 bytes/sec
-  // 6 users -> 597000 among 6 users -> 99500 bytes/sec
-  // 12 users -> 597000 among 12 users -> 49750 bytes/sec
-  // 15 users -> 597000 among 15 users -> 39800 bytes/sec 
-  // UPLINK - DISTANCE 9000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
+  // after the patch enforcing min 3 PRBs per UE:
+  // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,6000,775000,621000, errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,6000,775000,201000, errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,6000,775000,97000, errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,6000,775000,48667, errorModel));
+
+  // DOWNLINK - DISTANCE 10000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
+  // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 3 users -> 421000 among 3 users -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 6 users -> 421000 among 6 users -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 12 users -> 421000 among 12 users -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // UPLINK - DISTANCE 10000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
   // 1 user -> 24 PRB at Itbs 8 -> 437 -> 437000 bytes/sec
   // 3 users -> 8 PRB at Itbs 8 -> 137 -> 137000 bytes/sec
   // 6 users -> 4 PRB at Itbs 8 -> 67 -> 67000 bytes/sec
-  // 12 users -> 2 PRB at Itbs 8 -> 32 -> 32000 bytes/sec
-  // 15 users -> 1 PRB at Itbs 8 -> 15 -> 15000 bytes/sec 
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,9000,597000,437000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,9000,597000,137000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,9000,597000,67000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,9000,597000,32000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,9000,597000,15000));
+  // after the patch enforcing min 3 PRBs per UE:
+  // 12 users -> 3 PRB at Itbs 8 -> 49 bytes * 8/12 UE/TTI -> 32667 bytes/sec
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,10000,421000,437000,errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,10000,421000,137000,errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,10000,421000,67000,errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,10000,421000,32667,errorModel));
  
-  // DONWLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
-  // 1 user -> 24 PRB at Itbs 6 -> 309 -> 309000 bytes/sec
-  // 3 users -> 309000 among 3 users -> 103000 bytes/sec
-  // 6 users -> 309000 among 6 users -> 51500 bytes/sec
-  // 12 users -> 309000 among 12 users -> 25750 bytes/sec
-  // 15 users -> 309000 among 15 users -> 20600 bytes/sec
-  // UPLINK - DISTANCE 15000 -> MCS 6 -> Itbs 6 (from table 7.1.7.2.1-1 of 36.213)
-  // 1 user -> 25 PRB at Itbs 6 -> 233 -> 233000 bytes/sec
-  // 3 users -> 8 PRB at Itbs 6 -> 69 -> 69000 bytes/sec
-  // 6 users -> 4 PRB at Itbs 6 -> 32 -> 32000 bytes/sec
-  // 12 users -> 2 PRB at Itbs 6 -> 15 -> 15000 bytes/sec
-  // 15 users -> 1 PRB at Itbs 6 -> 7 -> 7000 bytes/sec
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,15000,309000,233000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,15000,309000,69000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,15000,309000,32000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,15000,309000,15000));
-  AddTestCase (new LenaTtaFfMacSchedulerTestCase (15,0,15000,309000,7000));
+  // DONWLINK - DISTANCE 20000 -> MCS 8 -> Itbs 8 (from table 7.1.7.2.1-1 of 36.213)
+  // 1 user -> 24 PRB at Itbs 8 -> 421 -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 3 users -> 421000 among 3 users -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 6 users -> 421000 among 6 users -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // 12 users -> 421000 among 12 users -> 421000 bytes/sec for one UE; 0 bytes/sec for other UEs
+  // UPLINK - DISTANCE 20000 -> MCS 2 -> Itbs 2 (from table 7.1.7.2.1-1 of 36.213)
+  // 1 user -> 25 PRB at Itbs 2 -> 233 -> 137000 bytes/sec
+  // 3 users -> 8 PRB at Itbs 2 -> 69 -> 41000 bytes/sec
+  // 6 users -> 4 PRB at Itbs 2 -> 32 -> 22000 bytes/sec
+  // after the patch enforcing min 3 PRBs per UE:
+  // 12 users -> 3 PRB at Itbs 2 -> 26 bytes * 8/12 UE/TTI -> 12000 bytes/sec
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (1,0,20000,421000,137000,errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (3,0,20000,421000,41000,errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (6,0,20000,421000,22000,errorModel));
+  AddTestCase (new LenaTtaFfMacSchedulerTestCase (12,0,20000,421000,12000,errorModel));
 
- 
 }
 
 static LenaTestTtaFfMacSchedulerSuite lenaTestTtaFfMacSchedulerSuite;
@@ -160,7 +157,6 @@
 
 // --------------- T E S T - C A S E ------------------------------
 
-
 std::string 
 LenaTtaFfMacSchedulerTestCase::BuildNameString (uint16_t nUser, uint16_t dist)
 {
@@ -169,13 +165,14 @@
   return oss.str ();
 }
 
-LenaTtaFfMacSchedulerTestCase::LenaTtaFfMacSchedulerTestCase (uint16_t nUser, uint16_t nLc, uint16_t dist, double thrRefDl, double thrRefUl)
+LenaTtaFfMacSchedulerTestCase::LenaTtaFfMacSchedulerTestCase (uint16_t nUser, uint16_t nLc, uint16_t dist, double thrRefDl, double thrRefUl, bool errorModelEnabled)
   : TestCase (BuildNameString (nUser, dist)),
     m_nUser (nUser),
     m_nLc (nLc),
     m_dist (dist),
     m_thrRefDl (thrRefDl),
-    m_thrRefUl (thrRefUl)
+    m_thrRefUl (thrRefUl),
+    m_errorModelEnabled (errorModelEnabled)
 {
 }
 
@@ -183,23 +180,26 @@
 {
 }
 
+
 void
 LenaTtaFfMacSchedulerTestCase::DoRun (void)
 {
-  Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));
-  Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));
-  Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue (false));
-  Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));
+
+  NS_LOG_FUNCTION (this << m_nUser << m_nLc << m_dist);
 
-  LogComponentDisableAll (LOG_LEVEL_ALL);
-  //LogComponentEnable ("LenaTestTtaFfMacCheduler", LOG_LEVEL_ALL);
+  if (!m_errorModelEnabled)
+    {
+      Config::SetDefault ("ns3::LteSpectrumPhy::CtrlErrorModelEnabled", BooleanValue (false));
+      Config::SetDefault ("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue (false));
+    }
+
+  Config::SetDefault ("ns3::LteHelper::UseIdealRrc", BooleanValue (true));
 
   /**
    * Initialize Simulation Scenario: 1 eNB and m_nUser UEs
    */
 
   Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();
-  
   lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));
 
   // Create Nodes: eNodeB and UE
@@ -225,11 +225,12 @@
   // Attach a UE to a eNB
   lteHelper->Attach (ueDevs, enbDevs.Get (0));
 
-  // Activate a bearer
+  // Activate an EPS bearer
   enum EpsBearer::Qci q = EpsBearer::GBR_CONV_VOICE;
   EpsBearer bearer (q);
   lteHelper->ActivateDataRadioBearer (ueDevs, bearer);
-
+  
+ 
   Ptr<LteEnbNetDevice> lteEnbDev = enbDevs.Get (0)->GetObject<LteEnbNetDevice> ();
   Ptr<LteEnbPhy> enbPhy = lteEnbDev->GetPhy ();
   enbPhy->SetAttribute ("TxPower", DoubleValue (30.0));
@@ -246,20 +247,23 @@
       uePhy->SetAttribute ("NoiseFigure", DoubleValue (9.0));
     }
 
+
   double statsStartTime = 0.300; // need to allow for RRC connection establishment + SRS
-  double statsDuration = 1.0;
+  double statsDuration = 0.6;
   double tolerance = 0.1;
-  Simulator::Stop (Seconds (statsStartTime + statsDuration - 0.0001));
+  Simulator::Stop (Seconds (statsStartTime + statsDuration - 0.000001));
 
+  lteHelper->EnableMacTraces ();
   lteHelper->EnableRlcTraces ();
   Ptr<RadioBearerStatsCalculator> rlcStats = lteHelper->GetRlcStats ();
   rlcStats->SetAttribute ("StartTime", TimeValue (Seconds (statsStartTime)));
   rlcStats->SetAttribute ("EpochDuration", TimeValue (Seconds (statsDuration)));
 
+
   Simulator::Run ();
 
   /**
-   * Check that the downlink assignation is done in a "throughput to average" manner
+   * Check that the downlink assignation is done in a "Throughput to Average" manner
    */
   NS_LOG_INFO ("DL - Test with " << m_nUser << " user(s) at distance " << m_dist);
   std::vector <uint64_t> dlDataRxed;
@@ -267,29 +271,35 @@
     {
       // get the imsi
       uint64_t imsi = ueDevs.Get (i)->GetObject<LteUeNetDevice> ()->GetImsi ();
-      // get the lcId
       uint8_t lcId = 3;
       dlDataRxed.push_back (rlcStats->GetDlRxData (imsi, lcId));
       NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " bytes rxed " << (double)dlDataRxed.at (i) << "  thr " << (double)dlDataRxed.at (i) / statsDuration << " ref " << m_thrRefDl);
     }
+
   /**
-  * Check that the assignation is done in a "throughput to average" manner among users
-  * with equal SINRs: all bandwidth should be allocated to the first UE in script
+  * Check that the assignation is done in a "Throughput to Average" manner among users
+  * with maximum SINRs: without fading, current FD MT always assign all resources to one UE
   */
-  for (int i = 0; i < 1; i++)
+
+  uint8_t found = 0;
+  for (int i = 0; i < m_nUser; i++)
     {
-      if (i == 0)
+      double throughput = (double)dlDataRxed.at (i) / statsDuration;
+      if (throughput != 0 && found == 0)
         {
-          NS_TEST_ASSERT_MSG_EQ_TOL ((double)dlDataRxed.at (i) / statsDuration, m_thrRefDl, m_thrRefDl * tolerance, " Invalid Throughput!");
+          NS_TEST_ASSERT_MSG_EQ_TOL (throughput, m_thrRefDl, m_thrRefDl * tolerance, " Unfair Throughput!");
+          found = 1;
+        }
+      else if (throughput != 0 && found == 1)
+        {
+           NS_TEST_ASSERT_MSG_EQ_TOL (0, m_thrRefDl, m_thrRefDl * tolerance, " Unfair Throughput!");
         }
       else
-        {
-          NS_TEST_ASSERT_MSG_EQ_TOL ((double)dlDataRxed.at (i) / statsDuration, 0, tolerance, " Invalid Throughput!");
-        }
+        NS_TEST_ASSERT_MSG_EQ_TOL (throughput, 0, 0, " Unfair Throughput!");
     }
 
   /**
-  * Check that the uplink assignation is done in a "throughput to average" manner
+  * Check that the uplink assignation is done in a "proportional fair" manner
   */
   NS_LOG_INFO ("UL - Test with " << m_nUser << " user(s) at distance " << m_dist);
   std::vector <uint64_t> ulDataRxed;
@@ -303,13 +313,12 @@
       NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " bytes rxed " << (double)ulDataRxed.at (i) << "  thr " << (double)ulDataRxed.at (i) / statsDuration << " ref " << m_thrRefUl);
     }
   /**
-  * Check that the assignation is done in a "throughput to average" manner among users
+  * Check that the assignation is done in a "proportional fair" manner among users
   * with equal SINRs: the bandwidht should be distributed according to the 
   * ratio of the estimated throughput per TTI of each user; therefore equally 
   * partitioning the whole bandwidth achievable from a single users in a TTI
-  *
   */
-  for (int i = 0; i < 1; i++)
+  for (int i = 0; i < m_nUser; i++)
     {
       NS_TEST_ASSERT_MSG_EQ_TOL ((double)ulDataRxed.at (i) / statsDuration, m_thrRefUl, m_thrRefUl * tolerance, " Unfair Throughput!");
     }