diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-29 20:26:35 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-29 20:26:35 -0500 |
| commit | 0fb538e11e8425c4f15063e249dc0dae2d54ebd5 (patch) | |
| tree | d4d4964feb7771c01b75a33be9d209389a8b4fc9 /gr-fft/python/qa_fft.py | |
| parent | 4580aaf9583b1e8ca4b3ef1d3127c7d48566fe67 (diff) | |
| parent | c805168975a30af962fbd0a25c091d7b2113394e (diff) | |
Merge branch 'next_blocks' into next
Conflicts:
gr-trellis/CMakeLists.txt
gr-trellis/python/CMakeLists.txt
Diffstat (limited to 'gr-fft/python/qa_fft.py')
| -rwxr-xr-x | gr-fft/python/qa_fft.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gr-fft/python/qa_fft.py b/gr-fft/python/qa_fft.py index 1c45ac1484..0a66a2c1fc 100755 --- a/gr-fft/python/qa_fft.py +++ b/gr-fft/python/qa_fft.py @@ -21,6 +21,7 @@ from gnuradio import gr, gr_unittest import fft_swig as fft +import blocks_swig as blocks import sys import random @@ -87,9 +88,9 @@ class test_fft(gr_unittest.TestCase): (1646.539306640625-1694.1956787109375j)) src = gr.vector_source_c(src_data) - s2v = gr.stream_to_vector(gr.sizeof_gr_complex, fft_size) + s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size) op = fft.fft_vcc(fft_size, True, [], False) - v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fft_size) + v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size) dst = gr.vector_sink_c() tb.connect(src, s2v, op, v2s, dst) tb.run() @@ -141,9 +142,9 @@ class test_fft(gr_unittest.TestCase): expected_result = tuple([complex(primes[2*i], primes[2*i+1]) for i in range(fft_size)]) src = gr.vector_source_c(src_data) - s2v = gr.stream_to_vector(gr.sizeof_gr_complex, fft_size) + s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size) op = fft.fft_vcc(fft_size, False, [], False) - v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fft_size) + v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size) dst = gr.vector_sink_c() tb.connect(src, s2v, op, v2s, dst) tb.run() @@ -199,9 +200,9 @@ class test_fft(gr_unittest.TestCase): nthreads = 2 src = gr.vector_source_c(src_data) - s2v = gr.stream_to_vector(gr.sizeof_gr_complex, fft_size) + s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size) op = fft.fft_vcc(fft_size, False, [], False, nthreads) - v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fft_size) + v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size) dst = gr.vector_sink_c() tb.connect(src, s2v, op, v2s, dst) tb.run() |