#!/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
#
#
from gnuradio import gr, gr_unittest
-from gnuradio import blks
+from gnuradio import blks2
import math
import random
import sys
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...
#
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)
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)
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)
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)
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)
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)
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)
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):
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()