diff options
| author | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
|---|---|---|
| committer | Marcus Müller <marcus@hostalia.de> | 2018-08-31 23:02:22 +0200 |
| commit | 254fe5e89403d4de1fa6663d09efdf946996aff3 (patch) | |
| tree | 62877d7ac7fdedf6c397c51e22ac6f97eba97ddf /gr-wavelet/python | |
| parent | 896d1c9da31963ecf5b0d90942c2af51ca998a69 (diff) | |
| parent | 5ad935c3a3dd46ce2860b13e2b774e4841784616 (diff) | |
Merge remote-tracking branch 'origin/next' into merge_next
Diffstat (limited to 'gr-wavelet/python')
| -rw-r--r-- | gr-wavelet/python/wavelet/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-wavelet/python/wavelet/__init__.py | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | gr-wavelet/python/wavelet/qa_classify.py | 18 |
3 files changed, 14 insertions, 12 deletions
diff --git a/gr-wavelet/python/wavelet/CMakeLists.txt b/gr-wavelet/python/wavelet/CMakeLists.txt index cc406f8edd..09dea8e017 100644 --- a/gr-wavelet/python/wavelet/CMakeLists.txt +++ b/gr-wavelet/python/wavelet/CMakeLists.txt @@ -24,7 +24,6 @@ GR_PYTHON_INSTALL( FILES __init__.py DESTINATION ${GR_PYTHON_DIR}/gnuradio/wavelet - COMPONENT "wavelet_python" ) ######################################################################## @@ -48,6 +47,6 @@ if(ENABLE_TESTING) file(GLOB py_qa_test_files "qa_*.py") foreach(py_qa_test_file ${py_qa_test_files}) get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE) - GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} ${PYTHON_DASH_B} ${py_qa_test_file}) + GR_ADD_TEST(${py_qa_test_name} ${QA_PYTHON_EXECUTABLE} -B ${py_qa_test_file}) endforeach(py_qa_test_file) endif(ENABLE_TESTING) diff --git a/gr-wavelet/python/wavelet/__init__.py b/gr-wavelet/python/wavelet/__init__.py index 7f3d9afa53..8fbab42f59 100644 --- a/gr-wavelet/python/wavelet/__init__.py +++ b/gr-wavelet/python/wavelet/__init__.py @@ -22,11 +22,12 @@ ''' Processing blocks for wavelet transforms. ''' +from __future__ import unicode_literals import os try: - from wavelet_swig import * + from .wavelet_swig import * except ImportError: dirname, filename = os.path.split(os.path.abspath(__file__)) __path__.append(os.path.join(dirname, "..", "..", "swig")) - from wavelet_swig import * + from .wavelet_swig import * diff --git a/gr-wavelet/python/wavelet/qa_classify.py b/gr-wavelet/python/wavelet/qa_classify.py index 4752620f4d..7f562c628e 100755..100644 --- a/gr-wavelet/python/wavelet/qa_classify.py +++ b/gr-wavelet/python/wavelet/qa_classify.py @@ -20,6 +20,8 @@ # Boston, MA 02110-1301, USA. # +from __future__ import division + import numpy from gnuradio import gr, gr_unittest, wavelet, analog, blocks import copy @@ -79,14 +81,14 @@ class test_classify(gr_unittest.TestCase): def test_002_(self): src_data = numpy.array([-1.0, - -1.0/2.0, - -1.0/3.0, - -1.0/4.0, - -1.0/5.0]) + -1.0 / 2.0, + -1.0 / 3.0, + -1.0 / 4.0, + -1.0 / 5.0]) trg_data = copy.deepcopy(src_data) src = blocks.vector_source_f(src_data, False, len(src_data)) - st = blocks.stretch_ff(-1.0/5.0, len(src_data)) + st = blocks.stretch_ff(-1.0 / 5.0, len(src_data)) dst = blocks.vector_sink_f(len(src_data)) self.tb.connect(src, st) self.tb.connect(st, dst) @@ -155,11 +157,11 @@ class test_classify(gr_unittest.TestCase): dwav = numpy.array(src_data) wvps = numpy.zeros(3) # wavelet power spectrum - scl = 1.0/sqr(dwav[0]) + scl = 1.0 / sqr(dwav[0]) k = 1 for e in range(len(wvps)): - wvps[e] = scl*sqr(dwav[k:k+(01<<e)]).sum() - k += 01<<e + wvps[e] = scl*sqr(dwav[k:k+(0o1<<e)]).sum() + k += 0o1<<e src = blocks.vector_source_f(src_data, False, len(src_data)) kon = wavelet.wvps_ff(len(src_data)) |