[Commit-gnuradio] r3540 - in gnuradio/trunk: config gnuradio-examples/python/channel-coding gnuradio-examples/python/channel-coding/fsm_files gr-trellis/doc

[anastas]

Author: anastas
Date: 2006-09-14 09:09:03 -0600 (Thu, 14 Sep 2006)
New Revision: 3540

Added:
   gnuradio/trunk/gnuradio-examples/python/channel-coding/fsm_files/Makefile.am
Modified:
   gnuradio/trunk/config/grc_gnuradio_examples.m4
   gnuradio/trunk/gnuradio-examples/python/channel-coding/Makefile.am
   gnuradio/trunk/gnuradio-examples/python/channel-coding/README
   gnuradio/trunk/gr-trellis/doc/Makefile.am
   gnuradio/trunk/gr-trellis/doc/test_viterbi_equalization1.py.xml
Log:
fixed ticket #65

Modified: gnuradio/trunk/config/grc_gnuradio_examples.m4
===================================================================
--- gnuradio/trunk/config/grc_gnuradio_examples.m4      2006-09-14 03:13:18 UTC 
(rev 3539)
+++ gnuradio/trunk/config/grc_gnuradio_examples.m4      2006-09-14 15:09:03 UTC 
(rev 3540)
@@ -25,6 +25,7 @@
         gnuradio-examples/python/Makefile \
         gnuradio-examples/python/audio/Makefile \
         gnuradio-examples/python/channel-coding/Makefile \
+        gnuradio-examples/python/channel-coding/fsm_files/Makefile \
         gnuradio-examples/python/digital_voice/Makefile \
         gnuradio-examples/python/gmsk2/Makefile \
         gnuradio-examples/python/mc4020/Makefile \

Modified: gnuradio/trunk/gnuradio-examples/python/channel-coding/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/channel-coding/Makefile.am  
2006-09-14 03:13:18 UTC (rev 3539)
+++ gnuradio/trunk/gnuradio-examples/python/channel-coding/Makefile.am  
2006-09-14 15:09:03 UTC (rev 3540)
@@ -24,8 +24,18 @@
        fsm_utils.py            \
        test_tcm.py             \
        test_tcm1.py            \
+       test_tcm2.py            \
        test_tcm_parallel.py    \
        test_tcm_combined.py    \
-       test_sccc_hard.py
+       test_sccc_hard.py       \
+       test_sccc_soft.py       \
+       test_sccc_turbo.py      \
+       test_viterbi_equalization1.py   \
+       test_viterbi_equalization.py    \
+       test_turbo_equalization.py      \
+       test_turbo_equalization1.py     \
+       test_turbo_equalization2.py     
 
+SUBDIRS = fsm_files
+
 MOSTLYCLEANFILES = *.pyc

Modified: gnuradio/trunk/gnuradio-examples/python/channel-coding/README
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/channel-coding/README       
2006-09-14 03:13:18 UTC (rev 3539)
+++ gnuradio/trunk/gnuradio-examples/python/channel-coding/README       
2006-09-14 15:09:03 UTC (rev 3540)
@@ -20,6 +20,8 @@
 
 ./test_viterbi_equalization.py  12.0 100
 ./test_viterbi_equalization1.py 12.0 100
+./test_turbo_equalization1.py fsm_files/awgn1o2_4.fsm 8.0 100
+./test_turbo_equalization2.py fsm_files/awgn1o2_4.fsm 8.0 100
 
 
 In your terminal you will see something like this:

Added: 
gnuradio/trunk/gnuradio-examples/python/channel-coding/fsm_files/Makefile.am
===================================================================
--- 
gnuradio/trunk/gnuradio-examples/python/channel-coding/fsm_files/Makefile.am    
                            (rev 0)
+++ 
gnuradio/trunk/gnuradio-examples/python/channel-coding/fsm_files/Makefile.am    
    2006-09-14 15:09:03 UTC (rev 3540)
@@ -0,0 +1,37 @@
+#
+# Copyright 2004 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+# 
+
+EXTRA_DIST =                   \
+       awgn1o2_128.fsm         \
+       awgn1o2_16.fsm          \
+       awgn1o2_4.fsm           \
+       awgn1o2_8.fsm           \
+       awgn2o3_16.fsm          \
+       awgn2o3_4.fsm           \
+       awgn2o3_4_msb.fsm       \
+       awgn2o3_4_msbG.fsm      \
+       awgn2o3_8.fsm           \
+       awgn2o4_4.fsm           \
+       disconnected.fsm        \
+       rep3.fsm                \
+       rep5.fsm                \
+       simple.fsm              
+

Modified: gnuradio/trunk/gr-trellis/doc/Makefile.am
===================================================================
--- gnuradio/trunk/gr-trellis/doc/Makefile.am   2006-09-14 03:13:18 UTC (rev 
3539)
+++ gnuradio/trunk/gr-trellis/doc/Makefile.am   2006-09-14 15:09:03 UTC (rev 
3540)
@@ -34,7 +34,9 @@
     gr-trellis.xml \
     make_numbered_listing.py \
     test_tcm.py \
-    test_tcm.py.xml
+    test_tcm.py.xml \
+    test_viterbi_equalization1.py \
+    test_viterbi_equalization1.py.xml
 
 BUILT_XML_FILES =                      
 
@@ -61,4 +63,4 @@
        $(RM) -fr $(DESTDIR)$(docdir)/html
 
 clean-local:
-       $(RM) -fr $(HTML_FILES) *~
\ No newline at end of file
+       $(RM) -fr $(HTML_FILES) *~

Modified: gnuradio/trunk/gr-trellis/doc/test_viterbi_equalization1.py.xml
===================================================================
--- gnuradio/trunk/gr-trellis/doc/test_viterbi_equalization1.py.xml     
2006-09-14 03:13:18 UTC (rev 3539)
+++ gnuradio/trunk/gr-trellis/doc/test_viterbi_equalization1.py.xml     
2006-09-14 15:09:03 UTC (rev 3540)
@@ -35,7 +35,7 @@
  33      # RX
  34      skip = gr.skiphead(gr.sizeof_float, L) # skip the first L samples 
since you know they are coming from the L zero symbols
  35      #metrics = 
trellis.metrics_f(f.O(),dimensionality,tot_constellation,trellis.TRELLIS_EUCLIDEAN)
 # data preprocessing to generate metrics for Viterbi
- 36      #va = trellis.viterbi_s(f,K+L,-1,0) # Put -1 if the Initial/Final 
states are not set.
+ 36      #va = trellis.viterbi_s(f,K+L,0,0) # Put -1 if the Initial/Final 
states are not set.
  37      va = 
trellis.viterbi_combined_s(f,K+L,0,0,dimensionality,tot_constellation,trellis.TRELLIS_EUCLIDEAN)
 # using viterbi_combined_s instead of metrics_f/viterbi_s allows larger packet 
lengths because metrics_f is complaining for not being able to allocate large 
buffers. This is due to the large f.O() in this application...
  38      dst = gr.vector_sink_s()
  39