Fix typos and add source addr.

[tinyos-2.x.git] / doc / html / tutorial / lesson11.html

diff --git a/doc/html/tutorial/lesson11.html b/doc/html/tutorial/lesson11.html
index 216f59fb276e7fa5097ef6c960776d189a953eb2..9f49f9340a9e2d6b1c7b5be5e3f87b5d8ffbe467 100644 (file)
--- a/doc/html/tutorial/lesson11.html
+++ b/doc/html/tutorial/lesson11.html
@@ -316,7 +316,7 @@ Type "help", "copyright", "credits" or "license" for more information.
 '__reduce__', '__reduce_ex__', '__repr__', '__setattr__', '__str__',
 '__swig_getmethods__', '__swig_setmethods__', '__weakref__', 'addChannel',
 'currentNode', 'getNode', 'init', 'mac', 'newPacket', 'radio', 'removeChannel',
-'runNextEvent', 'setCurrentNode', 'setTime', 'this', 'thisown', 'time', 'timeStr']
+'runNextEvent', 'setCurrentNode', 'setTime', 'this', 'thisown', 'ticksPerSecond', 'time', 'timeStr']
         </pre>
 
         <p>The most common utility functions are:</p>
@@ -568,14 +568,14 @@ DEBUG (32): Application booted a third time.
        which is a noise trace taken from Meyer Library at Stanford University:</p>
 
       <pre>
--97
+-39
 -98
 -98
--86
--90
--91
--87
--87
+-98
+-99
+-98
+-94
+-98
 -98
 -98
 </pre>
@@ -603,8 +603,9 @@ for i in range(0, 7):
       <p>CPM can use a good deal of RAM: using the entire meyer-heavy
       trace as input has a cost of approximately 10MB per node. You
       can reduce this overhead by using a shorter trace; this will of
-      course reduce simulation fidelity. Future versions of TOSSIM
-      will reduce this greatly through optimization.</p>
+      course reduce simulation fidelity. <u>The trace
+      must be at least 100 entries long, or CPM will not work as it does
+      not have enough data to generate a statistical model.</u> </p>
 
       <p>You can also use 
       <p>The Radio object only deals with physical layer
@@ -868,15 +869,10 @@ java net.tinyos.sim.PropagationModel config.txt
 
         <p>The format of a configuration file is beyond the scope of
         this document: the tool has its own <A
-        HREF="usc-topologies.html">documentation</A>. TOSSIM has two sample configuration
+        HREF="usc-topologies.html">documentation</A>. TOSSIM has a few sample configuration
         files generated from the tool in
-        <code>tos/lib/tossim/topologies</code>. The first is <code><A
-        HREF="">grid.txt</A></code>, which is a 10x10 grid of nodes
-        spaced roughly 40 feet apart. Each node is placed randomly
-        within a 40'x40' "cell." The cells follow a strict grid. The
-        second file is <code><A HREF="">scatter.txt</A></code>, which is
-        100 nodes scattered randomly (with a uniform distribution)
-        over a 360'x360' area. Note that the tool uses random numbers,
+        <code>tos/lib/tossim/topologies</code>. 
+        Note that the tool uses random numbers,
         these configuration files can generate multiple different
         network topologies. Network topology files generated from the
         tool follow the same format as <code>15-15-tight-mica2-grid.txt</code>.
@@ -898,7 +894,10 @@ java net.tinyos.sim.PropagationModel config.txt
         variables properly. You do this by instantiating a Python
         object that parses the XML file to extract all of the relevant
         information. You have to import the Python support package for
-        TOSSIM to do this:</p>
+        TOSSIM to do this. First, set your PYTHONPATH environment variable
+       to point to <tt>tinyos-2.x/support/sdk/python</tt>. This tells
+       Python where to find the TOSSIM packages. Then, in an interpreter
+       type this:</p>
 
         <pre>
 from tinyos.tossim.TossimApp import *
@@ -1199,7 +1198,7 @@ pkt.setData(msg.data)
 pkt.setType(msg.get_amType())
 pkt.setDestination(0)
 
-print "Delivering " + msg.__str__() + " to 0 at " + str(t.time() + 3);
+print "Delivering " + str(msg) + " to 0 at " + str(t.time() + 3);
 pkt.deliver(0, t.time() + 3)
 
 
@@ -1296,7 +1295,7 @@ int main() {
         r->add(i, j, -50.0);
       }
     }
-    for (int j = 0; i &lt; 500; j++) {
+    for (int j = 0; j &lt; 500; j++) {
        m->addNoiseTraceReading((char)(drand48() * 20) - 70);
     }
     m->createNoiseModel();