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

examples: Fix regression time for wifi examples

Browse Source
This commit is contained in:
Sébastien Deronne
2019-06-15 14:35:10 +02:00
parent c2a5175b90
commit d02406280b
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/wireless/examples-to-run.py
View File

@@ -41,15 +41,15 @@ cpp_examples = [
("ht-wifi-network --simulationTime=0.2 --frequency=5 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=129", "True", "True"),
("ht-wifi-network --simulationTime=0.2 --frequency=2.4 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=132", "True", "True"),
("ht-wifi-network --simulationTime=0.2 --frequency=2.4 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=127", "True", "True"),
("vht-wifi-network --simulationTime=0.2 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=637", "True", "True"),
("vht-wifi-network --simulationTime=0.2 --useRts=1", "True", "True"),
("vht-wifi-network --simulationTime=0.2 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=562", "True", "True"),
("vht-wifi-network --simulationTime=0.2 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=520", "True", "True"),
("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=844", "True", "True"),
("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=0 --useExtendedBlockAck=1 --minExpectedThroughput=6 --maxExpectedThroughput=1033", "True", "True"),
("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=745", "True", "True"),
("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"),
("he-wifi-network --simulationTime=4 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"),
("he-wifi-network --simulationTime=0.3 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=223", "True", "True"),
("simple-ht-hidden-stations --simulationTime=1.5 --enableRts=0 --nMpdus=32 --minExpectedThroughput=59 --maxExpectedThroughput=60", "True", "True"),
("simple-ht-hidden-stations --simulationTime=1 --enableRts=1 --nMpdus=32 --minExpectedThroughput=56 --maxExpectedThroughput=57", "True", "True"),
("simple-ht-hidden-stations --simulationTime=1 --enableRts=1 --nMpdus=32 --minExpectedThroughput=57 --maxExpectedThroughput=58", "True", "True"),
("mixed-network --simulationTime=1", "True", "True"),
("wifi-aggregation --simulationTime=1 --verifyResults=1", "True", "True"),
("wifi-txop-aggregation --simulationTime=1 --verifyResults=1", "True", "True"),

2
examples/wireless/ht-wifi-network.cc
View File

@@ -229,7 +229,7 @@ int main (int argc, char *argv[])
onoff.SetAttribute ("OnTime", StringValue ("ns3::ConstantRandomVariable[Constant=1]"));
onoff.SetAttribute ("OffTime", StringValue ("ns3::ConstantRandomVariable[Constant=0]"));
onoff.SetAttribute ("PacketSize", UintegerValue (payloadSize));
onoff.SetAttribute ("DataRate", DataRateValue (1000000000)); //bit/s
onoff.SetAttribute ("DataRate", DataRateValue (200000000)); //bit/s
AddressValue remoteAddress (InetSocketAddress (staNodeInterface.GetAddress (0), port));
onoff.SetAttribute ("Remote", remoteAddress);
ApplicationContainer clientApp = onoff.Install (wifiApNode.Get (0));

2
examples/wireless/simple-ht-hidden-stations.cc
View File

@@ -159,7 +159,7 @@ int main (int argc, char *argv[])
UdpClientHelper client (ApInterface.GetAddress (0), port);
client.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
client.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
client.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
client.SetAttribute ("PacketSize", UintegerValue (payloadSize));
// Saturated UDP traffic from stations to AP

2
examples/wireless/vht-wifi-network.cc
View File

@@ -198,7 +198,7 @@ int main (int argc, char *argv[])
UdpClientHelper client (staNodeInterface.GetAddress (0), port);
client.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
client.SetAttribute ("Interval", TimeValue (Time ("0.00001"))); //packets/s
client.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
client.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientApp = client.Install (wifiApNode.Get (0));
clientApp.Start (Seconds (1.0));

12
examples/wireless/wifi-aggregation.cc
View File

@@ -257,7 +257,7 @@ int main (int argc, char *argv[])
UdpClientHelper clientA (StaInterfaceA.GetAddress (0), port);
clientA.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
clientA.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
clientA.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
clientA.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientAppA = clientA.Install (wifiApNodes.Get (0));
@@ -271,7 +271,7 @@ int main (int argc, char *argv[])
UdpClientHelper clientB (StaInterfaceB.GetAddress (0), port);
clientB.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
clientB.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
clientB.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
clientB.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientAppB = clientB.Install (wifiApNodes.Get (1));
@@ -285,7 +285,7 @@ int main (int argc, char *argv[])
UdpClientHelper clientC (StaInterfaceC.GetAddress (0), port);
clientC.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
clientC.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
clientC.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
clientC.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientAppC = clientC.Install (wifiApNodes.Get (2));
@@ -299,7 +299,7 @@ int main (int argc, char *argv[])
UdpClientHelper clientD (StaInterfaceD.GetAddress (0), port);
clientD.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
clientD.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
clientD.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
clientD.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientAppD = clientD.Install (wifiApNodes.Get (3));
@@ -331,7 +331,7 @@ int main (int argc, char *argv[])
double throughput = totalPacketsThroughA * payloadSize * 8 / (simulationTime * 1000000.0);
std::cout << "Throughput with default configuration (A-MPDU aggregation enabled, 65kB): " << throughput << " Mbit/s" << '\n';
if (verifyResults && (throughput < 59 || throughput > 60))
if (verifyResults && (throughput < 58.5 || throughput > 59.5))
{
NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
exit (1);
@@ -339,7 +339,7 @@ int main (int argc, char *argv[])
throughput = totalPacketsThroughB * payloadSize * 8 / (simulationTime * 1000000.0);
std::cout << "Throughput with aggregation disabled: " << throughput << " Mbit/s" << '\n';
if (verifyResults && (throughput < 30 || throughput > 30.5))
if (verifyResults && (throughput < 30 || throughput > 31))
{
NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
exit (1);

2
examples/wireless/wifi-spectrum-per-example.cc
View File

@@ -461,7 +461,7 @@ int main (int argc, char *argv[])
UdpClientHelper client (staNodeInterface.GetAddress (0), port);
client.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
client.SetAttribute ("Interval", TimeValue (Time ("0.00001"))); //packets/s
client.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
client.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientApp = client.Install (wifiApNode.Get (0));
clientApp.Start (Seconds (1.0));

2
examples/wireless/wifi-spectrum-per-interference.cc
View File

@@ -489,7 +489,7 @@ int main (int argc, char *argv[])
UdpClientHelper client (staNodeInterface.GetAddress (0), port);
client.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
client.SetAttribute ("Interval", TimeValue (Time ("0.00001"))); //packets/s
client.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
client.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientApp = client.Install (wifiApNode.Get (0));
clientApp.Start (Seconds (1.0));

2
examples/wireless/wifi-spectrum-saturation-example.cc
View File

@@ -639,7 +639,7 @@ int main (int argc, char *argv[])
UdpClientHelper client (staNodeInterface.GetAddress (0), port);
client.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
client.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
client.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
client.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientApp = client.Install (wifiApNode.Get (0));
clientApp.Start (Seconds (1.0));

2
examples/wireless/wifi-timing-attributes.cc
View File

@@ -156,7 +156,7 @@ int main (int argc, char *argv[])
UdpClientHelper client (staNodeInterface.GetAddress (0), port);
client.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
client.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
client.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
client.SetAttribute ("PacketSize", UintegerValue (1472)); //bytes
ApplicationContainer clientApp = client.Install (wifiApNode.Get (0));

12
examples/wireless/wifi-txop-aggregation.cc
View File

@@ -318,7 +318,7 @@ int main (int argc, char *argv[])
UdpClientHelper clientA (StaInterfaceA.GetAddress (0), port);
clientA.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
clientA.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
clientA.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
clientA.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientAppA = clientA.Install (wifiApNodes.Get (0));
@@ -332,7 +332,7 @@ int main (int argc, char *argv[])
UdpClientHelper clientB (StaInterfaceB.GetAddress (0), port);
clientB.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
clientB.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
clientB.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
clientB.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientAppB = clientB.Install (wifiApNodes.Get (1));
@@ -346,7 +346,7 @@ int main (int argc, char *argv[])
UdpClientHelper clientC (StaInterfaceC.GetAddress (0), port);
clientC.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
clientC.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
clientC.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
clientC.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientAppC = clientC.Install (wifiApNodes.Get (2));
@@ -360,7 +360,7 @@ int main (int argc, char *argv[])
UdpClientHelper clientD (StaInterfaceD.GetAddress (0), port);
clientD.SetAttribute ("MaxPackets", UintegerValue (4294967295u));
clientD.SetAttribute ("Interval", TimeValue (Time ("0.00002"))); //packets/s
clientD.SetAttribute ("Interval", TimeValue (Time ("0.0001"))); //packets/s
clientD.SetAttribute ("PacketSize", UintegerValue (payloadSize));
ApplicationContainer clientAppD = clientD.Install (wifiApNodes.Get (3));
@@ -393,7 +393,7 @@ int main (int argc, char *argv[])
double throughput = totalPacketsThroughA * payloadSize * 8 / (simulationTime * 1000000.0);
std::cout << "Default configuration (A-MPDU aggregation enabled, 65kB): " << '\n'
<< " Throughput = " << throughput << " Mbit/s" << '\n';
if (verifyResults && (throughput < 57 || throughput > 58))
if (verifyResults && (throughput < 57.5 || throughput > 58.5))
{
NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
exit (1);
@@ -431,7 +431,7 @@ int main (int argc, char *argv[])
throughput = totalPacketsThroughC * payloadSize * 8 / (simulationTime * 1000000.0);
std::cout << "A-MPDU disabled and A-MSDU enabled (8kB): " << '\n'
<< " Throughput = " << throughput << " Mbit/s" << '\n';
if (verifyResults && (throughput < 53 || throughput > 53.5))
if (verifyResults && (throughput < 53 || throughput > 54))
{
NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!");
exit (1);