diff --git a/src/internet/helper/ipv6-address-helper.cc b/src/internet/helper/ipv6-address-helper.cc index ace31bcc3..28db659fc 100644 --- a/src/internet/helper/ipv6-address-helper.cc +++ b/src/internet/helper/ipv6-address-helper.cc @@ -220,11 +220,7 @@ Ipv6InterfaceContainer Ipv6AddressHelper::Assign(const NetDeviceContainer& c) { NS_LOG_FUNCTION(this); - std::vector withConfiguration; - for (uint32_t i = 0; i < c.GetN(); ++i) - { - withConfiguration.push_back(true); - } + std::vector withConfiguration(c.GetN(), true); return Assign(c, withConfiguration); } @@ -232,11 +228,7 @@ Ipv6InterfaceContainer Ipv6AddressHelper::Assign(const NetDeviceContainer& c, std::vector withConfiguration) { NS_LOG_FUNCTION(this); - std::vector onLink; - for (uint32_t i = 0; i < c.GetN(); ++i) - { - onLink.push_back(true); - } + std::vector onLink(c.GetN(), true); return Assign(c, withConfiguration, onLink); } @@ -312,11 +304,7 @@ Ipv6InterfaceContainer Ipv6AddressHelper::AssignWithoutAddress(const NetDeviceContainer& c) { NS_LOG_FUNCTION(this); - std::vector withConfiguration; - for (uint32_t i = 0; i < c.GetN(); ++i) - { - withConfiguration.push_back(false); - } + std::vector withConfiguration(c.GetN(), false); return Assign(c, withConfiguration); } @@ -324,13 +312,10 @@ Ipv6InterfaceContainer Ipv6AddressHelper::AssignWithoutOnLink(const NetDeviceContainer& c) { NS_LOG_FUNCTION(this); - std::vector withConfiguration; - std::vector onLink; - for (uint32_t i = 0; i < c.GetN(); ++i) - { - withConfiguration.push_back(true); - onLink.push_back(false); - } + + std::vector withConfiguration(c.GetN(), true); + std::vector onLink(c.GetN(), false); + return Assign(c, withConfiguration, onLink); } diff --git a/src/lte/model/cqa-ff-mac-scheduler.cc b/src/lte/model/cqa-ff-mac-scheduler.cc index 4707e5704..d15a254a4 100644 --- a/src/lte/model/cqa-ff-mac-scheduler.cc +++ b/src/lte/model/cqa-ff-mac-scheduler.cc @@ -1282,10 +1282,7 @@ CqaFfMacScheduler::DoSchedDlTriggerReq( std::vector sbCqis; if (itCqi == m_a30CqiRxed.end()) { - for (uint8_t k = 0; k < nLayer; k++) - { - sbCqis.push_back(1); // start with lowest value - } + sbCqis = std::vector(nLayer, 1); // start with lowest value } else { diff --git a/src/lte/model/fdmt-ff-mac-scheduler.cc b/src/lte/model/fdmt-ff-mac-scheduler.cc index 32bebcab0..65bed846c 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.cc +++ b/src/lte/model/fdmt-ff-mac-scheduler.cc @@ -917,10 +917,7 @@ FdMtFfMacScheduler::DoSchedDlTriggerReq( std::vector sbCqi; if (itCqi == m_a30CqiRxed.end()) { - for (uint8_t k = 0; k < nLayer; k++) - { - sbCqi.push_back(1); // start with lowest value - } + sbCqi = std::vector(nLayer, 1); // start with lowest value } else { diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc index 96e94698c..d70b55815 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc @@ -1207,10 +1207,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq( std::vector sbCqi; if (itCqi == m_a30CqiRxed.end()) { - for (uint8_t k = 0; k < nLayer; k++) - { - sbCqi.push_back(1); // start with lowest value - } + sbCqi = std::vector(nLayer, 1); // start with lowest value } else { diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc index 3a0918c8a..80d5669dc 100644 --- a/src/lte/model/pf-ff-mac-scheduler.cc +++ b/src/lte/model/pf-ff-mac-scheduler.cc @@ -984,10 +984,7 @@ PfFfMacScheduler::DoSchedDlTriggerReq( std::vector sbCqi; if (itCqi == m_a30CqiRxed.end()) { - for (uint8_t k = 0; k < nLayer; k++) - { - sbCqi.push_back(1); // start with lowest value - } + sbCqi = std::vector(nLayer, 1); // start with lowest value } else { diff --git a/src/lte/model/pss-ff-mac-scheduler.cc b/src/lte/model/pss-ff-mac-scheduler.cc index 4884a52b1..3948ffecb 100644 --- a/src/lte/model/pss-ff-mac-scheduler.cc +++ b/src/lte/model/pss-ff-mac-scheduler.cc @@ -1150,10 +1150,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq( std::vector sbCqis; if (itCqi == m_a30CqiRxed.end()) { - for (uint8_t k = 0; k < nLayer; k++) - { - sbCqis.push_back(1); // start with lowest value - } + sbCqis = std::vector(nLayer, 1); // start with lowest value } else { @@ -1230,10 +1227,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq( std::vector sbCqis; if (itCqi == m_a30CqiRxed.end()) { - for (uint8_t k = 0; k < nLayer; k++) - { - sbCqis.push_back(1); // start with lowest value - } + sbCqis = std::vector(nLayer, 1); // start with lowest value } else { @@ -1336,10 +1330,7 @@ PssFfMacScheduler::DoSchedDlTriggerReq( std::vector sbCqis; if (itCqi == m_a30CqiRxed.end()) { - for (uint8_t k = 0; k < nLayer; k++) - { - sbCqis.push_back(1); // start with lowest value - } + sbCqis = std::vector(nLayer, 1); // start with lowest value } else { diff --git a/src/lte/model/tta-ff-mac-scheduler.cc b/src/lte/model/tta-ff-mac-scheduler.cc index 0b6b58d8e..0824005a4 100644 --- a/src/lte/model/tta-ff-mac-scheduler.cc +++ b/src/lte/model/tta-ff-mac-scheduler.cc @@ -921,10 +921,7 @@ TtaFfMacScheduler::DoSchedDlTriggerReq( std::vector sbCqi; if (itSbCqi == m_a30CqiRxed.end()) { - for (uint8_t k = 0; k < nLayer; k++) - { - sbCqi.push_back(1); // start with lowest value - } + sbCqi = std::vector(nLayer, 1); // start with lowest value } else { diff --git a/src/spectrum/model/three-gpp-channel-model.cc b/src/spectrum/model/three-gpp-channel-model.cc index 9c84934a5..32674dcc9 100644 --- a/src/spectrum/model/three-gpp-channel-model.cc +++ b/src/spectrum/model/three-gpp-channel-model.cc @@ -2197,12 +2197,11 @@ ThreeGppChannelModel::CalcAttenuationOfBlockage( { NS_LOG_FUNCTION(this); - DoubleVector powerAttenuation; - uint8_t clusterNum = clusterAOA.size(); - for (uint8_t cInd = 0; cInd < clusterNum; cInd++) - { - powerAttenuation.push_back(0); // Initial power attenuation for all clusters to be 0 dB; - } + auto clusterNum = clusterAOA.size(); + + // Initial power attenuation for all clusters to be 0 dB + DoubleVector powerAttenuation(clusterNum, 0); + // step a: the number of non-self blocking blockers is stored in m_numNonSelfBlocking. // step b:Generate the size and location of each blocker diff --git a/src/wifi/model/rate-control/minstrel-ht-wifi-manager.cc b/src/wifi/model/rate-control/minstrel-ht-wifi-manager.cc index d10142607..ec6ed6d98 100644 --- a/src/wifi/model/rate-control/minstrel-ht-wifi-manager.cc +++ b/src/wifi/model/rate-control/minstrel-ht-wifi-manager.cc @@ -2229,33 +2229,24 @@ MinstrelHtWifiManager::GetLowestIndex(MinstrelHtWifiRemoteStation* station, uint WifiModeList MinstrelHtWifiManager::GetHeDeviceMcsList() const { - WifiModeList heMcsList; - for (const auto& mode : GetPhy()->GetMcsList(WIFI_MOD_CLASS_HE)) - { - heMcsList.push_back(mode); - } + const auto& mcsList = GetPhy()->GetMcsList(WIFI_MOD_CLASS_HE); + WifiModeList heMcsList(mcsList.begin(), mcsList.end()); return heMcsList; } WifiModeList MinstrelHtWifiManager::GetVhtDeviceMcsList() const { - WifiModeList vhtMcsList; - for (const auto& mode : GetPhy()->GetMcsList(WIFI_MOD_CLASS_VHT)) - { - vhtMcsList.push_back(mode); - } + const auto& mcsList = GetPhy()->GetMcsList(WIFI_MOD_CLASS_VHT); + WifiModeList vhtMcsList(mcsList.begin(), mcsList.end()); return vhtMcsList; } WifiModeList MinstrelHtWifiManager::GetHtDeviceMcsList() const { - WifiModeList htMcsList; - for (const auto& mode : GetPhy()->GetMcsList(WIFI_MOD_CLASS_HT)) - { - htMcsList.push_back(mode); - } + const auto& mcsList = GetPhy()->GetMcsList(WIFI_MOD_CLASS_HT); + WifiModeList htMcsList(mcsList.begin(), mcsList.end()); return htMcsList; } diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc index 554b6fe7b..7d15aface 100644 --- a/src/wifi/model/wifi-remote-station-manager.cc +++ b/src/wifi/model/wifi-remote-station-manager.cc @@ -390,11 +390,9 @@ WifiRemoteStationManager::AddAllSupportedMcs(Mac48Address address) NS_LOG_FUNCTION(this << address); NS_ASSERT(!address.IsGroup()); auto state = LookupState(address); - state->m_operationalMcsSet.clear(); - for (const auto& mcs : m_wifiPhy->GetMcsList()) - { - state->m_operationalMcsSet.push_back(mcs); - } + + const auto& mcsList = m_wifiPhy->GetMcsList(); + state->m_operationalMcsSet = WifiModeList(mcsList.begin(), mcsList.end()); } void