Mercurial Mercurial > tomh > ns-3-dev-spectrum-wifi / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authorMarco Miozzo <marco.miozzo@cttc.es>
Thu, 24 Jan 2013 13:58:26 +0100
changeset 9639 76c7261da683
parent 9638 50fa71b511ed (diff)
parent 9637 9a6e5e0c3da8 (current diff)
child 9641 56061c8a4048
merge
--- a/src/lte/model/lte-amc.cc	Wed Jan 23 18:54:03 2013 +0100
+++ b/src/lte/model/lte-amc.cc	Thu Jan 24 13:58:26 2013 +0100
@@ -346,7 +346,7 @@
          {
             uint8_t mcs = 0;
             TbStats_t tbStats;
-            while (mcs < 28)
+            while (mcs <= 28)
               {
                 HarqProcessInfoList_t harqInfoList;
                 tbStats = LteMiErrorModel::GetTbDecodificationStats (sinr, rbgMap, (uint16_t)GetTbSizeFromMcs (mcs, rbgSize) / 8, mcs, harqInfoList);
@@ -357,6 +357,10 @@
                 mcs++;
                 
               }
+            if (mcs > 0)
+              {
+                mcs--;
+              }
             NS_LOG_DEBUG (this << "\t RBG " << rbId << " MCS " << (uint16_t)mcs << " TBLER " << tbStats.tbler);
             int rbgCqi = 0;
             if ((tbStats.tbler > 0.1)&&(mcs==0))
@@ -376,7 +380,7 @@
                   ++rbgCqi;
                 }
               }
-            NS_LOG_DEBUG (this << "\t CQI " << rbgCqi);
+            NS_LOG_DEBUG (this << "\t MCS " << (uint16_t)mcs << "-> CQI " << rbgCqi);
             // fill the cqi vector (per RB basis)
             for (uint8_t j = 0; j < rbgSize; j++)
               {
--- a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc	Wed Jan 23 18:54:03 2013 +0100
+++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.cc	Thu Jan 24 13:58:26 2013 +0100
@@ -103,12 +103,12 @@
   AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,4800,75250,62000,errorModel));
   AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,4800,60200,49600,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
-  // 3 users -> 903000 among 3 users -> 301000 bytes/sec
-  // 6 users -> 903000 among 6 users -> 150500 bytes/sec
-  // 12 users -> 903000 among 12 users -> 75250 bytes/sec
-  // 15 users -> 903000 among 15 users -> 60200 bytes/sec
+  // DOWNLINK - DISTANCE 6000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
+  // 1 user -> 24 PRB at Itbs 15 -> 775 -> 775000 bytes/sec
+  // 3 users -> 775000 among 3 users -> 258000 bytes/sec
+  // 6 users -> 775000 among 6 users -> 129200 bytes/sec
+  // 12 users -> 775000 among 12 users -> 64590 bytes/sec
+  // 15 users -> 775000 among 15 users -> 51700 bytes/sec
   // 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
@@ -116,11 +116,11 @@
   // 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
   // 15 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/15 UE/TTI -> 38993 bytes/sec
-  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,6000,903000,621000,errorModel));
-  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,6000,301000,201000,errorModel));
-  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,6000,150500,97000,errorModel));
-  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,6000,75250,48667,errorModel));
-  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,6000,60200,38993,errorModel));
+  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (1,0,6000,775000,621000,errorModel));
+  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (3,0,6000,258000,201000,errorModel));
+  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (6,0,6000,129200,97000,errorModel));
+  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (12,0,6000,64590,48667,errorModel));
+  AddTestCase (new LenaPfFfMacSchedulerTestCase1 (15,0,6000,51700,38993,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
--- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc	Wed Jan 23 18:54:03 2013 +0100
+++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc	Thu Jan 24 13:58:26 2013 +0100
@@ -105,13 +105,13 @@
   AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,4800,113000,62000,errorModel));
   AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,4800,90400,49600,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
-  // 3 users -> 8 PRB at Itbs 15 -> 309 -> 309000 bytes/sec
-  // 6 users -> 4 PRB at Itbs 15 -> 153 -> 153000 bytes/sec
-  // 9 user -> 2 PRB at Itbs 15 -> 75 -> 75000 bytes/sec
-  // 12 users -> 2 PRB at Itbs 15 -> 75 -> 75000 bytes/sec
-  // 15 users -> 2 PRB at Itbs 15 * 0.8 -> 60 -> 60000 bytes/sec
+  // DOWNLINK - DISTANCE 6000 -> MCS 14 -> Itbs 13 (from table 7.1.7.2.1-1 of 36.213)
+  // 1 user -> 24 PRB at Itbs 15 -> 775 -> 775000 bytes/sec
+  // 3 users -> 8 PRB at Itbs 15 -> 253 -> 253000 bytes/sec
+  // 6 users -> 4 PRB at Itbs 15 -> 125 -> 125000 bytes/sec
+  // 9 user -> 2 PRB at Itbs 15 -> 61 -> 61000 bytes/sec
+  // 12 users -> 2 PRB at Itbs 15 -> 61 -> 61000 bytes/sec
+  // 15 users -> 2 PRB at Itbs 15 * 0.8 -> 48.8 -> 48800 bytes/sec
   // 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
@@ -119,12 +119,12 @@
   // 9 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/9 UE/TTI -> 64889 bytes/sec
   // 12 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/12 UE/TTI -> 48667 bytes/sec
   // 15 users -> 3 PRB at Itbs 11 -> 73 bytes * 8/15 UE/TTI -> 38993 bytes/sec
-  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,6000,903000,621000,errorModel));
-  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,6000,309000,201000,errorModel));
-  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,6000,153000,97000,errorModel));
-  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,6000,75000,64889,errorModel));
-  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,6000,75000,48667,errorModel));
-  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,6000,60000,38993,errorModel));
+  AddTestCase (new LenaRrFfMacSchedulerTestCase (1,0,6000,775000,621000,errorModel));
+  AddTestCase (new LenaRrFfMacSchedulerTestCase (3,0,6000,253000,201000,errorModel));
+  AddTestCase (new LenaRrFfMacSchedulerTestCase (6,0,6000,125000,97000,errorModel));
+  AddTestCase (new LenaRrFfMacSchedulerTestCase (9,0,6000,61000,64889,errorModel));
+  AddTestCase (new LenaRrFfMacSchedulerTestCase (12,0,6000,61000,48667,errorModel));
+  AddTestCase (new LenaRrFfMacSchedulerTestCase (15,0,6000,48800,38993,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 -> 437 -> 437000 bytes/sec
tomh/ns-3-dev-spectrum-wifi