diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-10-25 18:24:36 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-10-25 18:24:36 -0400 |
| commit | efb131ee516c933e13516287a423764b794e2926 (patch) | |
| tree | 6ac258fc40ba2b8afc10849022cd7c0c3f9ef7ef /gr-trellis/src/examples/test_sccc_turbo2.py | |
| parent | f16368396d354e3206f75f5282aeea4ad382ab88 (diff) | |
trellis: fixed the trellis examples to look in gr-digital for the constellation information.
Diffstat (limited to 'gr-trellis/src/examples/test_sccc_turbo2.py')
| -rwxr-xr-x | gr-trellis/src/examples/test_sccc_turbo2.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-trellis/src/examples/test_sccc_turbo2.py b/gr-trellis/src/examples/test_sccc_turbo2.py index a47f6400e6..fdb92adc8b 100755 --- a/gr-trellis/src/examples/test_sccc_turbo2.py +++ b/gr-trellis/src/examples/test_sccc_turbo2.py @@ -1,7 +1,7 @@ #!/usr/bin/env python from gnuradio import gr -from gnuradio import trellis +from gnuradio import trellis, digital from gnuradio import eng_notation import math import sys @@ -24,7 +24,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation, noise = gr.noise_source_f(gr.GR_GAUSSIAN,math.sqrt(N0/2),seed) # RX - metrics_in = trellis.metrics_f(fi.O(),dimensionality,constellation,trellis.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for innner SISO + metrics_in = trellis.metrics_f(fi.O(),dimensionality,constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for innner SISO scale = gr.multiply_const_ff(1.0/N0) dec = trellis.sccc_decoder_s(fo,0,-1,fi,0,-1,interleaver,K,IT,trellis.TRELLIS_MIN_SUM) fsmi2s = gr.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts |