F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve readibility of snr values

Browse Source
This commit is contained in:
Sébastien Deronne
2015-07-11 00:59:27 +02:00
parent 0ec7a3b9d4
commit ce9e786d23
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/wifi/model/interference-helper.cc
View File

@@ -243,8 +243,8 @@ InterferenceHelper::CalculateSnr (double signal, double noiseInterference, WifiM
//receiver noise Floor (W) which accounts for thermal noise and non-idealities of the receiver
double noiseFloor = m_noiseFigure * Nt;
double noise = noiseFloor + noiseInterference;
double snr = signal / noise;
NS_LOG_DEBUG ("signal= " << signal << ", noise=" << noiseFloor << ", interference=" << noiseInterference << ", snr=" << snr);
double snr = signal / noise; //linear scale
NS_LOG_DEBUG ("signal(W)= " << signal << ", noise(W)=" << noiseFloor << ", interference(W)=" << noiseInterference << ", snr(linear)=" << snr);
return snr;
}

4
src/wifi/model/yans-wifi-phy.cc
View File

@@ -728,7 +728,7 @@ YansWifiPhy::StartReceivePacket (Ptr<Packet> packet,
struct InterferenceHelper::SnrPer snrPer;
snrPer = m_interference.CalculatePlcpHeaderSnrPer (event);
NS_LOG_DEBUG ("snr=" << snrPer.snr << ", per=" << snrPer.per);
NS_LOG_DEBUG ("snr(dB)=" << RatioToDb(snrPer.snr) << ", per=" << snrPer.per);
if (m_random->GetValue () > snrPer.per) //plcp reception succeeded
{
@@ -1094,7 +1094,7 @@ YansWifiPhy::EndReceive (Ptr<Packet> packet, enum WifiPreamble preamble, struct
if (m_plcpSuccess == true)
{
NS_LOG_DEBUG ("mode=" << (event->GetPayloadMode ().GetDataRate ()) <<
", snr=" << snrPer.snr << ", per=" << snrPer.per << ", size=" << packet->GetSize ());
", snr(dB)=" << RatioToDb(snrPer.snr) << ", per=" << snrPer.per << ", size=" << packet->GetSize ());
if (m_random->GetValue () > snrPer.per)
{