From 84e2c5a3ef31b162fdcc7c067535b492d1de3fb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Wed, 28 Mar 2018 12:58:07 +0200 Subject: [PATCH] wifi: Fix typos in InterferenceHelper and extend regression for test-interference-helper --- src/wifi/model/interference-helper.cc | 6 +++--- src/wifi/test/examples-to-run.py | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/wifi/model/interference-helper.cc b/src/wifi/model/interference-helper.cc index 6f48a5208..86514855f 100644 --- a/src/wifi/model/interference-helper.cc +++ b/src/wifi/model/interference-helper.cc @@ -461,7 +461,7 @@ InterferenceHelper::CalculatePlcpHeaderPer (Ptr //Case 3c: current with previous in HT-SIG or SIG-A else { - //Case 3bi: VHT or HE format + //Case 3ci: VHT or HE format if (preamble == WIFI_PREAMBLE_VHT || preamble == WIFI_PREAMBLE_HE_SU) { //SIG-A is sent using legacy OFDM modulation @@ -472,7 +472,7 @@ InterferenceHelper::CalculatePlcpHeaderPer (Ptr headerMode, txVector); NS_LOG_DEBUG ("Case 3ci - previous with current in SIG-A: mode=" << headerMode << ", psr=" << psr); } - //Case 3bii: HT mixed format or HT greenfield + //Case 3cii: HT mixed format or HT greenfield else { psr *= CalculateChunkSuccessRate (CalculateSnr (powerW, @@ -605,7 +605,7 @@ InterferenceHelper::CalculatePlcpHeaderPer (Ptr txVector.GetChannelWidth ()), current - previous, headerMode, txVector); - NS_LOG_DEBUG ("Case 3c - current with previous in L-SIG: mode=" << headerMode << ", psr=" << psr); + NS_LOG_DEBUG ("Case 4d - current with previous in L-SIG: mode=" << headerMode << ", psr=" << psr); } } //Case 5: previous is in the preamble works for all cases diff --git a/src/wifi/test/examples-to-run.py b/src/wifi/test/examples-to-run.py index 336709170..7918d43d4 100644 --- a/src/wifi/test/examples-to-run.py +++ b/src/wifi/test/examples-to-run.py @@ -304,6 +304,9 @@ cpp_examples = [ ("wifi-manager-example --wifiManager=Ideal --standard=802.11ax-2.4GHz --serverChannelWidth=40 --clientChannelWidth=40 --serverShortGuardInterval=1600 --clientShortGuardInterval=1600 --serverNss=4 --clientNss=4 --stepTime=0.1", "False", "False"), ("wifi-manager-example --wifiManager=Ideal --standard=802.11ax-2.4GHz --serverChannelWidth=40 --clientChannelWidth=40 --serverShortGuardInterval=3200 --clientShortGuardInterval=3200 --serverNss=4 --clientNss=4 --stepTime=0.1", "False", "False"), ("test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=10 --txModeA=OfdmRate6Mbps --txModeB=OfdmRate6Mbps --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"), + ("test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=17 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"), + ("test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=20 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"), + ("test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=30 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"), ("test-interference-helper --enableCapture=1 --txPowerA=5 --txPowerB=15 --delay=10 --txModeA=OfdmRate6Mbps --txModeB=OfdmRate6Mbps --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=1", "True", "False"), ]