digital: adding QA for chunks_to_symbols and updating generic demodulator to use this one.

2 files changed, 141 insertions, 1 deletions

diff --git a/gr-digital/python/generic_mod_demod.py b/gr-digital/python/generic_mod_demod.py
index aebf5349e..a6c4f3445 100644
--- a/gr-digital/python/generic_mod_demod.py
+++ b/gr-digital/python/generic_mod_demod.py
@@ -126,7 +126,7 @@ class generic_mod(gr.hier_block2):
         if differential:
             self.diffenc = digital.diff_encoder_bb(arity)
 
-        self.chunks2symbols = gr.chunks_to_symbols_bc(self._constellation.points())
+        self.chunks2symbols = digital.chunks_to_symbols_bc(self._constellation.points())
 
         # pulse shaping filter
         nfilts = 32
diff --git a/gr-digital/python/qa_chunks_to_symbols.py b/gr-digital/python/qa_chunks_to_symbols.py
new file mode 100755
index 000000000..63af10d8f
--- /dev/null
+++ b/gr-digital/python/qa_chunks_to_symbols.py
@@ -0,0 +1,140 @@
+#!/usr/bin/env python
+#
+# Copyright 2012 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 digital_swig as digital
+
+class test_chunks_to_symbols(gr_unittest.TestCase):
+
+    def setUp (self):
+        self.tb = gr.top_block ()
+
+    def tearDown (self):
+        self.tb = None
+
+    def test_bc_001(self):
+        const = [ 1+0j, 0+1j,
+                 -1+0j, 0-1j]
+        src_data = (0, 1, 2, 3, 3, 2, 1, 0)
+        expected_result = (1+0j, 0+1j, -1+0j, 0-1j,
+                           0-1j, -1+0j, 0+1j, 1+0j)
+
+        src = gr.vector_source_b(src_data)
+        op = digital.chunks_to_symbols_bc(const)
+
+        dst = gr.vector_sink_c()
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        actual_result = dst.data()
+        self.assertEqual(expected_result, actual_result)
+
+    def test_bf_002(self):
+        const = [-3, -1, 1, 3]
+        src_data = (0, 1, 2, 3, 3, 2, 1, 0)
+        expected_result = (-3, -1, 1, 3,
+                            3, 1, -1, -3)
+
+        src = gr.vector_source_b(src_data)
+        op = digital.chunks_to_symbols_bf(const)
+
+        dst = gr.vector_sink_f()
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        actual_result = dst.data()
+        self.assertEqual(expected_result, actual_result)
+
+    def test_ic_003(self):
+        const = [ 1+0j, 0+1j,
+                 -1+0j, 0-1j]
+        src_data = (0, 1, 2, 3, 3, 2, 1, 0)
+        expected_result = (1+0j, 0+1j, -1+0j, 0-1j,
+                           0-1j, -1+0j, 0+1j, 1+0j)
+
+        src = gr.vector_source_i(src_data)
+        op = digital.chunks_to_symbols_ic(const)
+
+        dst = gr.vector_sink_c()
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        actual_result = dst.data()
+        self.assertEqual(expected_result, actual_result)
+
+    def test_if_004(self):
+        const = [-3, -1, 1, 3]
+        src_data = (0, 1, 2, 3, 3, 2, 1, 0)
+        expected_result = (-3, -1, 1, 3,
+                            3, 1, -1, -3)
+
+        src = gr.vector_source_i(src_data)
+        op = digital.chunks_to_symbols_if(const)
+
+        dst = gr.vector_sink_f()
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        actual_result = dst.data()
+        self.assertEqual(expected_result, actual_result)
+
+    def test_sc_005(self):
+        const = [ 1+0j, 0+1j,
+                 -1+0j, 0-1j]
+        src_data = (0, 1, 2, 3, 3, 2, 1, 0)
+        expected_result = (1+0j, 0+1j, -1+0j, 0-1j,
+                           0-1j, -1+0j, 0+1j, 1+0j)
+
+        src = gr.vector_source_s(src_data)
+        op = digital.chunks_to_symbols_sc(const)
+
+        dst = gr.vector_sink_c()
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        actual_result = dst.data()
+        self.assertEqual(expected_result, actual_result)
+
+    def test_sf_006(self):
+        const = [-3, -1, 1, 3]
+        src_data = (0, 1, 2, 3, 3, 2, 1, 0)
+        expected_result = (-3, -1, 1, 3,
+                            3, 1, -1, -3)
+
+        src = gr.vector_source_s(src_data)
+        op = digital.chunks_to_symbols_sf(const)
+
+        dst = gr.vector_sink_f()
+        self.tb.connect(src, op)
+        self.tb.connect(op, dst)
+        self.tb.run()
+
+        actual_result = dst.data()
+        self.assertEqual(expected_result, actual_result)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_chunks_to_symbols, "test_chunks_to_symbols.xml")