Update LteUePhy for generating wideband and subband CQIs with LteAmc::MiErrorModel

This commit is contained in:
Marco Miozzo
2012-02-21 18:06:15 +01:00
parent c69c9e4944
commit 4fa8d24e43

View File

@@ -310,14 +310,13 @@ LteUePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr)
{
NS_LOG_FUNCTION (this);
std::vector<int> cqi = m_amc->CreateCqiFeedbacks (sinr, GetRbgSize ());
// CREATE DlCqiIdealControlMessage
Ptr<DlCqiIdealControlMessage> msg = Create<DlCqiIdealControlMessage> ();
CqiListElement_s dlcqi;
std::vector<int> cqi;
if (Simulator::Now () > m_p10CqiLast + m_p10CqiPeriocity)
{
cqi = m_amc->CreateCqiFeedbacks (sinr, m_dlBandwidth);
int nbSubChannels = cqi.size ();
double cqiSum = 0.0;
@@ -350,7 +349,8 @@ LteUePhy::CreateDlCqiFeedbackMessage (const SpectrumValue& sinr)
}
else if (Simulator::Now () > m_a30CqiLast + m_a30CqiPeriocity)
{
int nbSubChannels = cqi.size ();
cqi = m_amc->CreateCqiFeedbacks (sinr, GetRbgSize ());
int nbSubChannels = m_dlBandwidth;
int rbgSize = GetRbgSize ();
double cqiSum = 0.0;
int cqiNum = 0;