equal
deleted
inserted
replaced
1058 // delete correspondent entries |
1058 // delete correspondent entries |
1059 std::map <uint16_t,uint8_t>::iterator itMap = m_p10CqiRxed.find ((*itP10).first); |
1059 std::map <uint16_t,uint8_t>::iterator itMap = m_p10CqiRxed.find ((*itP10).first); |
1060 NS_ASSERT_MSG (itMap != m_p10CqiRxed.end (), " Does not find CQI report for user " << (*itP10).first); |
1060 NS_ASSERT_MSG (itMap != m_p10CqiRxed.end (), " Does not find CQI report for user " << (*itP10).first); |
1061 NS_LOG_INFO (this << " P10-CQI exired for user " << (*itP10).first); |
1061 NS_LOG_INFO (this << " P10-CQI exired for user " << (*itP10).first); |
1062 m_p10CqiRxed.erase (itMap); |
1062 m_p10CqiRxed.erase (itMap); |
1063 m_p10CqiTimers.erase (itP10); |
1063 std::map <uint16_t,uint32_t>::iterator temp = itP10; |
|
1064 itP10++; |
|
1065 m_p10CqiTimers.erase (temp); |
1064 } |
1066 } |
1065 else |
1067 else |
1066 { |
1068 { |
1067 (*itP10).second--; |
1069 (*itP10).second--; |
1068 } |
1070 itP10++; |
1069 itP10++; |
1071 } |
1070 } |
1072 } |
1071 |
1073 |
1072 // refresh DL CQI A30 Map |
1074 // refresh DL CQI A30 Map |
1073 std::map <uint16_t,uint32_t>::iterator itA30 = m_a30CqiTimers.begin (); |
1075 std::map <uint16_t,uint32_t>::iterator itA30 = m_a30CqiTimers.begin (); |
1074 while (itA30!=m_a30CqiTimers.end ()) |
1076 while (itA30!=m_a30CqiTimers.end ()) |
1079 // delete correspondent entries |
1081 // delete correspondent entries |
1080 std::map <uint16_t,SbMeasResult_s>::iterator itMap = m_a30CqiRxed.find ((*itA30).first); |
1082 std::map <uint16_t,SbMeasResult_s>::iterator itMap = m_a30CqiRxed.find ((*itA30).first); |
1081 NS_ASSERT_MSG (itMap != m_a30CqiRxed.end (), " Does not find CQI report for user " << (*itA30).first); |
1083 NS_ASSERT_MSG (itMap != m_a30CqiRxed.end (), " Does not find CQI report for user " << (*itA30).first); |
1082 NS_LOG_INFO (this << " A30-CQI exired for user " << (*itA30).first); |
1084 NS_LOG_INFO (this << " A30-CQI exired for user " << (*itA30).first); |
1083 m_a30CqiRxed.erase (itMap); |
1085 m_a30CqiRxed.erase (itMap); |
1084 m_a30CqiTimers.erase (itA30); |
1086 std::map <uint16_t,uint32_t>::iterator temp = itA30; |
|
1087 itA30++; |
|
1088 m_a30CqiTimers.erase (temp); |
1085 } |
1089 } |
1086 else |
1090 else |
1087 { |
1091 { |
1088 (*itA30).second--; |
1092 (*itA30).second--; |
1089 } |
1093 itA30++; |
1090 itA30++; |
1094 } |
1091 } |
1095 } |
1092 |
1096 |
1093 return; |
1097 return; |
1094 } |
1098 } |
1095 |
1099 |
1108 std::map <uint16_t, std::vector <double> >::iterator itMap = m_ueCqi.find ((*itUl).first); |
1112 std::map <uint16_t, std::vector <double> >::iterator itMap = m_ueCqi.find ((*itUl).first); |
1109 NS_ASSERT_MSG (itMap != m_ueCqi.end (), " Does not find CQI report for user " << (*itUl).first); |
1113 NS_ASSERT_MSG (itMap != m_ueCqi.end (), " Does not find CQI report for user " << (*itUl).first); |
1110 NS_LOG_INFO (this << " UL-CQI exired for user " << (*itUl).first); |
1114 NS_LOG_INFO (this << " UL-CQI exired for user " << (*itUl).first); |
1111 (*itMap).second.clear (); |
1115 (*itMap).second.clear (); |
1112 m_ueCqi.erase (itMap); |
1116 m_ueCqi.erase (itMap); |
1113 m_ueCqiTimers.erase (itUl); |
1117 std::map <uint16_t,uint32_t>::iterator temp = itUl; |
|
1118 itUl++; |
|
1119 m_ueCqiTimers.erase (temp); |
1114 } |
1120 } |
1115 else |
1121 else |
1116 { |
1122 { |
1117 (*itUl).second--; |
1123 (*itUl).second--; |
1118 } |
1124 itUl++; |
1119 itUl++; |
1125 } |
1120 } |
1126 } |
1121 |
1127 |
1122 return; |
1128 return; |
1123 } |
1129 } |
1124 |
1130 |