Updated test code and scripts.

[tinyos-2.x.git] / apps / tests / TestMultihopLqi / script.py

diff --git a/apps/tests/TestMultihopLqi/script.py b/apps/tests/TestMultihopLqi/script.py
index 221ab9454de90b69e19d3cd1ad0916513bf2d0e6..15d2e3425ac2b489efcedeb951794994119fc447 100644 (file)
--- a/apps/tests/TestMultihopLqi/script.py
+++ b/apps/tests/TestMultihopLqi/script.py
@@ -11,11 +11,13 @@ r = t.radio()
 #t.addChannel("RadioCountToLedsC", sys.stdout)
 #t.addChannel("CpmModelC", sys.stdout)
 #t.addChannel("Gain", sys.stdout)
-#t.addChannel("AM", sys.stdout)
+t.addChannel("AM", sys.stdout)
+t.addChannel("App", sys.stdout)
 #t.addChannel("LQI", sys.stdout)
-t.addChannel("LQIRoute", sys.stdout)
-t.addChannel("LQIDeliver", sys.stdout)
 #t.addChannel("LQIRoute", sys.stdout)
+#t.addChannel("LQIDeliver", sys.stdout)
+#t.addChannel("LQIRoute", sys.stdout)
+#t.addChannel("PointerBug", sys.stdout)
 
 start = time.time();
 noise = open("meyer-short.txt", "r")
@@ -44,7 +46,7 @@ for line in lines:
 start = time.time();
 for i in range(0, 7):
     t.getNode(i).createNoiseModel();
-    t.getNode(i).bootAtTime(random.random() * 10000000 + 20000000);
+    t.getNode(i).bootAtTime(int(random.random() * 10000000 + 20000000));
 
 duration = end - start;
 print "time: ", duration;
@@ -52,5 +54,5 @@ print "time: ", duration;
 #for i in range(0, 196607):
 #    print m1.generateNoise(i)
 
-for i in range(0, 1000000):
+for i in range(0, 2000):
     t.runNextEvent();