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

fixed bug 890

Browse Source
This commit is contained in:
Nicola Baldo
2010-05-18 15:38:17 +02:00
parent ed5eadfbde
commit 416743507f
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/wireless/multirate.cc
View File

@@ -543,11 +543,8 @@ int main (int argc, char *argv[])
experiment = Experiment ("multirate");
//for commandline input
if (!experiment.CommandSetup(argc, argv))
{
std::cout << "Configuration failed..." << std::endl;
exit(1);
}
NS_ASSERT_MSG (experiment.CommandSetup(argc, argv),
"Configuration failed...");
// disable fragmentation
// set value to 0 for enabling fragmentation
@@ -571,12 +568,12 @@ int main (int argc, char *argv[])
wifi.SetRemoteStationManager (experiment.GetRateManager());
//printing out selection confirmation
std::cout << "Scenario: " << experiment.GetScenario () << std::endl;
std::cout << "Rts Threshold: " << experiment.GetRtsThreshold() << std::endl;
std::cout << "Name: " << experiment.GetOutputFileName() << std::endl;
std::cout << "Rate: " << experiment.GetRateManager() << std::endl;
std::cout << "Routing: " << experiment.IsRouting() << std::endl;
std::cout << "Mobility: " << experiment.IsMobility() << std::endl;
NS_LOG_INFO ("Scenario: " << experiment.GetScenario ());
NS_LOG_INFO ("Rts Threshold: " << experiment.GetRtsThreshold());
NS_LOG_INFO ("Name: " << experiment.GetOutputFileName());
NS_LOG_INFO ("Rate: " << experiment.GetRateManager());
NS_LOG_INFO ("Routing: " << experiment.IsRouting());
NS_LOG_INFO ("Mobility: " << experiment.IsMobility());
dataset = experiment.Run (wifi, wifiPhy, wifiMac, wifiChannel, mobility);

8
test.py
View File

@@ -144,7 +144,13 @@ example_tests = [
("udp/udp-echo", "True", "True"),
("wireless/mixed-wireless", "True", "True"),
("wireless/multirate", "False", "True"), # Takes too long to run
("wireless/multirate --totalTime=1.5s --rateManager=ns3::AarfcdWifiManager", "True", "True"),
("wireless/multirate --totalTime=1.5s --rateManager=ns3::AmrrWifiManager", "True", "True"),
("wireless/multirate --totalTime=1.5s --rateManager=ns3::CaraWifiManager", "True", "True"),
("wireless/multirate --totalTime=1.5s --rateManager=ns3::IdealWifiManager", "True", "True"),
("wireless/multirate --totalTime=1.5s --rateManager=ns3::MinstrelWifiManager", "True", "True"),
("wireless/multirate --totalTime=1.5s --rateManager=ns3::OnoeWifiManager", "True", "True"),
("wireless/multirate --totalTime=1.5s --rateManager=ns3::RraaWifiManager", "True", "True"),
("wireless/simple-wifi-frame-aggregation", "True", "True"),
("wireless/wifi-adhoc", "False", "True"), # Takes too long to run
("wireless/wifi-ap --verbose=0", "True", "True"), # Don't let it spew to stdout