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

lte: Fix typo in resource block group abbreviations (RGB->RBG)

Browse Source
This commit is contained in:
André Apitzsch
2024-04-18 14:39:47 +02:00
parent d1fb6b4046
commit 2c0f33f80e
16 changed files with 83 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lte/model/cqa-ff-mac-scheduler.cc
View File

@@ -47,10 +47,10 @@ NS_LOG_COMPONENT_DEFINE("CqaFfMacScheduler");
/// CGA Type 0 Allocation
static const int CqaType0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(CqaFfMacScheduler);
@@ -1571,8 +1571,8 @@ CqaFfMacScheduler::DoSchedDlTriggerReq(
lcActives = 1;
}
// NS_LOG_DEBUG (this << "Allocate user " << newEl.m_rnti << " rbg " << lcActives);
uint16_t RgbPerRnti = (*itMap).second.size();
double doubleRBgPerRnti = RgbPerRnti;
uint16_t RbgPerRnti = (*itMap).second.size();
double doubleRBgPerRnti = RbgPerRnti;
double doubleRbgNum = numberOfRBGs;
double rrRatio = doubleRBgPerRnti / doubleRbgNum;
m_rnti_per_ratio.insert(std::pair<uint16_t, double>((*itMap).first, rrRatio));
@@ -1588,7 +1588,7 @@ CqaFfMacScheduler::DoSchedDlTriggerReq(
}
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi(worstCqi));
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(0), RgbPerRnti * rbgSize) /
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(0), RbgPerRnti * rbgSize) /
8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213)
newDci.m_tbsSize.push_back(tbSize);
newDci.m_resAlloc = 0; // only allocation type 0 at this stage

2
src/lte/model/cqa-ff-mac-scheduler.h
View File

@@ -213,7 +213,7 @@ class CqaFfMacScheduler : public FfMacScheduler
void DoSchedUlCqiInfoReq(const FfMacSchedSapProvider::SchedUlCqiInfoReqParameters& params);
/**
* Get RGB Size
* Get RBG Size
* \param dlbandwidth the DL bandwidth
* \returns the size
*/

12
src/lte/model/fdbet-ff-mac-scheduler.cc
View File

@@ -39,10 +39,10 @@ NS_LOG_COMPONENT_DEFINE("FdBetFfMacScheduler");
/// FdBetType0AllocationRbg array
static const int FdBetType0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(FdBetFfMacScheduler);
@@ -1037,7 +1037,7 @@ FdBetFfMacScheduler::DoSchedDlTriggerReq(
// Set to max value, to avoid divide by 0 below
lcActives = (uint16_t)65535; // UINT16_MAX;
}
uint16_t RgbPerRnti = (*itMap).second.size();
uint16_t RbgPerRnti = (*itMap).second.size();
auto itCqi = m_p10CqiRxed.find((*itMap).first);
auto itTxMode = m_uesTxMode.find((*itMap).first);
if (itTxMode == m_uesTxMode.end())
@@ -1058,7 +1058,7 @@ FdBetFfMacScheduler::DoSchedDlTriggerReq(
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi((*itCqi).second));
}
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RgbPerRnti * rbgSize) /
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RbgPerRnti * rbgSize) /
8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213)
newDci.m_tbsSize.push_back(tbSize);
bytesTxed += tbSize;

12
src/lte/model/fdmt-ff-mac-scheduler.cc
View File

@@ -39,10 +39,10 @@ NS_LOG_COMPONENT_DEFINE("FdMtFfMacScheduler");
/// FdMtType0AllocationRbg size array
static const int FdMtType0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(FdMtFfMacScheduler);
@@ -980,7 +980,7 @@ FdMtFfMacScheduler::DoSchedDlTriggerReq(
// Set to max value, to avoid divide by 0 below
lcActives = (uint16_t)65535; // UINT16_MAX;
}
uint16_t RgbPerRnti = (*itMap).second.size();
uint16_t RbgPerRnti = (*itMap).second.size();
auto itCqi = m_a30CqiRxed.find((*itMap).first);
auto itTxMode = m_uesTxMode.find((*itMap).first);
if (itTxMode == m_uesTxMode.end())
@@ -1047,7 +1047,7 @@ FdMtFfMacScheduler::DoSchedDlTriggerReq(
for (uint8_t j = 0; j < nLayer; j++)
{
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi(worstCqi.at(j)));
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RgbPerRnti * rbgSize) /
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RbgPerRnti * rbgSize) /
8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213)
newDci.m_tbsSize.push_back(tbSize);
NS_LOG_INFO(this << " Layer " << (uint16_t)j << " MCS selected"

12
src/lte/model/fdtbfq-ff-mac-scheduler.cc
View File

@@ -40,10 +40,10 @@ NS_LOG_COMPONENT_DEFINE("FdTbfqFfMacScheduler");
/// FdTbfqType0AllocationRbg value array
static const int FdTbfqType0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(FdTbfqFfMacScheduler);
@@ -1373,7 +1373,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq(
// Set to max value, to avoid divide by 0 below
lcActives = (uint16_t)65535; // UINT16_MAX;
}
uint16_t RgbPerRnti = (*itMap).second.size();
uint16_t RbgPerRnti = (*itMap).second.size();
auto itCqi = m_a30CqiRxed.find((*itMap).first);
auto itTxMode = m_uesTxMode.find((*itMap).first);
if (itTxMode == m_uesTxMode.end())
@@ -1440,7 +1440,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq(
for (uint8_t j = 0; j < nLayer; j++)
{
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi(worstCqi.at(j)));
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RgbPerRnti * rbgSize) /
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RbgPerRnti * rbgSize) /
8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213)
newDci.m_tbsSize.push_back(tbSize);
NS_LOG_INFO(this << " Layer " << (uint16_t)j << " MCS selected"

8
src/lte/model/lte-enb-phy.cc
View File

@@ -882,10 +882,10 @@ LteEnbPhy::DoSetBandwidth(uint16_t ulBandwidth, uint16_t dlBandwidth)
m_dlBandwidth = dlBandwidth;
static const int Type0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
for (int i = 0; i < 4; i++)
{

10
src/lte/model/lte-ffr-algorithm.cc
View File

@@ -29,12 +29,12 @@ namespace ns3
NS_LOG_COMPONENT_DEFINE("LteFfrAlgorithm");
/// Type 0 RGB allocation
/// Type 0 RBG allocation
static const int Type0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 3GPP TS 36.213
NS_OBJECT_ENSURE_REGISTERED(LteFfrAlgorithm);

6
src/lte/model/lte-ffr-distributed-algorithm.h
View File

@@ -96,16 +96,16 @@ class LteFfrDistributedAlgorithm : public LteFfrAlgorithm
*/
void SetUplinkConfiguration(uint16_t cellId, uint8_t bandwidth);
/**
* Initialize down link RGB maps function
* Initialize down link RBG maps function
*/
void InitializeDownlinkRbgMaps();
/**
* Initialize up link RGB maps function
* Initialize up link RBG maps function
*/
void InitializeUplinkRbgMaps();
/**
* Initialize up link RGB maps function
* Initialize up link RBG maps function
*
* \param rnti the RNTI
* \param cellId the cell ID

8
src/lte/model/lte-ue-phy.cc
View File

@@ -1467,10 +1467,10 @@ LteUePhy::DoSetDlBandwidth(uint16_t dlBandwidth)
m_dlBandwidth = dlBandwidth;
static const int Type0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
for (int i = 0; i < 4; i++)
{

12
src/lte/model/pf-ff-mac-scheduler.cc
View File

@@ -38,10 +38,10 @@ NS_LOG_COMPONENT_DEFINE("PfFfMacScheduler");
/// PF type 0 allocation RBG
static const int PfType0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(PfFfMacScheduler);
@@ -1054,7 +1054,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq(
// Set to max value, to avoid divide by 0 below
lcActives = (uint16_t)65535; // UINT16_MAX;
}
uint16_t RgbPerRnti = (*itMap).second.size();
uint16_t RbgPerRnti = (*itMap).second.size();
auto itCqi = m_a30CqiRxed.find((*itMap).first);
auto itTxMode = m_uesTxMode.find((*itMap).first);
if (itTxMode == m_uesTxMode.end())
@@ -1122,7 +1122,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq(
for (uint8_t j = 0; j < nLayer; j++)
{
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi(worstCqi.at(j)));
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RgbPerRnti * rbgSize) /
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RbgPerRnti * rbgSize) /
8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213)
newDci.m_tbsSize.push_back(tbSize);
NS_LOG_INFO(this << " Layer " << (uint16_t)j << " MCS selected"

12
src/lte/model/pss-ff-mac-scheduler.cc
View File

@@ -41,10 +41,10 @@ NS_LOG_COMPONENT_DEFINE("PssFfMacScheduler");
/// PSS type 0 allocation RBG
static const int PssType0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(PssFfMacScheduler);
@@ -1378,7 +1378,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq(
// Set to max value, to avoid divide by 0 below
lcActives = (uint16_t)65535; // UINT16_MAX;
}
uint16_t RgbPerRnti = (*itMap).second.size();
uint16_t RbgPerRnti = (*itMap).second.size();
auto itCqi = m_a30CqiRxed.find((*itMap).first);
auto itTxMode = m_uesTxMode.find((*itMap).first);
if (itTxMode == m_uesTxMode.end())
@@ -1446,7 +1446,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq(
for (uint8_t j = 0; j < nLayer; j++)
{
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi(worstCqi.at(j)));
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RgbPerRnti * rbgSize) /
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RbgPerRnti * rbgSize) /
8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213)
newDci.m_tbsSize.push_back(tbSize);
NS_LOG_INFO(this << " Layer " << (uint16_t)j << " MCS selected"

10
src/lte/model/rr-ff-mac-scheduler.cc
View File

@@ -40,10 +40,10 @@ NS_LOG_COMPONENT_DEFINE("RrFfMacScheduler");
/// Type 0 allocation RBG
static const int Type0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(RrFfMacScheduler);
@@ -1092,7 +1092,7 @@ RrFfMacScheduler::DoSchedDlTriggerReq(
if (rbgAllocatedNum == rbgNum)
{
m_nextRntiDl = newEl.m_rnti; // store last RNTI served
break; // no more RGB to be allocated
break; // no more RBG to be allocated
}
} while ((*it).m_rnti != m_nextRntiDl);

12
src/lte/model/tdbet-ff-mac-scheduler.cc
View File

@@ -39,10 +39,10 @@ NS_LOG_COMPONENT_DEFINE("TdBetFfMacScheduler");
/// TDBET type 0 allocation RBG
static const int TdBetType0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(TdBetFfMacScheduler);
@@ -960,7 +960,7 @@ TdBetFfMacScheduler::DoSchedDlTriggerReq(
// Set to max value, to avoid divide by 0 below
lcActives = (uint16_t)65535; // UINT16_MAX;
}
uint16_t RgbPerRnti = (*itMap).second.size();
uint16_t RbgPerRnti = (*itMap).second.size();
auto itCqi = m_p10CqiRxed.find((*itMap).first);
auto itTxMode = m_uesTxMode.find((*itMap).first);
if (itTxMode == m_uesTxMode.end())
@@ -981,7 +981,7 @@ TdBetFfMacScheduler::DoSchedDlTriggerReq(
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi((*itCqi).second));
}
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RgbPerRnti * rbgSize) /
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RbgPerRnti * rbgSize) /
8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213)
newDci.m_tbsSize.push_back(tbSize);
bytesTxed += tbSize;

12
src/lte/model/tdmt-ff-mac-scheduler.cc
View File

@@ -39,10 +39,10 @@ NS_LOG_COMPONENT_DEFINE("TdMtFfMacScheduler");
/// TDMT type 0 allocation RBG
static const int TdMtType0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(TdMtFfMacScheduler);
@@ -965,7 +965,7 @@ TdMtFfMacScheduler::DoSchedDlTriggerReq(
// Set to max value, to avoid divide by 0 below
lcActives = (uint16_t)65535; // UINT16_MAX;
}
uint16_t RgbPerRnti = (*itMap).second.size();
uint16_t RbgPerRnti = (*itMap).second.size();
auto itCqi = m_p10CqiRxed.find((*itMap).first);
auto itTxMode = m_uesTxMode.find((*itMap).first);
if (itTxMode == m_uesTxMode.end())
@@ -984,7 +984,7 @@ TdMtFfMacScheduler::DoSchedDlTriggerReq(
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi((*itCqi).second));
}
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RgbPerRnti * rbgSize) /
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RbgPerRnti * rbgSize) /
8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213)
newDci.m_tbsSize.push_back(tbSize);
}

12
src/lte/model/tdtbfq-ff-mac-scheduler.cc
View File

@@ -40,10 +40,10 @@ NS_LOG_COMPONENT_DEFINE("TdTbfqFfMacScheduler");
/// TDTBFQ type 0 allocation RBG
static const int TdTbfqType0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(TdTbfqFfMacScheduler);
@@ -1106,7 +1106,7 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq(
// Set to max value, to avoid divide by 0 below
lcActives = (uint16_t)65535; // UINT16_MAX;
}
uint16_t RgbPerRnti = (*itMap).second.size();
uint16_t RbgPerRnti = (*itMap).second.size();
auto itCqi = m_a30CqiRxed.find((*itMap).first);
auto itTxMode = m_uesTxMode.find((*itMap).first);
if (itTxMode == m_uesTxMode.end())
@@ -1164,7 +1164,7 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq(
for (uint8_t j = 0; j < nLayer; j++)
{
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi(worstCqi.at(j)));
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RgbPerRnti * rbgSize) /
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RbgPerRnti * rbgSize) /
8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213)
newDci.m_tbsSize.push_back(tbSize);
bytesTxed += tbSize;

12
src/lte/model/tta-ff-mac-scheduler.cc
View File

@@ -39,10 +39,10 @@ NS_LOG_COMPONENT_DEFINE("TtaFfMacScheduler");
/// TTA type 0 allocation RBG
static const int TtaType0AllocationRbg[4] = {
10, // RGB size 1
26, // RGB size 2
63, // RGB size 3
110, // RGB size 4
10, // RBG size 1
26, // RBG size 2
63, // RBG size 3
110, // RBG size 4
}; // see table 7.1.6.1-1 of 36.213
NS_OBJECT_ENSURE_REGISTERED(TtaFfMacScheduler);
@@ -996,7 +996,7 @@ TtaFfMacScheduler::DoSchedDlTriggerReq(
// Set to max value, to avoid divide by 0 below
lcActives = (uint16_t)65535; // UINT16_MAX;
}
uint16_t RgbPerRnti = (*itMap).second.size();
uint16_t RbgPerRnti = (*itMap).second.size();
auto itCqi = m_a30CqiRxed.find((*itMap).first);
auto itTxMode = m_uesTxMode.find((*itMap).first);
if (itTxMode == m_uesTxMode.end())
@@ -1063,7 +1063,7 @@ TtaFfMacScheduler::DoSchedDlTriggerReq(
for (uint8_t j = 0; j < nLayer; j++)
{
newDci.m_mcs.push_back(m_amc->GetMcsFromCqi(worstCqi.at(j)));
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RgbPerRnti * rbgSize) /
int tbSize = (m_amc->GetDlTbSizeFromMcs(newDci.m_mcs.at(j), RbgPerRnti * rbgSize) /
8); // (size of TB in bytes according to table 7.1.7.2.1-1 of 36.213)
newDci.m_tbsSize.push_back(tbSize);
NS_LOG_INFO(this << " Layer " << (uint16_t)j << " MCS selected"