From efb131ee516c933e13516287a423764b794e2926 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Tue, 25 Oct 2011 18:24:36 -0400
Subject: trellis: fixed the trellis examples to look in gr-digital for the
constellation information.
---
gr-trellis/src/examples/test_cpm.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'gr-trellis/src/examples/test_cpm.py')
diff --git a/gr-trellis/src/examples/test_cpm.py b/gr-trellis/src/examples/test_cpm.py
index b5bdaae44f..06d54b1a6f 100755
--- a/gr-trellis/src/examples/test_cpm.py
+++ b/gr-trellis/src/examples/test_cpm.py
@@ -8,7 +8,7 @@
##################################################
from gnuradio import gr
-from gnuradio import trellis
+from gnuradio import trellis, digital
from gnuradio.gr import firdes
from grc_gnuradio import blks2 as grc_blks2
import math
@@ -103,7 +103,8 @@ def run_test(seed,blocksize):
gr_fir_filter_xxx_0_0_0 = gr.fir_filter_ccc(Q, MF[1].conjugate())
gr_streams_to_stream_0 = gr.streams_to_stream(gr.sizeof_gr_complex*1, int(N))
gr_skiphead_0 = gr.skiphead(gr.sizeof_gr_complex*1, int(N*(1+0)))
- viterbi = trellis.viterbi_combined_cb(f, head+blocksize+tail, 0, -1, int(N), constellation, trellis.TRELLIS_EUCLIDEAN)
+ viterbi = trellis.viterbi_combined_cb(f, head+blocksize+tail, 0, -1, int(N),
+ constellation, digital.TRELLIS_EUCLIDEAN)
gr_vector_sink_x_0 = gr.vector_sink_b()
--
cgit v1.2.3