Add a WifiLink::get_host_count() function that is needed by the wifi energy model

[simgrid.git] / src / surf / network_wifi.cpp

diff --git a/src/surf/network_wifi.cpp b/src/surf/network_wifi.cpp
index 29d1c5f3302e996b9dbe7572d6616db137dc0595..838c1507fcb921dca894272866ab2964b75457aa 100644 (file)
--- a/src/surf/network_wifi.cpp
+++ b/src/surf/network_wifi.cpp
@@ -46,8 +46,12 @@ double NetworkWifiLink::get_host_rate(const s4u::Host* host)
     return -1;
 
   int rate_id = host_rates_it->second;
-  xbt_assert(rate_id >= 0 && rate_id < (int)bandwidths_.size(), "Host '%s' has an invalid rate '%d' on wifi link '%s'",
-             host->get_name().c_str(), rate_id, this->get_cname());
+  xbt_assert(rate_id >= 0,
+             "Negative host wifi rate levels are invalid but host '%s' uses %d as a rate level on link '%s'",
+             host->get_cname(), rate_id, this->get_cname());
+  xbt_assert(rate_id < (int)bandwidths_.size(),
+             "Link '%s' only has %zu wifi rate levels, so the provided level %d is invalid for host '%s'.",
+             this->get_cname(), bandwidths_.size(), rate_id, host->get_cname());
 
   Metric rate = use_decay_model_ ? decay_bandwidths_[rate_id] : bandwidths_[rate_id];
   return rate.peak * rate.scale;
@@ -58,13 +62,18 @@ s4u::Link::SharingPolicy NetworkWifiLink::get_sharing_policy()
   return s4u::Link::SharingPolicy::WIFI;
 }
 
+int NetworkWifiLink::get_host_count()
+{
+  return host_rates_.size();
+}
+
 void NetworkWifiLink::refresh_decay_bandwidths(){
   // Compute number of STAtion on the Access Point
-  int nSTA=host_rates_.size();
-    
+  int nSTA = get_host_count();
+
   std::vector<Metric> new_bandwidths;
   for (auto bandwidth : bandwidths_){
-    // Instanciate decay model relatively to the actual bandwidth
+    // Instantiate decay model relatively to the actual bandwidth
     double max_bw=bandwidth.peak;
     double min_bw=bandwidth.peak-(wifi_max_rate_-wifi_min_rate_);
     double model_rate=bandwidth.peak-(wifi_max_rate_-model_rate_);
@@ -76,7 +85,6 @@ void NetworkWifiLink::refresh_decay_bandwidths(){
     // Since decay model start at 0 we should use (nSTA-1)
     double new_peak=N0*exp(-lambda*(nSTA-1))+min_bw;
     new_bandwidths.push_back({new_peak, 1.0, nullptr});
-
   }
   decay_bandwidths_=new_bandwidths;
 }