Change default OFDM error rate model to NistErrorRateModel (issue 944)

This commit is contained in:
Tom Henderson
2010-07-20 07:34:14 -07:00
parent 72bb44ac19
commit 051b0f3e2d
10 changed files with 23 additions and 2 deletions

View File

@@ -112,6 +112,12 @@ Enqueue'd successfully or Drop'ped.
<li><b>Drop trace logged for Ipv4/6 forwarding failure:</b> Fixed bug 861; this
will add ascii traces (drops) in Ipv4 and Ipv6 traces for forwarding failures
<li><b>Changed default WiFi error rate model for OFDM modulation types:</b>
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.
</ul>
<hr>

View File

@@ -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.

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -183,7 +183,7 @@ YansWifiPhyHelper
YansWifiPhyHelper::Default (void)
{
YansWifiPhyHelper helper;
helper.SetErrorRateModel ("ns3::YansErrorRateModel");
helper.SetErrorRateModel ("ns3::NistErrorRateModel");
return helper;
}

View File

@@ -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);

View File

@@ -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 ();

View File

@@ -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"));