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

update multirate example for test.py

Browse Source
This commit is contained in:
Duy Nguyen
2010-05-19 16:09:42 -07:00
parent 416743507f
commit d9b2fb855c
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/wireless/multirate.cc
View File

@@ -43,10 +43,9 @@
* To view pcap files:
* tcpdump -nn -tt -r filename.pcap
*
* To monitor the files
* To monitor the files:
* tail -f filename.pcap
*
* Sidenote: Simulation might take sometime
*/
#include "ns3/core-module.h"
@@ -124,15 +123,15 @@ Experiment::Experiment ()
Experiment::Experiment (std::string name) :
m_output (name),
totalTime (50), //use shorter time for faster simulation
totalTime (0.3),
bytesTotal(0),
packetSize (2000),
gridSize (10), //10x10 grid for a total of 100 nodes
nodeDistance (30),
port (5000),
expMean (4), //flows being exponentially distributed
expMean (0.1), //flows being exponentially distributed
scenario (4),
enablePcap (false), // will flood the directory with *.pcap files
enablePcap (false),
enableTracing (true),
enableFlowMon (true),
enableRouting (false),
@@ -173,7 +172,8 @@ Experiment::CheckThroughput()
bytesTotal = 0;
m_output.Add ((Simulator::Now ()).GetSeconds (), mbs);
Simulator::Schedule (Seconds (1.0), &Experiment::CheckThroughput, this);
//check throughput every 1/10 of a second
Simulator::Schedule (Seconds (0.1), &Experiment::CheckThroughput, this);
}
Vector
@@ -281,7 +281,7 @@ Experiment::SendMultiDestinations(Ptr<Node> sender, NodeContainer c)
// ExponentialVariable params: (mean, upperbound)
ExponentialVariable ev(expMean, totalTime);
double start=1, stop=totalTime;
double start=0.0, stop=totalTime;
uint32_t destIndex;
for (uint32_t i=0; i < c.GetN (); i++)

14
test.py
View File

@@ -144,13 +144,13 @@ example_tests = [
("udp/udp-echo", "True", "True"),
("wireless/mixed-wireless", "True", "True"),
("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/multirate --totalTime=0.3s --rateManager=ns3::AarfcdWifiManager", "True", "True"),
("wireless/multirate --totalTime=0.3s --rateManager=ns3::AmrrWifiManager", "True", "True"),
("wireless/multirate --totalTime=0.3s --rateManager=ns3::CaraWifiManager", "True", "True"),
("wireless/multirate --totalTime=0.3s --rateManager=ns3::IdealWifiManager", "True", "True"),
("wireless/multirate --totalTime=0.3s --rateManager=ns3::MinstrelWifiManager", "True", "True"),
("wireless/multirate --totalTime=0.3s --rateManager=ns3::OnoeWifiManager", "True", "True"),
("wireless/multirate --totalTime=0.3s --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