diff options
| author | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
|---|---|---|
| committer | Ben Reynwar <ben@reynwar.net> | 2013-04-02 23:04:08 -0700 |
| commit | c6dbde23b256a41b3d92cb4ad6b63287095d53c7 (patch) | |
| tree | 71db12ea2e1667770c22568dcdf5e0857d5f1e59 /gr-fft/python | |
| parent | 22b70d0889ef3c51e27a31ee18d153093a55cbb8 (diff) | |
| parent | 98758cbfa9a2aff714952d19e773bc370dfa2185 (diff) | |
Merged next into uninstalled import branch.
Diffstat (limited to 'gr-fft/python')
| -rwxr-xr-x | gr-fft/python/fft/qa_fft.py | 12 | ||||
| -rwxr-xr-x | gr-fft/python/fft/qa_goertzel.py | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gr-fft/python/fft/qa_fft.py b/gr-fft/python/fft/qa_fft.py index 8a989505b6..3c7aa995e4 100755 --- a/gr-fft/python/fft/qa_fft.py +++ b/gr-fft/python/fft/qa_fft.py @@ -86,11 +86,11 @@ class test_fft(gr_unittest.TestCase): (689.48553466796875-918.2142333984375j), (1646.539306640625-1694.1956787109375j)) - src = gr.vector_source_c(src_data) + src = blocks.vector_source_c(src_data) s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size) op = fft.fft_vcc(fft_size, True, [], False) v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size) - dst = gr.vector_sink_c() + dst = blocks.vector_sink_c() tb.connect(src, s2v, op, v2s, dst) tb.run() result_data = dst.data() @@ -140,11 +140,11 @@ 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) + src = blocks.vector_source_c(src_data) s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size) op = fft.fft_vcc(fft_size, False, [], False) v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size) - dst = gr.vector_sink_c() + dst = blocks.vector_sink_c() tb.connect(src, s2v, op, v2s, dst) tb.run() result_data = dst.data() @@ -198,11 +198,11 @@ class test_fft(gr_unittest.TestCase): nthreads = 2 - src = gr.vector_source_c(src_data) + src = blocks.vector_source_c(src_data) s2v = blocks.stream_to_vector(gr.sizeof_gr_complex, fft_size) op = fft.fft_vcc(fft_size, False, [], False, nthreads) v2s = blocks.vector_to_stream(gr.sizeof_gr_complex, fft_size) - dst = gr.vector_sink_c() + dst = blocks.vector_sink_c() tb.connect(src, s2v, op, v2s, dst) tb.run() result_data = dst.data() diff --git a/gr-fft/python/fft/qa_goertzel.py b/gr-fft/python/fft/qa_goertzel.py index 0eb919f5a3..c2c5c565e7 100755 --- a/gr-fft/python/fft/qa_goertzel.py +++ b/gr-fft/python/fft/qa_goertzel.py @@ -22,7 +22,7 @@ from math import pi, cos -from gnuradio import gr, gr_unittest, fft +from gnuradio import gr, gr_unittest, fft, blocks class test_goertzel(gr_unittest.TestCase): @@ -36,9 +36,9 @@ class test_goertzel(gr_unittest.TestCase): return [cos(2*pi*x*freq/rate) for x in range(rate)] def transform(self, src_data, rate, freq): - src = gr.vector_source_f(src_data, False) + src = blocks.vector_source_f(src_data, False) dft = fft.goertzel_fc(rate, rate, freq) - dst = gr.vector_sink_c() + dst = blocks.vector_sink_c() self.tb.connect(src, dft, dst) self.tb.run() return dst.data() |