diff --git a/src/lte/doc/source/figures/MCS_13_16.pdf b/src/lte/doc/source/figures/MCS_13_16.pdf index 7308cf611..d1f06348a 100644 Binary files a/src/lte/doc/source/figures/MCS_13_16.pdf and b/src/lte/doc/source/figures/MCS_13_16.pdf differ diff --git a/src/lte/doc/source/figures/MCS_13_16.png b/src/lte/doc/source/figures/MCS_13_16.png index de4f9d939..9d3b46947 100644 Binary files a/src/lte/doc/source/figures/MCS_13_16.png and b/src/lte/doc/source/figures/MCS_13_16.png differ diff --git a/src/lte/doc/source/figures/MCS_17_20.pdf b/src/lte/doc/source/figures/MCS_17_20.pdf index 4ba137a44..53a79c4f3 100644 Binary files a/src/lte/doc/source/figures/MCS_17_20.pdf and b/src/lte/doc/source/figures/MCS_17_20.pdf differ diff --git a/src/lte/doc/source/figures/MCS_17_20.png b/src/lte/doc/source/figures/MCS_17_20.png index 8890ad0db..5ed179edf 100644 Binary files a/src/lte/doc/source/figures/MCS_17_20.png and b/src/lte/doc/source/figures/MCS_17_20.png differ diff --git a/src/lte/doc/source/figures/MCS_1_4.pdf b/src/lte/doc/source/figures/MCS_1_4.pdf index 68f988d11..c18bcadbd 100644 Binary files a/src/lte/doc/source/figures/MCS_1_4.pdf and b/src/lte/doc/source/figures/MCS_1_4.pdf differ diff --git a/src/lte/doc/source/figures/MCS_1_4.png b/src/lte/doc/source/figures/MCS_1_4.png index 2de4b9b8b..7b8f058cf 100644 Binary files a/src/lte/doc/source/figures/MCS_1_4.png and b/src/lte/doc/source/figures/MCS_1_4.png differ diff --git a/src/lte/doc/source/figures/MCS_21_24.pdf b/src/lte/doc/source/figures/MCS_21_24.pdf index 32d9a8e91..f06c55808 100644 Binary files a/src/lte/doc/source/figures/MCS_21_24.pdf and b/src/lte/doc/source/figures/MCS_21_24.pdf differ diff --git a/src/lte/doc/source/figures/MCS_21_24.png b/src/lte/doc/source/figures/MCS_21_24.png index 6ec831219..858ee99e9 100644 Binary files a/src/lte/doc/source/figures/MCS_21_24.png and b/src/lte/doc/source/figures/MCS_21_24.png differ diff --git a/src/lte/doc/source/figures/MCS_25_28.pdf b/src/lte/doc/source/figures/MCS_25_28.pdf index a8b96e313..30a1bf31b 100644 Binary files a/src/lte/doc/source/figures/MCS_25_28.pdf and b/src/lte/doc/source/figures/MCS_25_28.pdf differ diff --git a/src/lte/doc/source/figures/MCS_25_28.png b/src/lte/doc/source/figures/MCS_25_28.png index cbd8916a8..1a5490da1 100644 Binary files a/src/lte/doc/source/figures/MCS_25_28.png and b/src/lte/doc/source/figures/MCS_25_28.png differ diff --git a/src/lte/doc/source/figures/MCS_29_29.pdf b/src/lte/doc/source/figures/MCS_29_29.pdf index d45a2ce1d..4c2fd5a74 100644 Binary files a/src/lte/doc/source/figures/MCS_29_29.pdf and b/src/lte/doc/source/figures/MCS_29_29.pdf differ diff --git a/src/lte/doc/source/figures/MCS_29_29.png b/src/lte/doc/source/figures/MCS_29_29.png index 9e7e0f2b9..c37ae8486 100644 Binary files a/src/lte/doc/source/figures/MCS_29_29.png and b/src/lte/doc/source/figures/MCS_29_29.png differ diff --git a/src/lte/doc/source/figures/MCS_5_8.pdf b/src/lte/doc/source/figures/MCS_5_8.pdf index eab06085b..81b210c90 100644 Binary files a/src/lte/doc/source/figures/MCS_5_8.pdf and b/src/lte/doc/source/figures/MCS_5_8.pdf differ diff --git a/src/lte/doc/source/figures/MCS_5_8.png b/src/lte/doc/source/figures/MCS_5_8.png index 14cab90ce..bfd6719a1 100644 Binary files a/src/lte/doc/source/figures/MCS_5_8.png and b/src/lte/doc/source/figures/MCS_5_8.png differ diff --git a/src/lte/doc/source/figures/MCS_9_12.pdf b/src/lte/doc/source/figures/MCS_9_12.pdf index 907521c7d..291c4944d 100644 Binary files a/src/lte/doc/source/figures/MCS_9_12.pdf and b/src/lte/doc/source/figures/MCS_9_12.pdf differ diff --git a/src/lte/doc/source/figures/MCS_9_12.png b/src/lte/doc/source/figures/MCS_9_12.png index 63839b2c2..19d4ec1d1 100644 Binary files a/src/lte/doc/source/figures/MCS_9_12.png and b/src/lte/doc/source/figures/MCS_9_12.png differ diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index 3da530881..cc5a0d44b 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -1114,6 +1114,7 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched NS_LOG_INFO ("\t " << rbgAllocated); i++; rbgMap.at (rbgAllocated) = true; + rbgAllocatedNum++; } rbgAllocated++; } @@ -1146,7 +1147,7 @@ RrFfMacScheduler::DoSchedDlTriggerReq (const struct FfMacSchedSapProvider::Sched // ...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