diff --git a/src/wifi/model/wifi-utils.cc b/src/wifi/model/wifi-utils.cc index ec86a5294..f17e2b4ad 100644 --- a/src/wifi/model/wifi-utils.cc +++ b/src/wifi/model/wifi-utils.cc @@ -23,6 +23,13 @@ namespace ns3 { +double +Log2 (double val) +{ + return std::log (val) / std::log (2.0); +} + + double DbToRatio (double dB) { diff --git a/src/wifi/model/wifi-utils.h b/src/wifi/model/wifi-utils.h index 5fe852901..f6ae881fd 100644 --- a/src/wifi/model/wifi-utils.h +++ b/src/wifi/model/wifi-utils.h @@ -27,6 +27,14 @@ namespace ns3 { + /** + * Return the logarithm of the given value to base 2. + * + * \param val + * + * \return the logarithm of val to base 2. + */ + double Log2 (double val); /** * Convert from dBm to Watts. * diff --git a/src/wifi/model/yans-error-rate-model.cc b/src/wifi/model/yans-error-rate-model.cc index 28996ab22..0eacaf43f 100644 --- a/src/wifi/model/yans-error-rate-model.cc +++ b/src/wifi/model/yans-error-rate-model.cc @@ -20,6 +20,7 @@ */ #include "yans-error-rate-model.h" +#include "wifi-utils.h" #include "wifi-phy.h" #include "ns3/log.h" @@ -44,12 +45,6 @@ YansErrorRateModel::YansErrorRateModel () { } -double -YansErrorRateModel::Log2 (double val) const -{ - return std::log (val) / std::log (2.0); -} - double YansErrorRateModel::GetBpskBer (double snr, uint32_t signalSpread, uint64_t phyRate) const { diff --git a/src/wifi/model/yans-error-rate-model.h b/src/wifi/model/yans-error-rate-model.h index 395c22601..1bbcbdc43 100644 --- a/src/wifi/model/yans-error-rate-model.h +++ b/src/wifi/model/yans-error-rate-model.h @@ -66,14 +66,6 @@ public: private: - /** - * Return the logarithm of the given value to base 2. - * - * \param val - * - * \return the logarithm of val to base 2. - */ - double Log2 (double val) const; /** * Return BER of BPSK with the given parameters. *