X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=gnuradio-core%2Fsrc%2Fpython%2Fgnuradio%2Fgr%2Fqa_rational_resampler.py;h=f8bf4b121ceeab666a622ae6849f4b09725706e2;hb=ea29b08aeb54227e6628f655ccfdb96fe4d8c378;hp=c81d03330fee2ee99f5ba46e269672c045b3355c;hpb=09a1e803a9e6587c78d20cdf16891e5295874668;p=debian%2Fgnuradio diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_rational_resampler.py b/gnuradio-core/src/python/gnuradio/gr/qa_rational_resampler.py index c81d0333..f8bf4b12 100755 --- a/gnuradio-core/src/python/gnuradio/gr/qa_rational_resampler.py +++ b/gnuradio-core/src/python/gnuradio/gr/qa_rational_resampler.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2005,2006 Free Software Foundation, Inc. +# Copyright 2005,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -21,7 +21,7 @@ # from gnuradio import gr, gr_unittest -from gnuradio import blks +from gnuradio import blks2 import math import random import sys @@ -39,48 +39,48 @@ def random_floats(n): def reference_dec_filter(src_data, decim, taps): - fg = gr.flow_graph() + tb = gr.top_block() src = gr.vector_source_f(src_data) op = gr.fir_filter_fff(decim, taps) dst = gr.vector_sink_f() - fg.connect(src, op, dst) - fg.run() + tb.connect(src, op, dst) + tb.run() result_data = dst.data() - fg = None + tb = None return result_data def reference_interp_filter(src_data, interp, taps): - fg = gr.flow_graph() + tb = gr.top_block() src = gr.vector_source_f(src_data) op = gr.interp_fir_filter_fff(interp, taps) dst = gr.vector_sink_f() - fg.connect(src, op, dst) - fg.run() + tb.connect(src, op, dst) + tb.run() result_data = dst.data() - fg = None + tb = None return result_data def reference_interp_dec_filter(src_data, interp, decim, taps): - fg = gr.flow_graph() + tb = gr.top_block() src = gr.vector_source_f(src_data) up = gr.interp_fir_filter_fff(interp, (1,)) dn = gr.fir_filter_fff(decim, taps) dst = gr.vector_sink_f() - fg.connect(src, up, dn, dst) - fg.run() + tb.connect(src, up, dn, dst) + tb.run() result_data = dst.data() - fg = None + tb = None return result_data class test_rational_resampler (gr_unittest.TestCase): def setUp(self): - self.fg = gr.flow_graph() + pass def tearDown(self): - self.fg = None - + pass + # # test the gr.rational_resampler_base primitives... # @@ -91,12 +91,13 @@ class test_rational_resampler (gr_unittest.TestCase): xr = (-936, 1186, -112, 339, -460, -167, 582) expected_result = tuple([float(x) for x in xr]) + tb = gr.top_block() src = gr.vector_source_f(src_data) op = gr.rational_resampler_base_fff(1, 1, taps) dst = gr.vector_sink_f() - self.fg.connect(src, op) - self.fg.connect(op, dst) - self.fg.run() + tb.connect(src, op) + tb.connect(op, dst) + tb.run() result_data = dst.data() self.assertEqual(expected_result, result_data) @@ -107,12 +108,13 @@ class test_rational_resampler (gr_unittest.TestCase): xr = (0,0,0,0,2,20,200,2003,20030,300,3005,30050,500,5007,50070,700,7011,70110,1100,11013,110130,1300,13017,130170,1700.0,17000.0,170000.0) expected_result = tuple([float(x) for x in xr]) + tb = gr.top_block() src = gr.vector_source_f(src_data) op = gr.rational_resampler_base_fff(interpolation, 1, taps) dst = gr.vector_sink_f() - self.fg.connect(src, op) - self.fg.connect(op, dst) - self.fg.run() + tb.connect(src, op) + tb.connect(op, dst) + tb.run() result_data = dst.data() self.assertEqual(expected_result, result_data) @@ -124,12 +126,13 @@ class test_rational_resampler (gr_unittest.TestCase): expected_result = reference_interp_filter(src_data, interpolation, taps) + tb = gr.top_block() src = gr.vector_source_f(src_data) op = gr.rational_resampler_base_fff(interpolation, 1, taps) dst = gr.vector_sink_f() - self.fg.connect(src, op) - self.fg.connect(op, dst) - self.fg.run() + tb.connect(src, op) + tb.connect(op, dst) + tb.run() result_data = dst.data() L1 = len(result_data) @@ -151,12 +154,13 @@ class test_rational_resampler (gr_unittest.TestCase): expected_result = reference_dec_filter(src_data, decimation, taps) + tb = gr.top_block() src = gr.vector_source_f(src_data) op = gr.rational_resampler_base_fff(1, decimation, taps) dst = gr.vector_sink_f() - self.fg.connect(src, op) - self.fg.connect(op, dst) - self.fg.run() + tb.connect(src, op) + tb.connect(op, dst) + tb.run() result_data = dst.data() L1 = len(result_data) @@ -184,13 +188,13 @@ class test_rational_resampler (gr_unittest.TestCase): taps = random_floats(ntaps) expected_result = reference_dec_filter(src_data, decim, taps) - fg = gr.flow_graph() + tb = gr.top_block() src = gr.vector_source_f(src_data) op = gr.rational_resampler_base_fff(1, decim, taps) dst = gr.vector_sink_f() - fg.connect(src, op, dst) - fg.run() - fg = None + tb.connect(src, op, dst) + tb.run() + tb = None result_data = dst.data() L1 = len(result_data) L2 = len(expected_result) @@ -217,13 +221,13 @@ class test_rational_resampler (gr_unittest.TestCase): taps = random_floats(ntaps) expected_result = reference_interp_filter(src_data, interp, taps) - fg = gr.flow_graph() + tb = gr.top_block() src = gr.vector_source_f(src_data) op = gr.rational_resampler_base_fff(interp, 1, taps) dst = gr.vector_sink_f() - fg.connect(src, op, dst) - fg.run() - fg = None + tb.connect(src, op, dst) + tb.run() + tb = None result_data = dst.data() L1 = len(result_data) L2 = len(expected_result) @@ -246,12 +250,13 @@ class test_rational_resampler (gr_unittest.TestCase): expected_result = reference_interp_dec_filter(src_data, interp, decimation, taps) + tb = gr.top_block() src = gr.vector_source_f(src_data) op = gr.rational_resampler_base_fff(interp, decimation, taps) dst = gr.vector_sink_f() - self.fg.connect(src, op) - self.fg.connect(op, dst) - self.fg.run() + tb.connect(src, op) + tb.connect(op, dst) + tb.run() result_data = dst.data() L1 = len(result_data) @@ -265,7 +270,7 @@ class test_rational_resampler (gr_unittest.TestCase): self.assertEqual(expected_result[1:L], result_data[1:L]) # - # test the blks.rational_resampler_??? primitives... + # test the blks2.rational_resampler_??? primitives... # def test_101_interp(self): @@ -275,16 +280,19 @@ class test_rational_resampler (gr_unittest.TestCase): xr = (0,0,0,0,2,20,200,2003,20030,300,3005,30050,500,5007,50070,700,7011,70110,1100,11013,110130,1300,13017,130170,1700.0,17000.0,170000.0) expected_result = tuple([float(x) for x in xr]) + tb = gr.top_block() src = gr.vector_source_f(src_data) - op = blks.rational_resampler_fff(self.fg, interpolation, 1, taps=taps) + op = blks2.rational_resampler_fff(interpolation, 1, taps=taps) dst = gr.vector_sink_f() - self.fg.connect(src, op) - self.fg.connect(op, dst) - self.fg.run() + tb.connect(src, op) + tb.connect(op, dst) + tb.run() result_data = dst.data() self.assertEqual(expected_result, result_data) if __name__ == '__main__': - gr_unittest.main() + pass + # FIXME: Disabled, see ticket:210 + # gr_unittest.main()