summaryrefslogtreecommitdiff
path: root/gr-trellis
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2012-12-21 15:11:39 -0500
committerTom Rondeau <trondeau@vt.edu>2012-12-21 21:19:13 -0500
commit55d3e4a47958be287648a2021f7e92d81086b2d9 (patch)
treeae0195c457f2cf2734376679cc88c2d728040680 /gr-trellis
parentfa781237f341a74a243a9fb930daee7e62c3a682 (diff)
blocks: removes blocks moved to gr-blocks from gnuradio-core.
Also fixes up some other missing moves.
Diffstat (limited to 'gr-trellis')
-rw-r--r--gr-trellis/CMakeLists.txt1
-rw-r--r--gr-trellis/doc/gr-trellis.xml4
-rw-r--r--gr-trellis/doc/test_tcm.py4
-rw-r--r--gr-trellis/doc/test_tcm.py.xml4
-rwxr-xr-xgr-trellis/doc/test_viterbi_equalization1.py6
-rw-r--r--gr-trellis/doc/test_viterbi_equalization1.py.xml6
-rwxr-xr-xgr-trellis/src/examples/python/test_cpm.py8
-rwxr-xr-xgr-trellis/src/examples/python/test_pccc_turbo1.py6
-rwxr-xr-xgr-trellis/src/examples/python/test_sccc_hard.py4
-rwxr-xr-xgr-trellis/src/examples/python/test_sccc_soft.py4
-rwxr-xr-xgr-trellis/src/examples/python/test_sccc_turbo.py6
-rwxr-xr-xgr-trellis/src/examples/python/test_sccc_turbo1.py4
-rwxr-xr-xgr-trellis/src/examples/python/test_sccc_turbo2.py6
-rwxr-xr-xgr-trellis/src/examples/python/test_tcm.py4
-rwxr-xr-xgr-trellis/src/examples/python/test_tcm_bit.py4
-rwxr-xr-xgr-trellis/src/examples/python/test_tcm_combined.py4
-rwxr-xr-xgr-trellis/src/examples/python/test_tcm_parallel.py8
-rwxr-xr-xgr-trellis/src/examples/python/test_turbo_equalization.py6
-rwxr-xr-xgr-trellis/src/examples/python/test_turbo_equalization1.py6
-rwxr-xr-xgr-trellis/src/examples/python/test_turbo_equalization2.py6
-rwxr-xr-xgr-trellis/src/examples/python/test_viterbi_equalization.py4
-rwxr-xr-xgr-trellis/src/examples/python/test_viterbi_equalization1.py4
-rw-r--r--gr-trellis/src/python/CMakeLists.txt2
-rwxr-xr-xgr-trellis/src/python/qa_trellis.py3
24 files changed, 59 insertions, 55 deletions
diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt
index 2685be2950..dc09cf7823 100644
--- a/gr-trellis/CMakeLists.txt
+++ b/gr-trellis/CMakeLists.txt
@@ -29,6 +29,7 @@ include(GrComponent)
GR_REGISTER_COMPONENT("gr-trellis" ENABLE_GR_TRELLIS
Boost_FOUND
ENABLE_GR_CORE
+ ENABLE_GR_BLOCKS
ENABLE_GR_DIGITAL
)
diff --git a/gr-trellis/doc/gr-trellis.xml b/gr-trellis/doc/gr-trellis.xml
index 314fb2e05f..083c2f1637 100644
--- a/gr-trellis/doc/gr-trellis.xml
+++ b/gr-trellis/doc/gr-trellis.xml
@@ -597,7 +597,7 @@ r_k=(rk1,rk2,...,rkD).
</para>
<programlisting>
22 # CHANNEL
- 23 add = gr.add_ff()
+ 23 add = blocks.add_ff()
24 noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
</programlisting>
@@ -814,7 +814,7 @@ The modulated symbols are filtered by the ISI channel and AWGN with appropriate
<programlisting>
28 # CHANNEL
29 isi = gr.fir_filter_fff(1,channel)
- 30 add = gr.add_ff()
+ 30 add = blocks.add_ff()
31 noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
</programlisting>
diff --git a/gr-trellis/doc/test_tcm.py b/gr-trellis/doc/test_tcm.py
index 181ba643d6..641e7dd6db 100644
--- a/gr-trellis/doc/test_tcm.py
+++ b/gr-trellis/doc/test_tcm.py
@@ -2,7 +2,7 @@
from gnuradio import gr
from gnuradio import audio
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -26,7 +26,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
mod = digital.chunks_to_symbols_sf(constellation,dimensionality)
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/doc/test_tcm.py.xml b/gr-trellis/doc/test_tcm.py.xml
index 4122fafff8..29052faebc 100644
--- a/gr-trellis/doc/test_tcm.py.xml
+++ b/gr-trellis/doc/test_tcm.py.xml
@@ -4,7 +4,7 @@
2
3 from gnuradio import gr
4 from gnuradio import audio
- 5 from gnuradio import trellis, digital, analog
+ 5 from gnuradio import trellis, digital, analog, blocks
6 from gnuradio import eng_notation
7 import math
8 import sys
@@ -22,7 +22,7 @@
20 mod = digital.chunks_to_symbols_sf(constellation,dimensionality)
21
22 # CHANNEL
- 23 add = gr.add_ff()
+ 23 add = blocks.add_ff()
24 noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
25
26 # RX
diff --git a/gr-trellis/doc/test_viterbi_equalization1.py b/gr-trellis/doc/test_viterbi_equalization1.py
index cac96df117..d53e2b3304 100755
--- a/gr-trellis/doc/test_viterbi_equalization1.py
+++ b/gr-trellis/doc/test_viterbi_equalization1.py
@@ -2,7 +2,7 @@
from gnuradio import gr
from gnuradio import audio
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, filter, blocks
from gnuradio import eng_notation
import math
import sys
@@ -32,8 +32,8 @@ def run_test (f,Kb,bitspersymbol,K,channel,modulation,dimensionality,tot_constel
mod = digital.chunks_to_symbols_sf(modulation[1],modulation[0])
# CHANNEL
- isi = gr.fir_filter_fff(1,channel)
- add = gr.add_ff()
+ isi = filter.fir_filter_fff(1,channel)
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/doc/test_viterbi_equalization1.py.xml b/gr-trellis/doc/test_viterbi_equalization1.py.xml
index e1f2aeefcb..5aca46ab35 100644
--- a/gr-trellis/doc/test_viterbi_equalization1.py.xml
+++ b/gr-trellis/doc/test_viterbi_equalization1.py.xml
@@ -4,7 +4,7 @@
2
3 from gnuradio import gr
4 from gnuradio import audio
- 5 from gnuradio import trellis, digital, analog
+ 5 from gnuradio import trellis, digital, analog, filter, blocks
6 from gnuradio import eng_notation
7 import math
8 import sys
@@ -28,8 +28,8 @@
26 mod = digital.chunks_to_symbols_sf(modulation[1],modulation[0])
27
28 # CHANNEL
- 29 isi = gr.fir_filter_fff(1,channel)
- 30 add = gr.add_ff()
+ 29 isi = filter.fir_filter_fff(1,channel)
+ 30 add = blocs.add_ff()
31 noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
32
33 # RX
diff --git a/gr-trellis/src/examples/python/test_cpm.py b/gr-trellis/src/examples/python/test_cpm.py
index 6b9b9a4f52..8448da2b4f 100755
--- a/gr-trellis/src/examples/python/test_cpm.py
+++ b/gr-trellis/src/examples/python/test_cpm.py
@@ -8,7 +8,7 @@
##################################################
from gnuradio import gr
-from gnuradio import trellis, digital, filter
+from gnuradio import trellis, digital, filter, blocks
from grc_gnuradio import blks2 as grc_blks2
import math
import numpy
@@ -98,15 +98,15 @@ def run_test(seed,blocksize):
gr_interp_fir_filter_xxx_0 = filter.interp_fir_filter_fff(Q, p)
gr_frequency_modulator_fc_0 = analog.frequency_modulator_fc(2*math.pi*h*(1.0/Q))
- gr_add_vxx_0 = gr.add_vcc(1)
+ gr_add_vxx_0 = blocks.add_vcc(1)
gr_noise_source_x_0 = analog.noise_source_c(analog.GR_GAUSSIAN, (N0/2.0)**0.5, -long(seed))
- gr_multiply_vxx_0 = gr.multiply_vcc(1)
+ gr_multiply_vxx_0 = blocks.multiply_vcc(1)
gr_sig_source_x_0 = analog.sig_source_c(Q, analog.GR_COS_WAVE, -f0T, 1, 0)
# only works for N=2, do it manually for N>2...
gr_fir_filter_xxx_0_0 = filter.fir_filter_ccc(Q, MF[0].conjugate())
gr_fir_filter_xxx_0_0_0 = filter.fir_filter_ccc(Q, MF[1].conjugate())
- gr_streams_to_stream_0 = gr.streams_to_stream(gr.sizeof_gr_complex*1, int(N))
+ gr_streams_to_stream_0 = blocks.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, digital.TRELLIS_EUCLIDEAN)
diff --git a/gr-trellis/src/examples/python/test_pccc_turbo1.py b/gr-trellis/src/examples/python/test_pccc_turbo1.py
index bbcce106fb..121659ccf5 100755
--- a/gr-trellis/src/examples/python/test_pccc_turbo1.py
+++ b/gr-trellis/src/examples/python/test_pccc_turbo1.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -28,12 +28,12 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
mod = digital.chunks_to_symbols_sf(constellation,dimensionality)
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
metrics_in = trellis.metrics_f(fi.O()*fo.O(),dimensionality,constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for innner SISO
- scale = gr.multiply_const_ff(1.0/N0)
+ scale = blocks.multiply_const_ff(1.0/N0)
dec = trellis.pccc_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
diff --git a/gr-trellis/src/examples/python/test_sccc_hard.py b/gr-trellis/src/examples/python/test_sccc_hard.py
index b75a07b8b0..8676a6064d 100755
--- a/gr-trellis/src/examples/python/test_sccc_hard.py
+++ b/gr-trellis/src/examples/python/test_sccc_hard.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -28,7 +28,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
mod = digital.chunks_to_symbols_sf(constellation,dimensionality)
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/src/examples/python/test_sccc_soft.py b/gr-trellis/src/examples/python/test_sccc_soft.py
index 0b10c07bbc..1885934a46 100755
--- a/gr-trellis/src/examples/python/test_sccc_soft.py
+++ b/gr-trellis/src/examples/python/test_sccc_soft.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -28,7 +28,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
mod = digital.chunks_to_symbols_sf(constellation,dimensionality)
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/src/examples/python/test_sccc_turbo.py b/gr-trellis/src/examples/python/test_sccc_turbo.py
index 979dfeca59..677c07a05c 100755
--- a/gr-trellis/src/examples/python/test_sccc_turbo.py
+++ b/gr-trellis/src/examples/python/test_sccc_turbo.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -16,7 +16,7 @@ except ImportError:
def make_rx(tb,fo,fi,dimensionality,constellation,K,interleaver,IT,Es,N0,type):
metrics_in = trellis.metrics_f(fi.O(),dimensionality,constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for innner Viterbi
- scale = gr.multiply_const_ff(1.0/N0)
+ scale = blocks.multiply_const_ff(1.0/N0)
gnd = gr.vector_source_f([0],True);
inter=[]
@@ -68,7 +68,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
mod = digital.chunks_to_symbols_sf(constellation,dimensionality)
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/src/examples/python/test_sccc_turbo1.py b/gr-trellis/src/examples/python/test_sccc_turbo1.py
index 60188e4d3b..62a0b6e318 100755
--- a/gr-trellis/src/examples/python/test_sccc_turbo1.py
+++ b/gr-trellis/src/examples/python/test_sccc_turbo1.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -25,7 +25,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
mod = digital.chunks_to_symbols_sf(constellation,dimensionality)
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/src/examples/python/test_sccc_turbo2.py b/gr-trellis/src/examples/python/test_sccc_turbo2.py
index e9f4841e3e..510748a68a 100755
--- a/gr-trellis/src/examples/python/test_sccc_turbo2.py
+++ b/gr-trellis/src/examples/python/test_sccc_turbo2.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -25,12 +25,12 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,constellation,
mod = digital.chunks_to_symbols_sf(constellation,dimensionality)
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
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)
+ scale = blocks.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
dst = gr.check_lfsr_32k_s()
diff --git a/gr-trellis/src/examples/python/test_tcm.py b/gr-trellis/src/examples/python/test_tcm.py
index fced315260..aca06f783e 100755
--- a/gr-trellis/src/examples/python/test_tcm.py
+++ b/gr-trellis/src/examples/python/test_tcm.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -33,7 +33,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
mod = digital.chunks_to_symbols_sf(constellation,dimensionality)
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/src/examples/python/test_tcm_bit.py b/gr-trellis/src/examples/python/test_tcm_bit.py
index 873d58684b..4438db91ac 100755
--- a/gr-trellis/src/examples/python/test_tcm_bit.py
+++ b/gr-trellis/src/examples/python/test_tcm_bit.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -34,7 +34,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
diff --git a/gr-trellis/src/examples/python/test_tcm_combined.py b/gr-trellis/src/examples/python/test_tcm_combined.py
index 8bea1ac86a..a0cd58c6df 100755
--- a/gr-trellis/src/examples/python/test_tcm_combined.py
+++ b/gr-trellis/src/examples/python/test_tcm_combined.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -27,7 +27,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed):
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
diff --git a/gr-trellis/src/examples/python/test_tcm_parallel.py b/gr-trellis/src/examples/python/test_tcm_parallel.py
index 1767cc730f..0bd6f739c1 100755
--- a/gr-trellis/src/examples/python/test_tcm_parallel.py
+++ b/gr-trellis/src/examples/python/test_tcm_parallel.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -22,7 +22,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed,P):
src = gr.lfsr_32k_source_s()
src_head = gr.head (gr.sizeof_short,Kb/16*P) # packet size in shorts
s2fsmi=gr.packed_to_unpacked_ss(bitspersymbol,gr.GR_MSB_FIRST) # unpack shorts to symbols compatible with the FSM input cardinality
- s2p = gr.stream_to_streams(gr.sizeof_short,P) # serial to parallel
+ s2p = blocks.stream_to_streams(gr.sizeof_short,P) # serial to parallel
enc = trellis.encoder_ss(f,0) # initiali state = 0
mod = digital.chunks_to_symbols_sf(constellation,dimensionality)
@@ -30,13 +30,13 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,constellation,N0,seed,P):
add=[]
noise=[]
for i in range(P):
- add.append(gr.add_ff())
+ add.append(blocks.add_ff())
noise.append(analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed))
# RX
metrics = trellis.metrics_f(f.O(),dimensionality,constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for Viterbi
va = trellis.viterbi_s(f,K,0,-1) # Put -1 if the Initial/Final states are not set.
- p2s = gr.streams_to_stream(gr.sizeof_short,P) # parallel to serial
+ p2s = block.streams_to_stream(gr.sizeof_short,P) # parallel to serial
fsmi2s=gr.unpacked_to_packed_ss(bitspersymbol,gr.GR_MSB_FIRST) # pack FSM input symbols to shorts
dst = gr.check_lfsr_32k_s()
diff --git a/gr-trellis/src/examples/python/test_turbo_equalization.py b/gr-trellis/src/examples/python/test_turbo_equalization.py
index baddd7cb50..b0889bdcef 100755
--- a/gr-trellis/src/examples/python/test_turbo_equalization.py
+++ b/gr-trellis/src/examples/python/test_turbo_equalization.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -15,7 +15,7 @@ except ImportError:
def make_rx(tb,fo,fi,dimensionality,tot_constellation,K,interleaver,IT,Es,N0,type):
metrics_in = trellis.metrics_f(fi.O(),dimensionality,tot_constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for innner SISO
- scale = gr.multiply_const_ff(1.0/N0)
+ scale = blocks.multiply_const_ff(1.0/N0)
gnd = gr.vector_source_f([0],True);
inter=[]
@@ -67,7 +67,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,dimensionality,tot_constellat
mod = digital.chunks_to_symbols_sf(tot_constellation,dimensionality)
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/src/examples/python/test_turbo_equalization1.py b/gr-trellis/src/examples/python/test_turbo_equalization1.py
index dfe1a2d82e..ae7e3e374b 100755
--- a/gr-trellis/src/examples/python/test_turbo_equalization1.py
+++ b/gr-trellis/src/examples/python/test_turbo_equalization1.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital, filter
+from gnuradio import trellis, digital, filter, blocks
from gnuradio import eng_notation
import math
import sys
@@ -16,7 +16,7 @@ except ImportError:
def make_rx(tb,fo,fi,dimensionality,tot_constellation,K,interleaver,IT,Es,N0,type):
metrics_in = trellis.metrics_f(fi.O(),dimensionality,tot_constellation,digital.TRELLIS_EUCLIDEAN) # data preprocessing to generate metrics for innner SISO
- scale = gr.multiply_const_ff(1.0/N0)
+ scale = blocks.multiply_const_ff(1.0/N0)
gnd = gr.vector_source_f([0],True);
inter=[]
@@ -71,7 +71,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,channel,modulation,dimensiona
# CHANNEL
isi = filter.fir_filter_fff(1,channel)
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/src/examples/python/test_turbo_equalization2.py b/gr-trellis/src/examples/python/test_turbo_equalization2.py
index fb0a899eba..eed5675fe5 100755
--- a/gr-trellis/src/examples/python/test_turbo_equalization2.py
+++ b/gr-trellis/src/examples/python/test_turbo_equalization2.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital, filter
+from gnuradio import trellis, digital, filter, blocks
from gnuradio import eng_notation
import math
import sys
@@ -15,7 +15,7 @@ except ImportError:
sys.exit(1)
def make_rx(tb,fo,fi,dimensionality,tot_constellation,K,interleaver,IT,Es,N0,type):
- scale = gr.multiply_const_ff(math.sqrt(1.0/N0))
+ scale = blocks.multiply_const_ff(math.sqrt(1.0/N0))
gnd = gr.vector_source_f([0],True);
inter=[]
@@ -69,7 +69,7 @@ def run_test (fo,fi,interleaver,Kb,bitspersymbol,K,channel,modulation,dimensiona
# CHANNEL
isi = filter.fir_filter_fff(1,channel)
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/src/examples/python/test_viterbi_equalization.py b/gr-trellis/src/examples/python/test_viterbi_equalization.py
index 91dc7e36da..21236d2870 100755
--- a/gr-trellis/src/examples/python/test_viterbi_equalization.py
+++ b/gr-trellis/src/examples/python/test_viterbi_equalization.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital
+from gnuradio import trellis, digital, blocks
from gnuradio import eng_notation
import math
import sys
@@ -25,7 +25,7 @@ def run_test (f,Kb,bitspersymbol,K,dimensionality,tot_constellation,N0,seed):
mod = digital.chunks_to_symbols_sf(tot_constellation,dimensionality)
# CHANNEL
- add = gr.add_ff()
+ add = blocks.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/src/examples/python/test_viterbi_equalization1.py b/gr-trellis/src/examples/python/test_viterbi_equalization1.py
index 4421e370a4..df46046ae3 100755
--- a/gr-trellis/src/examples/python/test_viterbi_equalization1.py
+++ b/gr-trellis/src/examples/python/test_viterbi_equalization1.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python
from gnuradio import gr
-from gnuradio import trellis, digital, filter
+from gnuradio import trellis, digital, filter, blocks
from gnuradio import eng_notation
import math
import sys
@@ -32,7 +32,7 @@ def run_test (f,Kb,bitspersymbol,K,channel,modulation,dimensionality,tot_constel
# CHANNEL
isi = filter.fir_filter_fff(1,channel)
- add = gr.add_ff()
+ add = blockss.add_ff()
noise = analog.noise_source_f(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
diff --git a/gr-trellis/src/python/CMakeLists.txt b/gr-trellis/src/python/CMakeLists.txt
index adc6b3a239..d5b941afab 100644
--- a/gr-trellis/src/python/CMakeLists.txt
+++ b/gr-trellis/src/python/CMakeLists.txt
@@ -26,6 +26,8 @@ list(APPEND GR_TEST_PYTHON_DIRS
${CMAKE_BINARY_DIR}/gr-analog/swig
${CMAKE_BINARY_DIR}/gr-digital/swig
${CMAKE_BINARY_DIR}/gr-trellis/src/lib
+ ${CMAKE_BINARY_DIR}/gr-blocks/python
+ ${CMAKE_BINARY_DIR}/gr-blocks/swig
)
list(APPEND GR_TEST_TARGET_DEPS gnuradio-analog gnuradio-digital gnuradio-trellis gnuradio-filter)
diff --git a/gr-trellis/src/python/qa_trellis.py b/gr-trellis/src/python/qa_trellis.py
index 53dcf0d8f6..2560e30131 100755
--- a/gr-trellis/src/python/qa_trellis.py
+++ b/gr-trellis/src/python/qa_trellis.py
@@ -31,6 +31,7 @@ import trellis
import os
import digital_swig as digital
import analog_swig as analog
+import blocks_swig as blocks
fsm_args = {"awgn1o2_4": (2, 4, 4,
(0, 2, 0, 2, 1, 3, 1, 3),
@@ -118,7 +119,7 @@ class trellis_tb(gr.top_block):
mod = digital.chunks_to_symbols_sc(constellation.points(), 1)
# CHANNEL
- add = gr.add_cc()
+ add = blocks.add_cc()
noise = analog.noise_source_c(analog.GR_GAUSSIAN,math.sqrt(N0/2),seed)
# RX
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-16 03:36:56 +0000