summaryrefslogtreecommitdiff
path: root/gr-trellis/src/examples/test_turbo_equalization2.py
diff options
context:
space:
mode:
authorTom Rondeau2011-10-25 18:24:36 -0400
committerTom Rondeau2011-10-25 18:24:36 -0400
commitefb131ee516c933e13516287a423764b794e2926 (patch)
tree6ac258fc40ba2b8afc10849022cd7c0c3f9ef7ef /gr-trellis/src/examples/test_turbo_equalization2.py
parentf16368396d354e3206f75f5282aeea4ad382ab88 (diff)
downloadgnuradio-efb131ee516c933e13516287a423764b794e2926.tar.gz
gnuradio-efb131ee516c933e13516287a423764b794e2926.tar.bz2
gnuradio-efb131ee516c933e13516287a423764b794e2926.zip
trellis: fixed the trellis examples to look in gr-digital for the constellation information.
Diffstat (limited to 'gr-trellis/src/examples/test_turbo_equalization2.py')
-rwxr-xr-xgr-trellis/src/examples/test_turbo_equalization2.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-trellis/src/examples/test_turbo_equalization2.py b/gr-trellis/src/examples/test_turbo_equalization2.py
index ff14299c6..7e4341cba 100755
--- a/gr-trellis/src/examples/test_turbo_equalization2.py
+++ b/gr-trellis/src/examples/test_turbo_equalization2.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
@@ -20,7 +20,7 @@ def make_rx(tb,fo,fi,dimensionality,tot_constellation,K,interleaver,IT,Es,N0,typ
# generate all blocks
for it in range(IT):
inter.append( trellis.permutation(interleaver.K(),interleaver.INTER(),fi.I(),gr.sizeof_float) )
- siso_in.append( trellis.siso_combined_f(fi,K,0,-1,True,False,type,dimensionality,tot_constellation,trellis.TRELLIS_EUCLIDEAN) )
+ siso_in.append( trellis.siso_combined_f(fi,K,0,-1,True,False,type,dimensionality,tot_constellation,digital.TRELLIS_EUCLIDEAN) )
deinter.append( trellis.permutation(interleaver.K(),interleaver.DEINTER(),fi.I(),gr.sizeof_float) )
if it < IT-1:
siso_out.append( trellis.siso_f(fo,K,0,-1,False,True,type) )