X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9ca5b959b0e1b164dec1c6872785df7f91c646c7..7f90173083cea6c05e9a2418bc11c47750d006d8:/src/surf/network_wifi.hpp?ds=sidebyside

diff --git a/src/surf/network_wifi.hpp b/src/surf/network_wifi.hpp
index 87234920e6..08699dcee2 100644
--- a/src/surf/network_wifi.hpp
+++ b/src/surf/network_wifi.hpp
@@ -25,20 +25,20 @@ class NetworkWifiLink : public LinkImpl {
   /** @brief Hold every rates association between host and links (host name, rates id) */
   std::map<xbt::string, int> host_rates_;
 
-  /** @brief A link can have several bandwith attach to it (mostly use by wifi model) */
+  /** @brief A link can have several bandwidths attached to it (mostly use by wifi model) */
   std::vector<Metric> bandwidths_;
 
   /** @brief Should we use the decay model ? */
   bool use_decay_model_=false;
-  /** @brief Wifi ns-3 802.11n average bit rate */
-  const double wifi_max_rate_=54*1e6 / 8;
-  /** @brief ns-3 802.11n minimum bit rate */
-  const double wifi_min_rate_=41.70837*1e6 / 8;
-  /** @brief Decay model calibration */
+  /** @brief Wifi maximal bit rate according to the ns-3 802.11n standard */
+  const double wifi_max_rate_ = 54 * 1e6 / 8;
+  /** @brief minimum bit rate observed with ns3 during our calibration experiments */
+  const double wifi_min_rate_ = 41.70837 * 1e6 / 8;
+  /** @brief Amount of stations used in the reference point to rescale SimGrid predictions to fit ns-3 ones */
   const int model_n_=5;
-  /** @brief Decay model calibration: bitrate when using model_n_ stations */
+  /** @brief Bit rate observed on ns3 at the reference point used for rescaling */
   const double model_rate_=42.61438*1e6 / 8;
-  /** @brief Decay model bandwidths */
+  /** @brief The bandwidth to use for each SNR level, corrected with the decay rescale mechanism */
   std::vector<Metric> decay_bandwidths_;
 
 public:
@@ -66,7 +66,8 @@ public:
                     NetworkWifiLink* src_wifi_link, NetworkWifiLink* dst_wifi_link)
       : NetworkCm02Action(model, src, dst, cost, failed)
       , src_wifi_link_(src_wifi_link)
-      , dst_wifi_link_(dst_wifi_link){};
+      , dst_wifi_link_(dst_wifi_link)
+    {}
 
   NetworkWifiLink* get_src_link() const { return src_wifi_link_; }
   NetworkWifiLink* get_dst_link() const { return dst_wifi_link_; }