diff --git a/examples/wireless/examples-to-run.py b/examples/wireless/examples-to-run.py index 81573cec4..45a6e0293 100755 --- a/examples/wireless/examples-to-run.py +++ b/examples/wireless/examples-to-run.py @@ -33,7 +33,7 @@ cpp_examples = [ ("ht-wifi-network --simulationTime=0.1", "True", "True"), ("vht-wifi-network --simulationTime=0.1", "True", "True"), ("simple-ht-hidden-stations --simulationTime=1", "True", "True"), - ("mixed-bg-network", "True", "True"), + ("mixed-bg-network --simulationTime=1", "True", "True"), ("wifi-tcp", "True", "True"), ("wifi-spectrum-per-example --distance=52 --index=3 --wifiType=ns3::SpectrumWifiPhy --simulationTime=1", "True", "True"), ("wifi-spectrum-per-example --distance=24 --index=31 --wifiType=ns3::YansWifiPhy --simulationTime=1", "True", "True"), diff --git a/examples/wireless/mixed-bg-network.cc b/examples/wireless/mixed-bg-network.cc index 8b927769b..90e421e77 100644 --- a/examples/wireless/mixed-bg-network.cc +++ b/examples/wireless/mixed-bg-network.cc @@ -232,7 +232,7 @@ int main (int argc, char *argv[]) std::cout << "Protection mode" << "\t\t" << "Slot time supported" << "\t\t" << "PLCP preamble supported" << "\t\t" << "Scenario" << "\t" << "Throughput" << std::endl; throughput = experiment.Run (false, false, false, false, isUdp, payloadSize, simulationTime); - if (throughput < 23 || throughput > 24) + if (throughput < 22.5 || throughput > 23.5) { NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!"); exit (1); @@ -248,7 +248,7 @@ int main (int argc, char *argv[]) std::cout << "Disabled" << "\t\t" << "Short" << "\t\t\t\t" << "Long" << "\t\t\t\t" << "G-only" << "\t\t" << throughput <<" Mbit/s" << std::endl; throughput = experiment.Run (false, false, false, true, isUdp, payloadSize, simulationTime); - if (throughput < 23 || throughput > 24) + if (throughput < 22.5 || throughput > 23.5) { NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!"); exit (1); @@ -256,7 +256,7 @@ int main (int argc, char *argv[]) std::cout << "Disabled" << "\t\t" << "Long" << "\t\t\t\t" << "Long" << "\t\t\t\t" << "Mixed" << "\t\t" << throughput <<" Mbit/s" << std::endl; throughput = experiment.Run (false, false, true, true, isUdp, payloadSize, simulationTime); - if (throughput < 23 || throughput > 24) + if (throughput < 22.5 || throughput > 23.5) { NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!"); exit (1); @@ -284,7 +284,7 @@ int main (int argc, char *argv[]) Config::SetDefault ("ns3::WifiRemoteStationManager::ProtectionMode", StringValue ("Cts-To-Self")); throughput = experiment.Run (true, false, false, true, isUdp, payloadSize, simulationTime); - if (throughput < 21 || throughput > 22) + if (throughput < 20.5 || throughput > 21.5) { NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!"); exit (1); @@ -292,7 +292,7 @@ int main (int argc, char *argv[]) std::cout << "CTS-TO-SELF" << "\t\t" << "Long" << "\t\t\t\t" << "Long" << "\t\t\t\t" << "Mixed" << "\t\t" << throughput <<" Mbit/s" << std::endl; throughput = experiment.Run (true, false, true, true, isUdp, payloadSize, simulationTime); - if (throughput < 21 || throughput > 22) + if (throughput < 20.5 || throughput > 21.5) { NS_LOG_ERROR ("Obtained throughput " << throughput << " is not in the expected boundaries!"); exit (1);