X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e709643ef0c5b61c6c878016c418bffa2b1b20cd..27ea8d78c124dd6b7cdb649b8d2bb95dc16f4cde:/src/surf/network_wifi.cpp diff --git a/src/surf/network_wifi.cpp b/src/surf/network_wifi.cpp index 9c60524148..11d48d18e6 100644 --- a/src/surf/network_wifi.cpp +++ b/src/surf/network_wifi.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2019-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -30,17 +30,16 @@ NetworkWifiLink::NetworkWifiLink(NetworkCm02Model* model, const std::string& nam void NetworkWifiLink::set_host_rate(const s4u::Host* host, int rate_level) { auto insert_done = host_rates_.insert(std::make_pair(host->get_name(), rate_level)); - if (insert_done.second == false) + if (not insert_done.second) insert_done.first->second = rate_level; // Each time we add a host, we refresh the decay model refresh_decay_bandwidths(); } -double NetworkWifiLink::get_host_rate(const s4u::Host* host) +double NetworkWifiLink::get_host_rate(const s4u::Host* host) const { - std::map::iterator host_rates_it; - host_rates_it = host_rates_.find(host->get_name()); + auto host_rates_it = host_rates_.find(host->get_name()); if (host_rates_it == host_rates_.end()) return -1; @@ -57,17 +56,22 @@ double NetworkWifiLink::get_host_rate(const s4u::Host* host) return rate.peak * rate.scale; } -s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy() +s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy() const { return s4u::Link::SharingPolicy::WIFI; } +int NetworkWifiLink::get_host_count() const +{ + return static_cast(host_rates_.size()); +} + void NetworkWifiLink::refresh_decay_bandwidths(){ // Compute number of STAtion on the Access Point - int nSTA = static_cast(host_rates_.size()); + int nSTA = get_host_count(); std::vector new_bandwidths; - for (auto bandwidth : bandwidths_){ + for (auto const& bandwidth : bandwidths_) { // Instantiate decay model relatively to the actual bandwidth double max_bw=bandwidth.peak; double min_bw=bandwidth.peak-(wifi_max_rate_-wifi_min_rate_);