blocks: converting blocks to v3.7 style in gr-blocks.

delay, rms, unpacked_to_packed, packed_to_unpacked

4 files changed, 494 insertions, 2 deletions

diff --git a/gr-blocks/python/qa_delay.py b/gr-blocks/python/qa_delay.py
new file mode 100755
index 000000000..031cadb2d
--- /dev/null
+++ b/gr-blocks/python/qa_delay.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+#
+# Copyright 2004,2007,2010,2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from gnuradio import gr, gr_unittest
+import blocks_swig as blocks
+
+class test_delay(gr_unittest.TestCase):
+
+    def setUp(self):
+        self.tb = gr.top_block()
+
+    def tearDown(self):
+        self.tb = None
+
+    def test_000(self):
+        delta_t = 0
+        tb = self.tb
+        src_data = [float(x) for x in range(0, 100)]
+        expected_result = tuple(delta_t*[0.0] + src_data)
+
+        src = gr.vector_source_f(src_data)
+        op = blocks.delay(gr.sizeof_float, delta_t)
+        dst = gr.vector_sink_f()
+
+        tb.connect(src, op, dst)
+        tb.run()
+        dst_data = dst.data()
+        self.assertEqual(expected_result, dst_data)
+
+    def test_010(self):
+        delta_t = 10
+        tb = self.tb
+        src_data = [float(x) for x in range(0, 100)]
+        expected_result = tuple(delta_t*[0.0] + src_data)
+
+        src = gr.vector_source_f(src_data)
+        op = blocks.delay(gr.sizeof_float, delta_t)
+        dst = gr.vector_sink_f()
+
+        tb.connect(src, op, dst)
+        tb.run()
+        dst_data = dst.data()
+        self.assertEqual(expected_result, dst_data)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_delay, "test_delay.xml")
diff --git a/gr-blocks/python/qa_file_metadata.py b/gr-blocks/python/qa_file_metadata.py
index 29ed0d1c8..c7826b1d3 100644
--- a/gr-blocks/python/qa_file_metadata.py
+++ b/gr-blocks/python/qa_file_metadata.py
@@ -28,8 +28,8 @@ import os, math
 
 def sig_source_c(samp_rate, freq, amp, N):
     t = map(lambda x: float(x)/samp_rate, xrange(N))
-    y = map(lambda x: math.cos(2.*math.pi*freq*x) + \
-                1j*math.sin(2.*math.pi*freq*x), t)
+    y = map(lambda x: amp*math.cos(2.*math.pi*freq*x) + \
+                1j*amp*math.sin(2.*math.pi*freq*x), t)
     return y
 
 class test_file_metadata(gr_unittest.TestCase):
diff --git a/gr-blocks/python/qa_packed_to_unpacked.py b/gr-blocks/python/qa_packed_to_unpacked.py
new file mode 100755
index 000000000..98a02e78f
--- /dev/null
+++ b/gr-blocks/python/qa_packed_to_unpacked.py
@@ -0,0 +1,344 @@
+#!/usr/bin/env python
+#
+# Copyright 2005,2007,2010,2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from gnuradio import gr, gr_unittest
+import blocks_swig as blocks
+import random
+
+class test_packing(gr_unittest.TestCase):
+
+    def setUp(self):
+        self.tb = gr.top_block ()
+
+    def tearDown(self):
+        self.tb = None
+
+    def test_001(self):
+        src_data = (0x80,)
+        expected_results = (1,0,0,0,0,0,0,0)
+        src = gr.vector_source_b(src_data, False)
+        op = blocks.packed_to_unpacked_bb(1, gr.GR_MSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_002(self):
+        src_data = (0x80,)
+        expected_results = (0,0,0,0,0,0,0,1)
+        src = gr.vector_source_b(src_data, False)
+        op = blocks.packed_to_unpacked_bb(1, gr.GR_LSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_003(self):
+        src_data = (0x11,)
+        expected_results = (4, 2)
+        src = gr.vector_source_b(src_data, False)
+        op = gr.packed_to_unpacked_bb(3, gr.GR_LSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_004(self):
+        src_data = (0x11,)
+        expected_results = (0, 4)
+        src = gr.vector_source_b(src_data, False)
+        op = gr.packed_to_unpacked_bb(3, gr.GR_MSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_005(self):
+        src_data = (1,0,0,0,0,0,1,0,0,1,0,1,1,0,1,0)
+        expected_results = (0x82, 0x5a)
+        src = gr.vector_source_b(src_data, False)
+        op = gr.unpacked_to_packed_bb(1, gr.GR_MSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_006(self):
+        src_data = (0,1,0,0,0,0,0,1,0,1,0,1,1,0,1,0)
+        expected_results = (0x82, 0x5a)
+        src = gr.vector_source_b(src_data, False)
+        op = gr.unpacked_to_packed_bb(1, gr.GR_LSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_007(self):
+        src_data = (4, 2, 0,0,0)
+        expected_results = (0x11,)
+        src = gr.vector_source_b(src_data, False)
+        op = gr.unpacked_to_packed_bb(3, gr.GR_LSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_008(self):
+        src_data = (0, 4, 2,0,0)
+        expected_results = (0x11,)
+        src = gr.vector_source_b(src_data,False)
+        op = gr.unpacked_to_packed_bb(3, gr.GR_MSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_009(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(202):
+            src_data.append((random.randint(0,255)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+
+        src = gr.vector_source_b(tuple(src_data), False)
+        op1 = gr.packed_to_unpacked_bb(3, gr.GR_MSB_FIRST)
+        op2 = gr.unpacked_to_packed_bb(3, gr.GR_MSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results[0:201], dst.data())
+
+    def test_010(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(56):
+            src_data.append((random.randint(0,255)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+        src = gr.vector_source_b(tuple(src_data), False)
+        op1 = gr.packed_to_unpacked_bb(7, gr.GR_MSB_FIRST)
+        op2 = gr.unpacked_to_packed_bb(7, gr.GR_MSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results[0:201], dst.data())
+
+    def test_011(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(56):
+            src_data.append((random.randint(0,255)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+        src = gr.vector_source_b(tuple(src_data),False)
+        op1 = gr.packed_to_unpacked_bb(7, gr.GR_LSB_FIRST)
+        op2 = gr.unpacked_to_packed_bb(7, gr.GR_LSB_FIRST)
+        dst = gr.vector_sink_b()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results[0:201], dst.data())
+
+
+    # tests on shorts
+    def test_100a(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(100):
+            src_data.append((random.randint(-2**15,2**15-1)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+        src = gr.vector_source_s(tuple(src_data), False)
+        op1 = gr.packed_to_unpacked_ss(1, gr.GR_MSB_FIRST)
+        op2 = gr.unpacked_to_packed_ss(1, gr.GR_MSB_FIRST)
+        dst = gr.vector_sink_s()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_100b(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(100):
+            src_data.append((random.randint(-2**15,2**15-1)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+        src = gr.vector_source_s(tuple(src_data), False)
+        op1 = gr.packed_to_unpacked_ss(1, gr.GR_LSB_FIRST)
+        op2 = gr.unpacked_to_packed_ss(1, gr.GR_LSB_FIRST)
+        dst = gr.vector_sink_s()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_101a(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(100):
+            src_data.append((random.randint(-2**15,2**15-1)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+        src = gr.vector_source_s(tuple(src_data), False)
+        op1 = gr.packed_to_unpacked_ss(8, gr.GR_MSB_FIRST)
+        op2 = gr.unpacked_to_packed_ss(8, gr.GR_MSB_FIRST)
+        dst = gr.vector_sink_s()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_101b(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(100):
+            src_data.append((random.randint(-2**15,2**15-1)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+        src = gr.vector_source_s(tuple(src_data), False)
+        op1 = gr.packed_to_unpacked_ss(8, gr.GR_LSB_FIRST)
+        op2 = gr.unpacked_to_packed_ss(8, gr.GR_LSB_FIRST)
+        dst = gr.vector_sink_s()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+
+    # tests on ints
+    def test_200a(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(100):
+            src_data.append((random.randint(-2**31,2**31-1)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+        src = gr.vector_source_i(tuple(src_data), False)
+        op1 = gr.packed_to_unpacked_ii(1, gr.GR_MSB_FIRST)
+        op2 = gr.unpacked_to_packed_ii(1, gr.GR_MSB_FIRST)
+        dst = gr.vector_sink_i()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_200b(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(100):
+            src_data.append((random.randint(-2**31,2**31-1)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+        src = gr.vector_source_i(tuple(src_data), False)
+        op1 = gr.packed_to_unpacked_ii(1, gr.GR_LSB_FIRST)
+        op2 = gr.unpacked_to_packed_ii(1, gr.GR_LSB_FIRST)
+        dst = gr.vector_sink_i()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_201a(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(100):
+            src_data.append((random.randint(-2**31,2**31-1)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+        src = gr.vector_source_i(tuple(src_data), False)
+        op1 = gr.packed_to_unpacked_ii(8, gr.GR_MSB_FIRST)
+        op2 = gr.unpacked_to_packed_ii(8, gr.GR_MSB_FIRST)
+        dst = gr.vector_sink_i()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+    def test_201b(self):
+        random.seed(0)
+        src_data = []
+        for i in xrange(100):
+            src_data.append((random.randint(-2**31,2**31-1)))
+        src_data = tuple(src_data)
+        expected_results = src_data
+        src = gr.vector_source_i(tuple(src_data), False)
+        op1 = gr.packed_to_unpacked_ii(8, gr.GR_LSB_FIRST)
+        op2 = gr.unpacked_to_packed_ii(8, gr.GR_LSB_FIRST)
+        dst = gr.vector_sink_i()
+
+        self.tb.connect(src, op1, op2)
+        self.tb.connect(op2, dst)
+        self.tb.run()
+
+        self.assertEqual(expected_results, dst.data())
+
+if __name__ == '__main__':
+   gr_unittest.run(test_packing, "test_packing.xml")
+
diff --git a/gr-blocks/python/qa_rms.py b/gr-blocks/python/qa_rms.py
new file mode 100644
index 000000000..f3386668a
--- /dev/null
+++ b/gr-blocks/python/qa_rms.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+#
+# Copyright 2013 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+from gnuradio import gr, gr_unittest
+import blocks_swig as blocks
+import math
+
+def sig_source_f(samp_rate, freq, amp, N):
+    t = map(lambda x: float(x)/samp_rate, xrange(N))
+    y = map(lambda x: amp*math.cos(2.*math.pi*freq*x), t)
+    return y
+
+def sig_source_c(samp_rate, freq, amp, N):
+    t = map(lambda x: float(x)/samp_rate, xrange(N))
+    y = map(lambda x: amp*math.cos(2.*math.pi*freq*x) + \
+                1j*amp*math.sin(2.*math.pi*freq*x), t)
+    return y
+
+class test_rms(gr_unittest.TestCase):
+
+    def setUp(self):
+        self.tb = gr.top_block()
+
+    def tearDown(self):
+        self.tb = None
+
+    def test_ff(self):
+        amp = 2
+        src_data = sig_source_f(1, 0.01, amp, 200)
+        N = 750000
+
+        expected_data = amp/math.sqrt(2.0)
+
+        src = gr.vector_source_f(src_data, True)
+        head = gr.head(gr.sizeof_float, N)
+        op = blocks.rms_ff(0.0001)
+        dst = gr.vector_sink_f()
+
+        self.tb.connect(src, head, op, dst)
+        self.tb.run()
+
+        dst_data = dst.data()
+        self.assertAlmostEqual(dst_data[-1], expected_data, 4)
+
+    def test_cf(self):
+        amp = 4
+        src_data = sig_source_c(1, 0.01, amp, 200)
+        N = 750000
+
+        expected_data = amp
+
+        src = gr.vector_source_c(src_data, True)
+        head = gr.head(gr.sizeof_gr_complex, N)
+        op = blocks.rms_cf(0.0001)
+        dst = gr.vector_sink_f()
+
+        self.tb.connect(src, head, op, dst)
+        self.tb.run()
+
+        dst_data = dst.data()
+        self.assertAlmostEqual(dst_data[-1], expected_data, 4)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_rms, "test_rms.xml")