--- a/src/lte/model/tdmt-ff-mac-scheduler.cc Sun Dec 02 18:08:59 2012 -0800
+++ b/src/lte/model/tdmt-ff-mac-scheduler.cc Sat Dec 01 19:08:52 2012 -0500
@@ -454,18 +454,18 @@
NS_FATAL_ERROR ("No Transmission Mode info on user " << (*it));
}
int nLayer = TransmissionModesLayers::TxMode2LayerNum ((*itTxMode).second);
- uint8_t wbCqi = 0;
- if (itCqi == m_p10CqiRxed.end())
- {
- wbCqi = 1; // start with lowest value
- }
+ uint8_t wbCqi = 0;
+ if (itCqi == m_p10CqiRxed.end())
+ {
+ wbCqi = 1; // start with lowest value
+ }
else
{
- wbCqi = (*itCqi).second;
+ wbCqi = (*itCqi).second;
}
- if (wbCqi > 0)
- {
+ if (wbCqi > 0)
+ {
if (LcActivePerFlow (*it) > 0)
{
// this UE has data to transmit
@@ -477,13 +477,13 @@
achievableRate += ((m_amc->GetTbSizeFromMcs (mcs, rbgSize) / 8) / 0.001); // = TB size / TTI
}
- double metric = achievableRate;
+ double metric = achievableRate;
- if (metric > metricMax)
- {
- metricMax = metric;
- itMax = it;
- }
+ if (metric > metricMax)
+ {
+ metricMax = metric;
+ itMax = it;
+ }
}
} // end of wbCqi
} // end for m_flowStatsDl
@@ -491,16 +491,16 @@
if (itMax == m_flowStatsDl.end ())
{
// no UE available for downlink
- return;
+ return;
}
else
{
// assign all RBGs to this UE
std::vector <uint16_t> tempMap;
- for (int i = 0; i < rbgNum; i++)
- {
+ for (int i = 0; i < rbgNum; i++)
+ {
tempMap.push_back (i);
- }
+ }
allocationMap.insert (std::pair <uint16_t, std::vector <uint16_t> > ((*itMax), tempMap));
}
@@ -520,7 +520,7 @@
uint16_t lcActives = LcActivePerFlow ((*itMap).first);
std::map <uint16_t,uint8_t>::iterator itCqi;
- itCqi = m_p10CqiRxed.find((*itMap).first);
+ itCqi = m_p10CqiRxed.find((*itMap).first);
std::map <uint16_t,uint8_t>::iterator itTxMode;
itTxMode = m_uesTxMode.find ((*itMap).first);
if (itTxMode == m_uesTxMode.end ())
@@ -538,7 +538,7 @@
{
newDci.m_mcs.push_back ( m_amc->GetMcsFromCqi ((*itCqi).second) );
}
- // allocate all RBGs to this UE
+ // allocate all RBGs to this UE
int tbSize = (m_amc->GetTbSizeFromMcs (newDci.m_mcs.at (j), rbgNum * 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);
}