From 051b0f3e2d06ac9da6492cf432f827d9ec51c9bd Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Tue, 20 Jul 2010 07:34:14 -0700 Subject: [PATCH] Change default OFDM error rate model to NistErrorRateModel (issue 944) --- CHANGES.html | 6 ++++++ RELEASE_NOTES | 3 ++- src/devices/mesh/dot11s/test/hwmp-proactive-regression.cc | 2 ++ src/devices/mesh/dot11s/test/hwmp-reactive-regression.cc | 2 ++ .../mesh/dot11s/test/hwmp-target-flags-regression.cc | 2 ++ src/devices/mesh/flame/test/flame-regression.cc | 2 ++ src/helper/yans-wifi-helper.cc | 2 +- src/routing/aodv/test/aodv-regression.cc | 2 ++ src/routing/aodv/test/bug-772.cc | 2 ++ src/routing/olsr/test/tc-regression-test.cc | 2 ++ 10 files changed, 23 insertions(+), 2 deletions(-) diff --git a/CHANGES.html b/CHANGES.html index 8a05c946c..9ae41e9f8 100644 --- a/CHANGES.html +++ b/CHANGES.html @@ -112,6 +112,12 @@ Enqueue'd successfully or Drop'ped.
  • Drop trace logged for Ipv4/6 forwarding failure: Fixed bug 861; this will add ascii traces (drops) in Ipv4 and Ipv6 traces for forwarding failures + +
  • Changed default WiFi error rate model for OFDM modulation types: +Adopted more conservative ErrorRateModel for OFDM modulation types (a/g). +This will require 4 to 5 more dB of received power to get similar results +as before, so users may observe a reduced WiFi range when using the defaults. +See tracker issie 944 for more details.
    diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 2df3c8113..92e4ee962 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -40,7 +40,8 @@ New user-visible features - A new OFDM error rate model for WiFi (NistErrorRateModel); this model has been validated in clear-channel testbed tests. For 802.11b, it uses the same underlying model as the YansErrorRateModel, but it differs - from YansErrorRateModel for OFDM modes (802.11a/g). + from YansErrorRateModel for OFDM modes (802.11a/g). The default + YansWifiPhyHelper has been changed to use this model. - A brand new NS-2 mobility trace reader supports BonnMotion, SUMO, TraNS, etc. traces. diff --git a/src/devices/mesh/dot11s/test/hwmp-proactive-regression.cc b/src/devices/mesh/dot11s/test/hwmp-proactive-regression.cc index d5f8dd462..0ed35bd5b 100644 --- a/src/devices/mesh/dot11s/test/hwmp-proactive-regression.cc +++ b/src/devices/mesh/dot11s/test/hwmp-proactive-regression.cc @@ -106,6 +106,8 @@ HwmpProactiveRegressionTest::CreateDevices () { // 1. setup WiFi YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default (); + // This test suite output was originally based on YansErrorRateModel + wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default (); wifiPhy.SetChannel (wifiChannel.Create ()); // 2. setup mesh diff --git a/src/devices/mesh/dot11s/test/hwmp-reactive-regression.cc b/src/devices/mesh/dot11s/test/hwmp-reactive-regression.cc index c52be5cf1..2734c9b21 100644 --- a/src/devices/mesh/dot11s/test/hwmp-reactive-regression.cc +++ b/src/devices/mesh/dot11s/test/hwmp-reactive-regression.cc @@ -103,6 +103,8 @@ HwmpReactiveRegressionTest::CreateDevices () { // 1. setup WiFi YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default (); + // This test suite output was originally based on YansErrorRateModel + wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default (); wifiPhy.SetChannel (wifiChannel.Create ()); // 2. setup mesh diff --git a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression.cc b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression.cc index f79a3ddd7..06bee94b7 100644 --- a/src/devices/mesh/dot11s/test/hwmp-target-flags-regression.cc +++ b/src/devices/mesh/dot11s/test/hwmp-target-flags-regression.cc @@ -122,6 +122,8 @@ HwmpDoRfRegressionTest::CreateDevices () { // 1. setup WiFi YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default (); + // This test suite output was originally based on YansErrorRateModel + wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default (); wifiPhy.SetChannel (wifiChannel.Create ()); // 2. setup mesh diff --git a/src/devices/mesh/flame/test/flame-regression.cc b/src/devices/mesh/flame/test/flame-regression.cc index 12785a45a..7797fc047 100644 --- a/src/devices/mesh/flame/test/flame-regression.cc +++ b/src/devices/mesh/flame/test/flame-regression.cc @@ -93,6 +93,8 @@ FlameRegressionTest::CreateDevices () { // 1. setup WiFi YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default (); + // This test suite output was originally based on YansErrorRateModel + wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default (); wifiPhy.SetChannel (wifiChannel.Create ()); // 2. setup mesh diff --git a/src/helper/yans-wifi-helper.cc b/src/helper/yans-wifi-helper.cc index b84dd3365..79b219f97 100644 --- a/src/helper/yans-wifi-helper.cc +++ b/src/helper/yans-wifi-helper.cc @@ -183,7 +183,7 @@ YansWifiPhyHelper YansWifiPhyHelper::Default (void) { YansWifiPhyHelper helper; - helper.SetErrorRateModel ("ns3::YansErrorRateModel"); + helper.SetErrorRateModel ("ns3::NistErrorRateModel"); return helper; } diff --git a/src/routing/aodv/test/aodv-regression.cc b/src/routing/aodv/test/aodv-regression.cc index 7974615a5..b6ad03e62 100644 --- a/src/routing/aodv/test/aodv-regression.cc +++ b/src/routing/aodv/test/aodv-regression.cc @@ -139,6 +139,8 @@ ChainRegressionTest::CreateDevices () YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default (); YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default (); wifiPhy.SetChannel (wifiChannel.Create ()); + // This test suite output was originally based on YansErrorRateModel + wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); WifiHelper wifi = WifiHelper::Default (); wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200")); NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, *m_nodes); diff --git a/src/routing/aodv/test/bug-772.cc b/src/routing/aodv/test/bug-772.cc index 9f8ecd215..c24ca11af 100644 --- a/src/routing/aodv/test/bug-772.cc +++ b/src/routing/aodv/test/bug-772.cc @@ -112,6 +112,8 @@ Bug772ChainTest::CreateDevices () NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default (); wifiMac.SetType ("ns3::AdhocWifiMac"); YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default (); + // This test suite output was originally based on YansErrorRateModel + wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default (); wifiPhy.SetChannel (wifiChannel.Create ()); WifiHelper wifi = WifiHelper::Default (); diff --git a/src/routing/olsr/test/tc-regression-test.cc b/src/routing/olsr/test/tc-regression-test.cc index 644ced1cc..71b01ee72 100644 --- a/src/routing/olsr/test/tc-regression-test.cc +++ b/src/routing/olsr/test/tc-regression-test.cc @@ -100,6 +100,8 @@ TcRegressionTest::CreateNodes () YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default (); YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default (); wifiPhy.SetChannel (wifiChannel.Create ()); + // This test suite output was originally based on YansErrorRateModel + wifiPhy.SetErrorRateModel ("ns3::YansErrorRateModel"); WifiHelper wifi = WifiHelper::Default (); wifi.SetStandard (WIFI_PHY_STANDARD_80211a); wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("OfdmRate6Mbps"), "RtsCtsThreshold", StringValue ("2200"));