A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of framagit.org:Adrien.Gougeon/simgrid
[simgrid.git]
/
src
/
surf
/
network_wifi.cpp
diff --git
a/src/surf/network_wifi.cpp
b/src/surf/network_wifi.cpp
index 9c605241488e9da847686cd16c5eeafbbe29cd02..eee27596c2b6d6eacd122b4757e6842f27091bca 100644
(file)
--- a/
src/surf/network_wifi.cpp
+++ b/
src/surf/network_wifi.cpp
@@
-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));
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();
}
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<xbt::string, int>::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;
if (host_rates_it == host_rates_.end())
return -1;
@@
-57,14
+56,19
@@
double NetworkWifiLink::get_host_rate(const s4u::Host* host)
return rate.peak * rate.scale;
}
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;
}
{
return s4u::Link::SharingPolicy::WIFI;
}
+int NetworkWifiLink::get_host_count() const
+{
+ return host_rates_.size();
+}
+
void NetworkWifiLink::refresh_decay_bandwidths(){
// Compute number of STAtion on the Access Point
void NetworkWifiLink::refresh_decay_bandwidths(){
// Compute number of STAtion on the Access Point
- int nSTA =
static_cast<int>(host_rates_.size()
);
+ int nSTA =
get_host_count(
);
std::vector<Metric> new_bandwidths;
for (auto bandwidth : bandwidths_){
std::vector<Metric> new_bandwidths;
for (auto bandwidth : bandwidths_){