diff options
Diffstat (limited to 'gr-trellis/doc')
-rw-r--r-- | gr-trellis/doc/test_tcm.py | 14 | ||||
-rw-r--r-- | gr-trellis/doc/test_tcm.py.xml | 14 | ||||
-rwxr-xr-x | gr-trellis/doc/test_viterbi_equalization1.py | 16 | ||||
-rw-r--r-- | gr-trellis/doc/test_viterbi_equalization1.py.xml | 16 |
4 files changed, 30 insertions, 30 deletions
diff --git a/gr-trellis/doc/test_tcm.py b/gr-trellis/doc/test_tcm.py index e2429b80c0..0472535c1c 100644 --- a/gr-trellis/doc/test_tcm.py +++ b/gr-trellis/doc/test_tcm.py @@ -10,7 +10,7 @@ import random import fsm_utils def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed): - fg = gr.flow_graph () + tb = gr.top_block () # TX src = gr.lfsr_32k_source_s() @@ -29,13 +29,13 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed): fsmi2s = gr.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts dst = gr.check_lfsr_32k_s(); - fg.connect (src,src_head,s2fsmi,enc,mod) - fg.connect (mod,(add,0)) - fg.connect (noise,(add,1)) - fg.connect (add,metrics) - fg.connect (metrics,va,fsmi2s,dst) + tb.connect (src,src_head,s2fsmi,enc,mod) + tb.connect (mod,(add,0)) + tb.connect (noise,(add,1)) + tb.connect (add,metrics) + tb.connect (metrics,va,fsmi2s,dst) - fg.run() + tb.run() # A bit of cheating: run the program once and print the # final encoder state. diff --git a/gr-trellis/doc/test_tcm.py.xml b/gr-trellis/doc/test_tcm.py.xml index c8d11d303f..b957f682d1 100644 --- a/gr-trellis/doc/test_tcm.py.xml +++ b/gr-trellis/doc/test_tcm.py.xml @@ -12,7 +12,7 @@ 10 import fsm_utils 11 12 def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed): - 13 fg = gr.flow_graph () + 13 tb = gr.top_block () 14 15 # TX 16 src = gr.lfsr_32k_source_s() @@ -31,13 +31,13 @@ 29 fsmi2s = gr.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts 30 dst = gr.check_lfsr_32k_s(); 31 - 32 fg.connect (src,src_head,s2fsmi,enc,mod) - 33 fg.connect (mod,(add,0)) - 34 fg.connect (noise,(add,1)) - 35 fg.connect (add,metrics) - 36 fg.connect (metrics,va,fsmi2s,dst) + 32 tb.connect (src,src_head,s2fsmi,enc,mod) + 33 tb.connect (mod,(add,0)) + 34 tb.connect (noise,(add,1)) + 35 tb.connect (add,metrics) + 36 tb.connect (metrics,va,fsmi2s,dst) 37 - 38 fg.run() + 38 tb.run() 39 40 # A bit of cheating: run the program once and print the 41 # final encoder state. diff --git a/gr-trellis/doc/test_viterbi_equalization1.py b/gr-trellis/doc/test_viterbi_equalization1.py index 57d617aa02..93b852e85a 100755 --- a/gr-trellis/doc/test_viterbi_equalization1.py +++ b/gr-trellis/doc/test_viterbi_equalization1.py @@ -10,7 +10,7 @@ import random import fsm_utils def run_test (f,Kb,bitspersymbol,K,channel,modulation,dimensionality,tot_constellation,N0,seed): - fg = gr.flow_graph () + tb = gr.top_block () L = len(channel) # TX @@ -37,14 +37,14 @@ def run_test (f,Kb,bitspersymbol,K,channel,modulation,dimensionality,tot_constel 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... dst = gr.vector_sink_s() - fg.connect (src,mod) - fg.connect (mod,isi,(add,0)) - fg.connect (noise,(add,1)) - #fg.connect (add,metrics) - #fg.connect (metrics,va,dst) - fg.connect (add,skip,va,dst) + tb.connect (src,mod) + tb.connect (mod,isi,(add,0)) + tb.connect (noise,(add,1)) + #tb.connect (add,metrics) + #tb.connect (metrics,va,dst) + tb.connect (add,skip,va,dst) - fg.run() + tb.run() data = dst.data() ntotal = len(data) - L diff --git a/gr-trellis/doc/test_viterbi_equalization1.py.xml b/gr-trellis/doc/test_viterbi_equalization1.py.xml index 4ea83be993..a97d04d6e4 100644 --- a/gr-trellis/doc/test_viterbi_equalization1.py.xml +++ b/gr-trellis/doc/test_viterbi_equalization1.py.xml @@ -12,7 +12,7 @@ 10 import fsm_utils 11 12 def run_test (f,Kb,bitspersymbol,K,channel,modulation,dimensionality,tot_constellation,N0,seed): - 13 fg = gr.flow_graph () + 13 tb = gr.top_block () 14 L = len(channel) 15 16 # TX @@ -39,14 +39,14 @@ 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 - 40 fg.connect (src,mod) - 41 fg.connect (mod,isi,(add,0)) - 42 fg.connect (noise,(add,1)) - 43 #fg.connect (add,metrics) - 44 #fg.connect (metrics,va,dst) - 45 fg.connect (add,skip,va,dst) + 40 tb.connect (src,mod) + 41 tb.connect (mod,isi,(add,0)) + 42 tb.connect (noise,(add,1)) + 43 #tb.connect (add,metrics) + 44 #tb.connect (metrics,va,dst) + 45 tb.connect (add,skip,va,dst) 46 - 47 fg.run() + 47 tb.run() 48 49 data = dst.data() 50 ntotal = len(data) - L |