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

examples: Fix conditions to check boundaries of measured throughput for wifi HT/VHT/HE/EHT networks

Browse Source
This commit is contained in:
Sébastien Deronne
2024-03-27 19:48:18 +01:00
committed by Sébastien Deronne
parent 8c8af78cb5
commit 1c0809c31e
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,7 +125,7 @@ cpp_examples = [
"True",
),
(
"wifi-he-network --simulationTime=0.3 --frequency=2.4 --udp=0 --downlink=1 --useRts=1 --nStations=5 --dlAckType=MU-BAR --enableUlOfdma=1 --enableBsrp=1 --mcs=5 --minExpectedThroughput=27 --maxExpectedThroughput=50",
"wifi-he-network --simulationTime=0.3 --frequency=2.4 --udp=0 --downlink=1 --useRts=1 --nStations=5 --dlAckType=MU-BAR --enableUlOfdma=1 --enableBsrp=1 --mcs=5 --minExpectedThroughput=21 --maxExpectedThroughput=56",
"True",
"True",
),
@@ -150,12 +150,12 @@ cpp_examples = [
"True",
),
(
"wifi-eht-network --simulationTime=0.1 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=547",
"wifi-eht-network --simulationTime=0.1 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=660",
"True",
"True",
),
(
"wifi-eht-network --simulationTime=0.1 --frequency=2.4 --useRts=0 --mpduBufferSize=512 --frequency2=5 --minExpectedThroughput=7 --maxExpectedThroughput=330",
"wifi-eht-network --simulationTime=0.1 --frequency=2.4 --useRts=0 --mpduBufferSize=512 --frequency2=5 --minExpectedThroughput=7 --maxExpectedThroughput=512",
"True",
"True",
),
@@ -165,7 +165,7 @@ cpp_examples = [
"True",
),
(
"wifi-eht-network --simulationTime=0.23 --udp=0 --downlink=1 --useRts=0 --nStations=4 --dlAckType=ACK-SU-FORMAT --enableUlOfdma=1 --enableBsrp=0 --mcs=5 --frequency2=6 --minExpectedThroughput=35 --maxExpectedThroughput=280",
"wifi-eht-network --simulationTime=0.23 --udp=0 --downlink=1 --useRts=0 --nStations=4 --dlAckType=ACK-SU-FORMAT --enableUlOfdma=1 --enableBsrp=0 --mcs=5 --frequency2=6 --minExpectedThroughput=35 --maxExpectedThroughput=404",
"True",
"True",
),

4
examples/wireless/wifi-eht-network.cc
View File

@@ -566,7 +566,7 @@ main(int argc, char* argv[])
<< throughput << " Mbit/s" << std::endl;
// test first element
if (mcs == 0 && channelWidth == 20 && gi == 3200)
if (mcs == minMcs && channelWidth == 20 && gi == 3200)
{
if (throughput * (1 + tolerance) < minExpectedThroughput)
{
@@ -575,7 +575,7 @@ main(int argc, char* argv[])
}
}
// test last element
if (mcs == 11 && channelWidth == 160 && gi == 800)
if (mcs == maxMcs && channelWidth == maxChannelWidth && gi == 800)
{
if (maxExpectedThroughput > 0 &&
throughput > maxExpectedThroughput * (1 + tolerance))

4
examples/wireless/wifi-he-network.cc
View File

@@ -451,7 +451,7 @@ main(int argc, char* argv[])
<< throughput << " Mbit/s" << std::endl;
// test first element
if (mcs == 0 && channelWidth == 20 && gi == 3200)
if (mcs == minMcs && channelWidth == 20 && gi == 3200)
{
if (throughput * (1 + tolerance) < minExpectedThroughput)
{
@@ -460,7 +460,7 @@ main(int argc, char* argv[])
}
}
// test last element
if (mcs == 11 && channelWidth == 160 && gi == 800)
if (mcs == maxMcs && channelWidth == maxChannelWidth && gi == 800)
{
if (maxExpectedThroughput > 0 &&
throughput > maxExpectedThroughput * (1 + tolerance))

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

@@ -291,7 +291,7 @@ main(int argc, char* argv[])
<< sgi << "\t\t\t" << throughput << " Mbit/s" << std::endl;
// test first element
if (mcs == 0 && channelWidth == 20 && !sgi)
if (mcs == minMcs && channelWidth == 20 && !sgi)
{
if (throughput < minExpectedThroughput)
{
@@ -299,7 +299,7 @@ main(int argc, char* argv[])
}
}
// test last element
if (mcs == 7 && channelWidth == 40 && sgi)
if (mcs == maxMcs && channelWidth == 40 && sgi)
{
if (maxExpectedThroughput > 0 && throughput > maxExpectedThroughput)
{

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

@@ -272,7 +272,7 @@ main(int argc, char* argv[])
<< sgi << "\t\t\t" << throughput << " Mbit/s" << std::endl;
// test first element
if (mcs == 0 && channelWidth == 20 && !sgi)
if (mcs == minMcs && channelWidth == 20 && !sgi)
{
if (throughput < minExpectedThroughput)
{
@@ -281,7 +281,7 @@ main(int argc, char* argv[])
}
}
// test last element
if (mcs == 9 && channelWidth == 160 && sgi)
if (mcs == maxMcs && channelWidth == 160 && sgi)
{
if (maxExpectedThroughput > 0 && throughput > maxExpectedThroughput)
{