diff options
| author | Maximilian Stiefel <stiefel.maximilian@online.de> | 2020-01-07 17:03:59 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2020-01-08 10:19:44 -0800 |
| commit | 445aa4792dcdf4a8bf14600e6d931451e36f0eaa (patch) | |
| tree | 8a011d807a5f30fdf8cac945b5ba294a0937d5af /gr-digital/python | |
| parent | 90c49ef6d4d215f1db01f591d682947fea727655 (diff) | |
digital: ofdm: Allow multiple CP lengths for cyclic prefixer
This allows to specify multiple CP lengths that can be used one
after another, for example for LTE modulators.
- Improve sanity checking
- Maintains old API
Diffstat (limited to 'gr-digital/python')
| -rw-r--r-- | gr-digital/python/digital/qa_ofdm_cyclic_prefixer.py | 95 |
1 files changed, 82 insertions, 13 deletions
diff --git a/gr-digital/python/digital/qa_ofdm_cyclic_prefixer.py b/gr-digital/python/digital/qa_ofdm_cyclic_prefixer.py index fc486fa6a2..665236cd03 100644 --- a/gr-digital/python/digital/qa_ofdm_cyclic_prefixer.py +++ b/gr-digital/python/digital/qa_ofdm_cyclic_prefixer.py @@ -1,26 +1,27 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 +# +# Copyright 2007-2018 Free Software Foundation, Inc. # -# Copyright 2007,2010,2011,2013,2014 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 __future__ import division +# +""" +Unit tests for OFDM cyclic prefixer. +""" from gnuradio import gr, gr_unittest, digital, blocks import pmt @@ -51,7 +52,7 @@ class test_ofdm_cyclic_prefixer (gr_unittest.TestCase): fft_len = 8 cp_len = 2 rolloff = 2 - expected_result = (7.0 / 2, 8, 1, 2, 3, 4, 5, 6, 7, 8, # 1.0/2 + expected_result = (7.0 / 2, 8, 1, 2, 3, 4, 5, 6, 7, 8, # 1.0/2 7.0 / 2+1.0 / 2, 8, 1, 2, 3, 4, 5, 6, 7, 8) src = blocks.vector_source_c(list(range(1, fft_len+1)) * 2, False, fft_len) cp = digital.ofdm_cyclic_prefixer(fft_len, fft_len + cp_len, rolloff) @@ -65,7 +66,7 @@ class test_ofdm_cyclic_prefixer (gr_unittest.TestCase): fft_len = 8 cp_len = 2 tag_name = "ts_last" - expected_result = (7.0 / 2, 8, 1, 2, 3, 4, 5, 6, 7, 8, # 1.0/2 + expected_result = (7.0 / 2, 8, 1, 2, 3, 4, 5, 6, 7, 8, # 1.0/2 7.0 / 2+1.0 / 2, 8, 1, 2, 3, 4, 5, 6, 7, 8, 1.0 / 2) tag2 = gr.tag_t() tag2.offset = 1 @@ -84,7 +85,75 @@ class test_ofdm_cyclic_prefixer (gr_unittest.TestCase): ] self.assertEqual(tags, expected_tags) + def test_wo_tags_no_rolloff_multiple_cps(self): + "Two CP lengths, no rolloff and no tags." + fft_len = 8 + cp_lengths = (3, 2, 2) + expected_result = (5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7, # 1 + 6, 7, 0, 1, 2, 3, 4, 5, 6, 7, # 2 + 6, 7, 0, 1, 2, 3, 4, 5, 6, 7, # 3 + 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7, # 4 + 6, 7, 0, 1, 2, 3, 4, 5, 6, 7, # 5 + ) + src = blocks.vector_source_c(list(range(fft_len))*5, False, fft_len) + cp = digital.ofdm_cyclic_prefixer(fft_len, cp_lengths) + sink = blocks.vector_sink_c() + self.tb.connect(src, cp, sink) + self.tb.run() + self.assertEqual(sink.data(), expected_result) -if __name__ == '__main__': - gr_unittest.run(test_ofdm_cyclic_prefixer, "test_ofdm_cyclic_prefixer.xml") + def test_wo_tags_2s_rolloff_multiple_cps(self): + "Two CP lengths, 2-sample rolloff and no tags." + fft_len = 8 + cp_lengths = (3, 2, 2) + rolloff = 2 + expected_result = (6.0/2,7,8,1,2,3,4,5,6,7,8, #1 + 7.0/2 + 1.0/2,8,1,2,3,4,5,6,7,8, #2 + 7.0/2 + 1.0/2,8,1,2,3,4,5,6,7,8, #3 + 6.0/2 + 1.0/2,7,8,1,2,3,4,5,6,7,8,#4 + 7.0/2 + 1.0/2,8,1,2,3,4,5,6,7,8 #5 + ) + src = blocks.vector_source_c(list(range(1, fft_len+1))*5, False, fft_len) + cp = digital.ofdm_cyclic_prefixer(fft_len, cp_lengths, rolloff) + sink = blocks.vector_sink_c() + self.tb.connect(src, cp, sink) + self.tb.run() + self.assertEqual(sink.data(), expected_result) + + def test_with_tags_2s_rolloff_multiples_cps(self): + "Two CP lengths, 2-sample rolloff and tags." + fft_len = 8 + cp_lengths = (3, 2, 2) + rolloff = 2 + tag_name = "ts_last" + expected_result = ( + 6.0/2, 7, 8, 1, 2, 3, 4, 5, 6, 7, 8, #1 + 7.0/2+1.0/2, 8, 1, 2, 3, 4, 5, 6, 7, 8, 1.0/2 #Last tail + ) + # First test tag + tag0 = gr.tag_t() + tag0.offset = 0 + tag0.key = pmt.string_to_symbol("first_tag") + tag0.value = pmt.from_long(24) + # Second test tag + tag1 = gr.tag_t() + tag1.offset = 1 + tag1.key = pmt.string_to_symbol("second_tag") + tag1.value = pmt.from_long(42) + src = blocks.vector_source_c(list(range(1, fft_len+1)) * 2, False, fft_len, (tag0, tag1)) + cp = digital.ofdm_cyclic_prefixer(fft_len, cp_lengths, rolloff, tag_name) + sink = blocks.tsb_vector_sink_c(tsb_key=tag_name) + self.tb.connect(src, blocks.stream_to_tagged_stream(gr.sizeof_gr_complex, fft_len, 2, tag_name), cp, sink) + self.tb.run() + self.assertEqual(sink.data()[0], expected_result) + tags = [gr.tag_to_python(x) for x in sink.tags()] + tags = sorted([(x.offset, x.key, x.value) for x in tags]) + expected_tags = [ + (0, "first_tag", 24), + (fft_len + cp_lengths[0], "second_tag", 42) + ] + self.assertEqual(tags, expected_tags) + +if __name__ == '__main__': + gr_unittest.run(test_ofdm_cyclic_prefixer) |