[Commit-gnuradio] r3236 - in gnuradio/trunk: config gnuradio-examples/python gnuradio-examples/python/channel-coding gnuradio-examples/python/channel-coding/fsm_files

[anastas]

Author: anastas
Date: 2006-08-11 05:37:02 -0600 (Fri, 11 Aug 2006)
New Revision: 3236

Added:
   gnuradio/trunk/gnuradio-examples/python/channel-coding/README
Removed:
   gnuradio/trunk/gnuradio-examples/python/channel-coding/fsm_files/Makefile.am
   gnuradio/trunk/gnuradio-examples/python/channel-coding/fsm_files/foo
Modified:
   gnuradio/trunk/config/grc_gnuradio_examples.m4
   gnuradio/trunk/gnuradio-examples/python/Makefile.am
   gnuradio/trunk/gnuradio-examples/python/channel-coding/Makefile.am
   gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm.py
   gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm_combined.py
Log:
Fixed some examples in gnuradio-examples/python/channel-coding, and added a 
README file

Modified: gnuradio/trunk/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/trunk/config/grc_gnuradio_examples.m4      2006-08-11 10:57:08 UTC 
(rev 3235)
+++ gnuradio/trunk/config/grc_gnuradio_examples.m4      2006-08-11 11:37:02 UTC 
(rev 3236)
@@ -24,6 +24,7 @@
         gnuradio-examples/Makefile \
         gnuradio-examples/python/Makefile \
         gnuradio-examples/python/audio/Makefile \
+        gnuradio-examples/python/channel-coding/Makefile \
         gnuradio-examples/python/digital_voice/Makefile \
         gnuradio-examples/python/gmsk2/Makefile \
         gnuradio-examples/python/mc4020/Makefile \

Modified: gnuradio/trunk/gnuradio-examples/python/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/Makefile.am 2006-08-11 10:57:08 UTC 
(rev 3235)
+++ gnuradio/trunk/gnuradio-examples/python/Makefile.am 2006-08-11 11:37:02 UTC 
(rev 3236)
@@ -19,4 +19,4 @@
 # Boston, MA 02111-1307, USA.
 # 
 
-SUBDIRS = audio digital_voice gmsk2 mc4020 multi_usrp usrp channel-coding
+SUBDIRS = audio channel-coding digital_voice gmsk2 mc4020 multi_usrp usrp 

Modified: gnuradio/trunk/gnuradio-examples/python/channel-coding/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/channel-coding/Makefile.am  
2006-08-11 10:57:08 UTC (rev 3235)
+++ gnuradio/trunk/gnuradio-examples/python/channel-coding/Makefile.am  
2006-08-11 11:37:02 UTC (rev 3236)
@@ -20,12 +20,10 @@
 # 
 
 EXTRA_DIST =                   \
+        README                 \
        fsm_utils.py            \
        test_tcm.py             \
        test_tcm1.py            \
        test_tcm_parallel.py    \
        test_tcm_combined.py    \
        test_sccc_hard.py
-
-
-SUBDIRS = fsm_files

Added: gnuradio/trunk/gnuradio-examples/python/channel-coding/README
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/channel-coding/README               
                (rev 0)
+++ gnuradio/trunk/gnuradio-examples/python/channel-coding/README       
2006-08-11 11:37:02 UTC (rev 3236)
@@ -0,0 +1,33 @@
+Here we have several test programs for use with the gr-trellis implementation.
+Documentation can be found in 
+http://gnuradio.utah.edu/svn/gnuradio/trunk/gr-trellis/doc/gr-trellis.html
+
+fsm_utils.py contains several useful functions.
+
+fsm_files is a directory with some FSM definitions
+
+If you just want to see what these programs do, run each of the following:
+
+./test_tcm.py fsm_files/awgn1o2_4.fsm 10.0 1000
+./test_tcm1.py fsm_files/awgn1o2_4.fsm 10.0 1000
+./test_tcm_combined.py fsm_files/awgn1o2_4.fsm 10.0 1000
+./test_tcm_parallel.py fsm_files/awgn1o2_4.fsm 10.0 1000
+./test_sccc_hard.py fsm_files/awgn1o2_4.fsm fsm_files/awgn1o2_4.fsm 10.0 1000
+
+In your terminal you will see something like this:
+
address@hidden channel-coding]$ ./test_tcm.py fsm_files/awgn1o2_4.fsm 6.0 1000
+100 1024 1 103424 10 9.668936e-05
+200 1024 1 205824 21 1.020289e-04
+300 1024 0 308224 40 1.297757e-04
+400 1024 0 410624 1074 2.615531e-03
+500 1024 0 513024 1081 2.107114e-03
+600 1024 0 615424 1090 1.771137e-03
+700 1024 0 717824 1097 1.528230e-03
+800 1024 0 820224 1107 1.349631e-03
+900 1024 0 922624 1120 1.213929e-03
+1024000 1129 1.102539e-03
+
+1.102539e-03 is the error rate estimates by sending 1000 packets of
+1024x16 bits each using an 1/2 4-state convolutional code and QPSK
+modulation through an AWGN with Es/N0 = 6.0 dB

Deleted: 
gnuradio/trunk/gnuradio-examples/python/channel-coding/fsm_files/Makefile.am

Deleted: gnuradio/trunk/gnuradio-examples/python/channel-coding/fsm_files/foo

Modified: gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm.py
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm.py  
2006-08-11 10:57:08 UTC (rev 3235)
+++ gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm.py  
2006-08-11 11:37:02 UTC (rev 3236)
@@ -83,7 +83,7 @@
 
     # system parameters
     f=trellis.fsm(fname) # get the FSM specification from a file
-    Kb=1*16  # packet size in bits (make it multiple of 16 so it can be packed 
in a short)
+    Kb=1024*16  # packet size in bits (make it multiple of 16 so it can be 
packed in a short)
     bitspersymbol = int(round(math.log(f.I())/math.log(2))) # bits per FSM 
input symbol
     K=Kb/bitspersymbol # packet size in trellis steps
     modulation = fsm_utils.psk4 # see fsm_utlis.py for available predefined 
modulations

Modified: 
gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm_combined.py
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm_combined.py 
2006-08-11 10:57:08 UTC (rev 3235)
+++ gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm_combined.py 
2006-08-11 11:37:02 UTC (rev 3236)
@@ -25,7 +25,7 @@
 
     
     # RX
-    va = 
trellis.viterbi_combined_s(f,dimensionality,constellation,K/bitspersymbol,0,7,trellis.TRELLIS_EUCLIDEAN)
 # Put -1 if the Initial/Final states are not set.
+    va = 
trellis.viterbi_combined_s(f,dimensionality,constellation,K/bitspersymbol,0,-1,trellis.TRELLIS_EUCLIDEAN)
 # Put -1 if the Initial/Final states are not set.
     fsmi2s = gr.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack 
FSM input symbols to shorts
     dst = gr.check_lfsr_32k_s();