merge
authorNicola Baldo <nbaldo@cttc.es>
Tue, 30 Apr 2013 14:03:44 +0100
changeset 10051 abcf7a86df4b
parent 10050 8b5a3281cd2d (current diff)
parent 9979 a84215f782d6 (diff)
child 10052 f64dd38d2228
child 10053 64f68f494c27
child 10055 fafa641d779e
child 10064 e654db11b4ae
merge
src/lte/model/rr-ff-mac-scheduler.cc
Binary file src/lte/doc/source/figures/MCS_13_16.pdf has changed
Binary file src/lte/doc/source/figures/MCS_13_16.png has changed
Binary file src/lte/doc/source/figures/MCS_17_20.pdf has changed
Binary file src/lte/doc/source/figures/MCS_17_20.png has changed
Binary file src/lte/doc/source/figures/MCS_1_4.pdf has changed
Binary file src/lte/doc/source/figures/MCS_1_4.png has changed
Binary file src/lte/doc/source/figures/MCS_21_24.pdf has changed
Binary file src/lte/doc/source/figures/MCS_21_24.png has changed
Binary file src/lte/doc/source/figures/MCS_25_28.pdf has changed
Binary file src/lte/doc/source/figures/MCS_25_28.png has changed
Binary file src/lte/doc/source/figures/MCS_29_29.pdf has changed
Binary file src/lte/doc/source/figures/MCS_29_29.png has changed
Binary file src/lte/doc/source/figures/MCS_5_8.pdf has changed
Binary file src/lte/doc/source/figures/MCS_5_8.png has changed
Binary file src/lte/doc/source/figures/MCS_9_12.pdf has changed
Binary file src/lte/doc/source/figures/MCS_9_12.png has changed
--- a/src/lte/model/rr-ff-mac-scheduler.cc	Mon Apr 29 12:32:38 2013 +0200
+++ b/src/lte/model/rr-ff-mac-scheduler.cc	Tue Apr 30 14:03:44 2013 +0100
@@ -1114,6 +1114,7 @@
               NS_LOG_INFO ("\t " << rbgAllocated);
               i++;
               rbgMap.at (rbgAllocated) = true;
+              rbgAllocatedNum++;
             }
           rbgAllocated++;
         }
@@ -1146,7 +1147,7 @@
       // ...more parameters -> ignored in this version
 
       ret.m_buildDataList.push_back (newEl);
-      if (rbgAllocated == rbgNum)
+      if (rbgAllocatedNum == rbgNum)
         {
           m_nextRntiDl = (*it).m_rnti; // store last RNTI served
           break;                       // no more RGB to be allocated