[Commit-gnuradio] r4470 - gnuradio/trunk/gnuradio-examples/python/channel-coding

[anastas]

Author: anastas
Date: 2007-02-12 22:26:07 -0700 (Mon, 12 Feb 2007)
New Revision: 4470

Modified:
   gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm_combined.py
   
gnuradio/trunk/gnuradio-examples/python/channel-coding/test_turbo_equalization.py
   
gnuradio/trunk/gnuradio-examples/python/channel-coding/test_viterbi_equalization1.py
Log:
update examples to reflect latest changes in gr-trellis

Modified: 
gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm_combined.py
===================================================================
--- gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm_combined.py 
2007-02-13 05:19:21 UTC (rev 4469)
+++ gnuradio/trunk/gnuradio-examples/python/channel-coding/test_tcm_combined.py 
2007-02-13 05:26:07 UTC (rev 4470)
@@ -25,7 +25,7 @@
 
     
     # RX
-    va = 
trellis.viterbi_combined_s(f,K,0,-1,dimensionality,constellation,trellis.TRELLIS_EUCLIDEAN)
 # Put -1 if the Initial/Final states are not set.
+    va = 
trellis.viterbi_combined_fs(f,K,0,-1,dimensionality,constellation,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(); 
     

Modified: 
gnuradio/trunk/gnuradio-examples/python/channel-coding/test_turbo_equalization.py
===================================================================
--- 
gnuradio/trunk/gnuradio-examples/python/channel-coding/test_turbo_equalization.py
   2007-02-13 05:19:21 UTC (rev 4469)
+++ 
gnuradio/trunk/gnuradio-examples/python/channel-coding/test_turbo_equalization.py
   2007-02-13 05:26:07 UTC (rev 4470)
@@ -110,6 +110,7 @@
         sys.exit (1)
     bitspersymbol = int(round(math.log(fo.I())/math.log(2))) # bits per FSM 
input symbol
     K=Kb/bitspersymbol # packet size in trellis steps
+    print 'size = ',K
     interleaver=trellis.interleaver(K,666) # construct a random interleaver
     tot_channel = fsm_utils.make_isi_lookup(modulation,channel,True) # 
generate the lookup table (normalize energy to 1)
     dimensionality = tot_channel[0]
@@ -126,6 +127,7 @@
 
     for i in range(rep):
         
(s,e)=run_test(fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,tot_constellation,1,N0,IT,-long(666+i))
 # run experiment with different seed to get different noise realizations
+        print s
         tot_s=tot_s+s
         terr_s=terr_s+e
         terr_p=terr_p+(terr_s!=0)

Modified: 
gnuradio/trunk/gnuradio-examples/python/channel-coding/test_viterbi_equalization1.py
===================================================================
--- 
gnuradio/trunk/gnuradio-examples/python/channel-coding/test_viterbi_equalization1.py
        2007-02-13 05:19:21 UTC (rev 4469)
+++ 
gnuradio/trunk/gnuradio-examples/python/channel-coding/test_viterbi_equalization1.py
        2007-02-13 05:26:07 UTC (rev 4470)
@@ -34,7 +34,7 @@
     skip = gr.skiphead(gr.sizeof_float, L) # skip the first L samples since 
you know they are coming from the L zero symbols
     #metrics = 
trellis.metrics_f(f.O(),dimensionality,tot_constellation,trellis.TRELLIS_EUCLIDEAN)
 # data preprocessing to generate metrics for Viterbi
     #va = trellis.viterbi_s(f,K+L,-1,0) # Put -1 if the Initial/Final states 
are not set.
-    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...
+    va = 
trellis.viterbi_combined_fs(f,K+L,0,0,dimensionality,tot_constellation,trellis.TRELLIS_EUCLIDEAN)
 # using viterbi_combined_fs 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...
     dst = gr.vector_sink_s()
 
     fg.connect (src,mod)