--- a/examples/wireless/multirate.cc Tue May 18 11:35:47 2010 +0200
+++ b/examples/wireless/multirate.cc Tue May 18 15:38:17 2010 +0200
@@ -543,11 +543,8 @@
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 @@
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);
--- a/test.py Tue May 18 11:35:47 2010 +0200
+++ b/test.py Tue May 18 15:38:17 2010 +0200
@@ -144,7 +144,13 @@
("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