Make the README more understandable, improve the output.

diff --git a/apps/tests/TestSimComm/README b/apps/tests/TestSimComm/README
index 5780b33c299a1d42afbe006f7428635ffdbc837e..dda666e2d3a0b1768934e9fea023e38ec761c300 100644 (file)
--- a/apps/tests/TestSimComm/README
+++ b/apps/tests/TestSimComm/README
@@ -30,29 +30,34 @@ quality links (-60 dBm) to node 2, but the reverse links (2 to 1 and
 like test-equal.py but few acknowledgements.
 
 The ./run script runs all the three tests and counts the number of
-ACKed and non-ACKed send packets. The output look like this:
+ACKed and non-ACKed send packets. The output will look something
+like this:
 
-test-asym.log
-           ACK           NOACK   total
-         1 4930          35923   40853
-         3 4983          35870   40853
 test-equal.log
            ACK           NOACK   total
          1 21197         19666   40863
          3 21320         19543   40863
+test-asym.log
+           ACK           NOACK   total
+         1 4930          35923   40853
+         3 4983          35870   40853
 test-unequal.log
            ACK           NOACK   total
          1 27619         12966   40585
          3 21040         19545   40585
 
-This output shows several this:
-- the number of ACKs in the asymmetric links case is much less than in
-  the equal case which proves the fact that the reverse links are indeed
-  poor.
-- in the unequal case the number on ACKs for node 1 is higher than
-  node 3 which is expected because node 1 has a better link to 2 than 3.
-- in the equal case both nodes perform similar, each of them loosing
-  about half of their packets.
+ACK is the number of acknowledged packets from that node to node 2;
+NOACK is the number of unacknowledged packets. Total is the sum.
+The output should show three things:
+
+  1) In test-equal, both node 1 and node 3 have very
+  similar delivery ratios, losing about half of their packets.
+
+  2) In test-asym, the number of ACKs is much less than in
+  test-equal because the reverse links are poor.
+
+  3) In test-unequal, node 1 has more acknowledged packets
+  than node 3, because it has a higher SNR link.
 
 Philip Levis
 

diff --git a/apps/tests/TestSimComm/run b/apps/tests/TestSimComm/run
index d1720eeeba8c7f004fd30fc6ac2e07ca5e1644b2..7cd6667bc0b360f44cd7853ab226be1ffb68a17e 100755 (executable)
--- a/apps/tests/TestSimComm/run
+++ b/apps/tests/TestSimComm/run
@@ -2,7 +2,7 @@
 
 make micaz sim
 
-for t in test*.py
+for t in test-equal.py test-asym.py test-unequal.py
 do
  echo Running $t...
  python $t > `basename $t .py`.log
@@ -10,7 +10,7 @@ done
 
 make clean
 
-for l in test*.log
+for l in test-equal.log test-asym.log test-unequal.log
 do
     echo $l
     echo -e '\t   ACK \t\t NOACK \t total'

diff --git a/apps/tests/TestSimComm/test-asym.py b/apps/tests/TestSimComm/test-asym.py
index a84c454475011746e0c145f40129b3809d7992a5..31d87990abf3798d6c0645cd68a78bc9731b171b 100644 (file)
--- a/apps/tests/TestSimComm/test-asym.py
+++ b/apps/tests/TestSimComm/test-asym.py
@@ -43,7 +43,7 @@ m1.createNoiseModel()
 m2.createNoiseModel()
 m3.createNoiseModel()
 
-for i in range(0, 1000000):
+for i in range(0, 200000):
     t.runNextEvent();
 
     

diff --git a/apps/tests/TestSimComm/test-equal.py b/apps/tests/TestSimComm/test-equal.py
index a734f9b6aec169d507cfb73aa6a08483e1d992ca..bd7e84c87b2cc0b6aab500e9faae0c103ad838d5 100644 (file)
--- a/apps/tests/TestSimComm/test-equal.py
+++ b/apps/tests/TestSimComm/test-equal.py
@@ -43,7 +43,7 @@ m1.createNoiseModel()
 m2.createNoiseModel()
 m3.createNoiseModel()
 
-for i in range(0, 1000000):
+for i in range(0, 200000):
     t.runNextEvent();
 
     

diff --git a/apps/tests/TestSimComm/test-unequal.py b/apps/tests/TestSimComm/test-unequal.py
index 8b2da5fa2f31854ce293eda487de233d03b2ec86..a5bcc1e841d5589777def39c0428274d5028a87c 100644 (file)
--- a/apps/tests/TestSimComm/test-unequal.py
+++ b/apps/tests/TestSimComm/test-unequal.py
@@ -42,7 +42,7 @@ m1.createNoiseModel()
 m2.createNoiseModel()
 m3.createNoiseModel()
 
-for i in range(0, 1000000):
+for i in range(0, 200000):
     t.runNextEvent();