diff options
| author | Josh Morman <jmorman@perspectalabs.com> | 2021-03-25 14:18:04 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-04-21 14:02:57 -0400 |
| commit | dd8c9f59f725c4023082d7298dd0509b0e21a324 (patch) | |
| tree | f1b390d3c666c8e6c9d53b98a96f084cf61719ce | |
| parent | dc4399c76b8deee7ed4f7558073711023b52332b (diff) | |
filter: remove deprecated mmse_interpolator
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
19 files changed, 2 insertions, 660 deletions
diff --git a/gr-channels/lib/sro_model_impl.h b/gr-channels/lib/sro_model_impl.h index aa4313dd11..596054d0ed 100644 --- a/gr-channels/lib/sro_model_impl.h +++ b/gr-channels/lib/sro_model_impl.h @@ -14,7 +14,6 @@ #include <gnuradio/analog/fastnoise_source.h> #include <gnuradio/channels/sro_model.h> #include <gnuradio/filter/mmse_fir_interpolator_cc.h> -#include <gnuradio/filter/mmse_interpolator_cc.h> namespace gr { namespace channels { diff --git a/gr-filter/grc/CMakeLists.txt b/gr-filter/grc/CMakeLists.txt index 61ef4f11c4..285a9e974a 100644 --- a/gr-filter/grc/CMakeLists.txt +++ b/gr-filter/grc/CMakeLists.txt @@ -15,7 +15,6 @@ install(FILES filter_filter_delay_fc.block.yml filter_filterbank_vcvcf.block.yml filter_ival_decimator.block.yml - filter_mmse_interpolator_xx.block.yml filter_mmse_resampler_xx.block.yml filter_freq_xlating_fft_filter_ccc.block.yml filter_freq_xlating_fir_filter_xxx.block.yml diff --git a/gr-filter/grc/filter.tree.yml b/gr-filter/grc/filter.tree.yml index a297ba63f7..98395a6384 100644 --- a/gr-filter/grc/filter.tree.yml +++ b/gr-filter/grc/filter.tree.yml @@ -22,7 +22,6 @@ - single_pole_iir_filter_xx - Resamplers: - mmse_resampler_xx - - mmse_interpolator_xx - pfb_arb_resampler_xxx - rational_resampler_xxx - ival_decimator diff --git a/gr-filter/grc/filter_mmse_interpolator_xx.block.yml b/gr-filter/grc/filter_mmse_interpolator_xx.block.yml deleted file mode 100644 index 342ecfcbcc..0000000000 --- a/gr-filter/grc/filter_mmse_interpolator_xx.block.yml +++ /dev/null @@ -1,45 +0,0 @@ -id: mmse_interpolator_xx -label: Fractional Interpolator -flags: [ python, cpp ] - -parameters: -- id: type - label: Type - dtype: enum - options: [complex, float] - option_attributes: - fcn: [cc, ff] - hide: part -- id: phase_shift - label: Phase Shift - dtype: real -- id: interp_ratio - label: Interpolation Ratio - dtype: real - -inputs: -- domain: stream - dtype: ${ type } - -outputs: -- domain: stream - dtype: ${ type } - -templates: - imports: from gnuradio import filter - make: filter.mmse_interpolator_${type.fcn}(${phase_shift}, ${interp_ratio}) - callbacks: - - set_interp_ratio(${interp_ratio}) - -cpp_templates: - includes: ['#include <gnuradio/filter/mmse_interpolator_${type.fcn}.h>'] - declarations: 'filter::mmse_interpolator_${type.fcn}::sptr ${id};' - make: |- - this->${id} = filter::mmse_interpolator_${type.fcn}::make( - ${phase_shift}, - ${interp_ratio}); - link: ['gnuradio-filter'] - callbacks: - - set_interp_ratio(${interp_ratio}) - -file_format: 1 diff --git a/gr-filter/include/gnuradio/filter/CMakeLists.txt b/gr-filter/include/gnuradio/filter/CMakeLists.txt index 5e24dbffa4..4dbcdbfa74 100644 --- a/gr-filter/include/gnuradio/filter/CMakeLists.txt +++ b/gr-filter/include/gnuradio/filter/CMakeLists.txt @@ -35,8 +35,6 @@ install(FILES fft_filter_ccf.h fft_filter_fff.h freq_xlating_fir_filter.h - mmse_interpolator_cc.h - mmse_interpolator_ff.h mmse_resampler_cc.h mmse_resampler_ff.h hilbert_fc.h diff --git a/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h b/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h deleted file mode 100644 index bf11a0f87e..0000000000 --- a/gr-filter/include/gnuradio/filter/mmse_interpolator_cc.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2007,2012 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#ifndef INCLUDED_MMSE_INTERPOLATOR_CC_H -#define INCLUDED_MMSE_INTERPOLATOR_CC_H - -#include <gnuradio/block.h> -#include <gnuradio/filter/api.h> - -namespace gr { -namespace filter { - -/*! - * \brief Interpolating MMSE filter with complex input, complex output - * \ingroup resamplers_blk - */ -class FILTER_API mmse_interpolator_cc : virtual public block -{ -public: - // gr::filter::mmse_interpolator_cc::sptr - typedef std::shared_ptr<mmse_interpolator_cc> sptr; - - /*! - * \brief Build the interpolating MMSE filter (complex input, complex output) - * - * \param phase_shift The phase shift of the output signal to the input - * \param interp_ratio The interpolation ratio = input_rate / output_rate. - */ - static sptr make(float phase_shift, float interp_ratio); - - virtual float mu() const = 0; - virtual float interp_ratio() const = 0; - virtual void set_mu(float mu) = 0; - virtual void set_interp_ratio(float interp_ratio) = 0; -}; - -} /* namespace filter */ -} /* namespace gr */ - -#endif /* INCLUDED_MMSE_INTERPOLATOR_FF_H */ diff --git a/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h b/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h deleted file mode 100644 index 24589c9a4f..0000000000 --- a/gr-filter/include/gnuradio/filter/mmse_interpolator_ff.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2007,2012 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#ifndef INCLUDED_MMSE_INTERPOLATOR_FF_H -#define INCLUDED_MMSE_INTERPOLATOR_FF_H - -#include <gnuradio/block.h> -#include <gnuradio/filter/api.h> - -namespace gr { -namespace filter { - -/*! - * \brief Interpolating MMSE filter with float input, float output - * \ingroup resamplers_blk - */ -class FILTER_API mmse_interpolator_ff : virtual public block -{ -public: - // gr::filter::mmse_interpolator_ff::sptr - typedef std::shared_ptr<mmse_interpolator_ff> sptr; - - /*! - * \brief Build the interpolating MMSE filter (float input, float output) - * - * \param phase_shift The phase shift of the output signal to the input - * \param interp_ratio The interpolation ratio = input_rate / output_rate. - */ - static sptr make(float phase_shift, float interp_ratio); - - virtual float mu() const = 0; - virtual float interp_ratio() const = 0; - virtual void set_mu(float mu) = 0; - virtual void set_interp_ratio(float interp_ratio) = 0; -}; - -} /* namespace filter */ -} /* namespace gr */ - -#endif /* INCLUDED_MMSE_INTERPOLATOR_FF_H */ diff --git a/gr-filter/lib/CMakeLists.txt b/gr-filter/lib/CMakeLists.txt index 1e3189b7af..a99ab975d9 100644 --- a/gr-filter/lib/CMakeLists.txt +++ b/gr-filter/lib/CMakeLists.txt @@ -32,8 +32,6 @@ add_library(gnuradio-filter fft_filter_ccc_impl.cc fft_filter_ccf_impl.cc fft_filter_fff_impl.cc - mmse_interpolator_cc_impl.cc - mmse_interpolator_ff_impl.cc mmse_resampler_cc_impl.cc mmse_resampler_ff_impl.cc hilbert_fc_impl.cc diff --git a/gr-filter/lib/mmse_interpolator_cc_impl.cc b/gr-filter/lib/mmse_interpolator_cc_impl.cc deleted file mode 100644 index 02eb6e38ff..0000000000 --- a/gr-filter/lib/mmse_interpolator_cc_impl.cc +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2007,2010,2012 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "mmse_interpolator_cc_impl.h" -#include <gnuradio/io_signature.h> -#include <stdexcept> - -namespace gr { -namespace filter { - -mmse_interpolator_cc::sptr mmse_interpolator_cc::make(float phase_shift, - float interp_ratio) -{ - return gnuradio::make_block_sptr<mmse_interpolator_cc_impl>(phase_shift, - interp_ratio); -} - -mmse_interpolator_cc_impl::mmse_interpolator_cc_impl(float phase_shift, - float interp_ratio) - : block("mmse_interpolator_cc", - io_signature::make(1, 1, sizeof(gr_complex)), - io_signature::make(1, 1, sizeof(gr_complex))), - d_mu(phase_shift), - d_mu_inc(interp_ratio) -{ - GR_LOG_WARN(d_logger, - "mmse_interpolator is deprecated. Please use mmse_resampler instead."); - - if (interp_ratio <= 0) - throw std::out_of_range("interpolation ratio must be > 0"); - if (phase_shift < 0 || phase_shift > 1) - throw std::out_of_range("phase shift ratio must be > 0 and < 1"); - - set_inverse_relative_rate(d_mu_inc); -} - -void mmse_interpolator_cc_impl::forecast(int noutput_items, - gr_vector_int& ninput_items_required) -{ - unsigned ninputs = ninput_items_required.size(); - for (unsigned i = 0; i < ninputs; i++) { - ninput_items_required[i] = - (int)ceil((noutput_items * d_mu_inc) + d_interp.ntaps()); - } -} - -int mmse_interpolator_cc_impl::general_work(int noutput_items, - gr_vector_int& ninput_items, - gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items) -{ - const gr_complex* in = (const gr_complex*)input_items[0]; - gr_complex* out = (gr_complex*)output_items[0]; - - int ii = 0; // input index - int oo = 0; // output index - - while (oo < noutput_items) { - out[oo++] = d_interp.interpolate(&in[ii], static_cast<float>(d_mu)); - - double s = d_mu + d_mu_inc; - double f = floor(s); - int incr = (int)f; - d_mu = s - f; - ii += incr; - } - - consume_each(ii); - - return noutput_items; -} - -float mmse_interpolator_cc_impl::mu() const { return static_cast<float>(d_mu); } - -float mmse_interpolator_cc_impl::interp_ratio() const -{ - return static_cast<float>(d_mu_inc); -} - -void mmse_interpolator_cc_impl::set_mu(float mu) { d_mu = static_cast<double>(mu); } - -void mmse_interpolator_cc_impl::set_interp_ratio(float interp_ratio) -{ - d_mu_inc = static_cast<double>(interp_ratio); -} - -} /* namespace filter */ -} /* namespace gr */ diff --git a/gr-filter/lib/mmse_interpolator_cc_impl.h b/gr-filter/lib/mmse_interpolator_cc_impl.h deleted file mode 100644 index c4d5550228..0000000000 --- a/gr-filter/lib/mmse_interpolator_cc_impl.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2007,2012 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#ifndef INCLUDED_MMSE_INTERPOLATOR_CC_IMPL_H -#define INCLUDED_MMSE_INTERPOLATOR_CC_IMPL_H - -#include <gnuradio/filter/mmse_fir_interpolator_cc.h> -#include <gnuradio/filter/mmse_interpolator_cc.h> - -namespace gr { -namespace filter { - -class FILTER_API mmse_interpolator_cc_impl : public mmse_interpolator_cc -{ -private: - double d_mu; - double d_mu_inc; - mmse_fir_interpolator_cc d_interp; - -public: - mmse_interpolator_cc_impl(float phase_shift, float interp_ratio); - - void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; - int general_work(int noutput_items, - gr_vector_int& ninput_items, - gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items) override; - - float mu() const override; - float interp_ratio() const override; - void set_mu(float mu) override; - void set_interp_ratio(float interp_ratio) override; -}; - -} /* namespace filter */ -} /* namespace gr */ - -#endif /* INCLUDED_MMSE_INTERPOLATOR_CC_IMPL_H */ diff --git a/gr-filter/lib/mmse_interpolator_ff_impl.cc b/gr-filter/lib/mmse_interpolator_ff_impl.cc deleted file mode 100644 index 6b3ec48de4..0000000000 --- a/gr-filter/lib/mmse_interpolator_ff_impl.cc +++ /dev/null @@ -1,99 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2007,2010 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "mmse_interpolator_ff_impl.h" -#include <gnuradio/io_signature.h> -#include <stdexcept> - -namespace gr { -namespace filter { - -mmse_interpolator_ff::sptr mmse_interpolator_ff::make(float phase_shift, - float interp_ratio) -{ - return gnuradio::make_block_sptr<mmse_interpolator_ff_impl>(phase_shift, - interp_ratio); -} - -mmse_interpolator_ff_impl::mmse_interpolator_ff_impl(float phase_shift, - float interp_ratio) - : block("mmse_interpolator_ff", - io_signature::make(1, 1, sizeof(float)), - io_signature::make(1, 1, sizeof(float))), - d_mu(phase_shift), - d_mu_inc(interp_ratio) -{ - GR_LOG_WARN(d_logger, - "mmse_interpolator is deprecated. Please use mmse_resampler instead."); - - if (interp_ratio <= 0) - throw std::out_of_range("interpolation ratio must be > 0"); - if (phase_shift < 0 || phase_shift > 1) - throw std::out_of_range("phase shift ratio must be > 0 and < 1"); - - set_inverse_relative_rate(d_mu_inc); -} - -void mmse_interpolator_ff_impl::forecast(int noutput_items, - gr_vector_int& ninput_items_required) -{ - unsigned ninputs = ninput_items_required.size(); - for (unsigned i = 0; i < ninputs; i++) { - ninput_items_required[i] = - (int)ceil((noutput_items * d_mu_inc) + d_interp.ntaps()); - } -} - -int mmse_interpolator_ff_impl::general_work(int noutput_items, - gr_vector_int& ninput_items, - gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items) -{ - const float* in = (const float*)input_items[0]; - float* out = (float*)output_items[0]; - - int ii = 0; // input index - int oo = 0; // output index - - while (oo < noutput_items) { - out[oo++] = d_interp.interpolate(&in[ii], static_cast<float>(d_mu)); - - double s = d_mu + d_mu_inc; - double f = floor(s); - int incr = (int)f; - d_mu = s - f; - ii += incr; - } - - consume_each(ii); - - return noutput_items; -} - -float mmse_interpolator_ff_impl::mu() const { return static_cast<float>(d_mu); } - -float mmse_interpolator_ff_impl::interp_ratio() const -{ - return static_cast<float>(d_mu_inc); -} - -void mmse_interpolator_ff_impl::set_mu(float mu) { d_mu = static_cast<double>(mu); } - -void mmse_interpolator_ff_impl::set_interp_ratio(float interp_ratio) -{ - d_mu_inc = static_cast<double>(interp_ratio); -} - -} /* namespace filter */ -} /* namespace gr */ diff --git a/gr-filter/lib/mmse_interpolator_ff_impl.h b/gr-filter/lib/mmse_interpolator_ff_impl.h deleted file mode 100644 index 9ba2d3816b..0000000000 --- a/gr-filter/lib/mmse_interpolator_ff_impl.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -*- c++ -*- */ -/* - * Copyright 2004,2007,2012 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -#ifndef INCLUDED_MMSE_INTERPOLATOR_FF_IMPL_H -#define INCLUDED_MMSE_INTERPOLATOR_FF_IMPL_H - -#include <gnuradio/filter/mmse_fir_interpolator_ff.h> -#include <gnuradio/filter/mmse_interpolator_ff.h> - -namespace gr { -namespace filter { - -class FILTER_API mmse_interpolator_ff_impl : public mmse_interpolator_ff -{ -private: - double d_mu; - double d_mu_inc; - mmse_fir_interpolator_ff d_interp; - -public: - mmse_interpolator_ff_impl(float phase_shift, float interp_ratio); - - void forecast(int noutput_items, gr_vector_int& ninput_items_required) override; - int general_work(int noutput_items, - gr_vector_int& ninput_items, - gr_vector_const_void_star& input_items, - gr_vector_void_star& output_items) override; - - float mu() const override; - float interp_ratio() const override; - void set_mu(float mu) override; - void set_interp_ratio(float interp_ratio) override; -}; - -} /* namespace filter */ -} /* namespace gr */ - -#endif /* INCLUDED_MMSE_INTERPOLATOR_FF_IMPL_H */ diff --git a/gr-filter/python/filter/bindings/CMakeLists.txt b/gr-filter/python/filter/bindings/CMakeLists.txt index 1757159ba3..613ada55d5 100644 --- a/gr-filter/python/filter/bindings/CMakeLists.txt +++ b/gr-filter/python/filter/bindings/CMakeLists.txt @@ -32,8 +32,6 @@ list(APPEND filter_python_files mmse_fir_interpolator_ff_python.cc mmse_interp_differentiator_cc_python.cc mmse_interp_differentiator_ff_python.cc - mmse_interpolator_cc_python.cc - mmse_interpolator_ff_python.cc mmse_resampler_cc_python.cc mmse_resampler_ff_python.cc pfb_arb_resampler_python.cc diff --git a/gr-filter/python/filter/bindings/docstrings/mmse_interpolator_cc_pydoc_template.h b/gr-filter/python/filter/bindings/docstrings/mmse_interpolator_cc_pydoc_template.h deleted file mode 100644 index f04cc27d85..0000000000 --- a/gr-filter/python/filter/bindings/docstrings/mmse_interpolator_cc_pydoc_template.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2020 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ -#include "pydoc_macros.h" -#define D(...) DOC(gr, filter, __VA_ARGS__) -/* - This file contains placeholders for docstrings for the Python bindings. - Do not edit! These were automatically extracted during the binding process - and will be overwritten during the build process - */ - - -static const char* __doc_gr_filter_mmse_interpolator_cc = R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_cc_mmse_interpolator_cc_0 = - R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_cc_mmse_interpolator_cc_1 = - R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_cc_make = R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_cc_mu = R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_cc_interp_ratio = R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_cc_set_mu = R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_cc_set_interp_ratio = R"doc()doc"; diff --git a/gr-filter/python/filter/bindings/docstrings/mmse_interpolator_ff_pydoc_template.h b/gr-filter/python/filter/bindings/docstrings/mmse_interpolator_ff_pydoc_template.h deleted file mode 100644 index b0252d4d0b..0000000000 --- a/gr-filter/python/filter/bindings/docstrings/mmse_interpolator_ff_pydoc_template.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright 2020 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ -#include "pydoc_macros.h" -#define D(...) DOC(gr, filter, __VA_ARGS__) -/* - This file contains placeholders for docstrings for the Python bindings. - Do not edit! These were automatically extracted during the binding process - and will be overwritten during the build process - */ - - -static const char* __doc_gr_filter_mmse_interpolator_ff = R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_ff_mmse_interpolator_ff_0 = - R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_ff_mmse_interpolator_ff_1 = - R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_ff_make = R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_ff_mu = R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_ff_interp_ratio = R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_ff_set_mu = R"doc()doc"; - - -static const char* __doc_gr_filter_mmse_interpolator_ff_set_interp_ratio = R"doc()doc"; diff --git a/gr-filter/python/filter/bindings/mmse_interpolator_cc_python.cc b/gr-filter/python/filter/bindings/mmse_interpolator_cc_python.cc deleted file mode 100644 index 67be567442..0000000000 --- a/gr-filter/python/filter/bindings/mmse_interpolator_cc_python.cc +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2020 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -/***********************************************************************************/ -/* This file is automatically generated using bindtool and can be manually edited */ -/* The following lines can be configured to regenerate this file during cmake */ -/* If manual edits are made, the following tags should be modified accordingly. */ -/* BINDTOOL_GEN_AUTOMATIC(0) */ -/* BINDTOOL_USE_PYGCCXML(0) */ -/* BINDTOOL_HEADER_FILE(mmse_interpolator_cc.h) */ -/* BINDTOOL_HEADER_FILE_HASH(af9f8d023037ad86c6a8c1b66248f9ca) */ -/***********************************************************************************/ - -#include <pybind11/complex.h> -#include <pybind11/pybind11.h> -#include <pybind11/stl.h> - -namespace py = pybind11; - -#include <gnuradio/filter/mmse_interpolator_cc.h> -// pydoc.h is automatically generated in the build directory -#include <mmse_interpolator_cc_pydoc.h> - -void bind_mmse_interpolator_cc(py::module& m) -{ - - using mmse_interpolator_cc = ::gr::filter::mmse_interpolator_cc; - - - py::class_<mmse_interpolator_cc, - gr::block, - gr::basic_block, - std::shared_ptr<mmse_interpolator_cc>>( - m, "mmse_interpolator_cc", D(mmse_interpolator_cc)) - - .def(py::init(&mmse_interpolator_cc::make), - py::arg("phase_shift"), - py::arg("interp_ratio"), - D(mmse_interpolator_cc, make)) - - - .def("mu", &mmse_interpolator_cc::mu, D(mmse_interpolator_cc, mu)) - - - .def("interp_ratio", - &mmse_interpolator_cc::interp_ratio, - D(mmse_interpolator_cc, interp_ratio)) - - - .def("set_mu", - &mmse_interpolator_cc::set_mu, - py::arg("mu"), - D(mmse_interpolator_cc, set_mu)) - - - .def("set_interp_ratio", - &mmse_interpolator_cc::set_interp_ratio, - py::arg("interp_ratio"), - D(mmse_interpolator_cc, set_interp_ratio)) - - ; -} diff --git a/gr-filter/python/filter/bindings/mmse_interpolator_ff_python.cc b/gr-filter/python/filter/bindings/mmse_interpolator_ff_python.cc deleted file mode 100644 index 1d84363c51..0000000000 --- a/gr-filter/python/filter/bindings/mmse_interpolator_ff_python.cc +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright 2020 Free Software Foundation, Inc. - * - * This file is part of GNU Radio - * - * SPDX-License-Identifier: GPL-3.0-or-later - * - */ - -/***********************************************************************************/ -/* This file is automatically generated using bindtool and can be manually edited */ -/* The following lines can be configured to regenerate this file during cmake */ -/* If manual edits are made, the following tags should be modified accordingly. */ -/* BINDTOOL_GEN_AUTOMATIC(0) */ -/* BINDTOOL_USE_PYGCCXML(0) */ -/* BINDTOOL_HEADER_FILE(mmse_interpolator_ff.h) */ -/* BINDTOOL_HEADER_FILE_HASH(c4ce5b60846c7fcf1b1961ba6a5d16d3) */ -/***********************************************************************************/ - -#include <pybind11/complex.h> -#include <pybind11/pybind11.h> -#include <pybind11/stl.h> - -namespace py = pybind11; - -#include <gnuradio/filter/mmse_interpolator_ff.h> -// pydoc.h is automatically generated in the build directory -#include <mmse_interpolator_ff_pydoc.h> - -void bind_mmse_interpolator_ff(py::module& m) -{ - - using mmse_interpolator_ff = ::gr::filter::mmse_interpolator_ff; - - - py::class_<mmse_interpolator_ff, - gr::block, - gr::basic_block, - std::shared_ptr<mmse_interpolator_ff>>( - m, "mmse_interpolator_ff", D(mmse_interpolator_ff)) - - .def(py::init(&mmse_interpolator_ff::make), - py::arg("phase_shift"), - py::arg("interp_ratio"), - D(mmse_interpolator_ff, make)) - - - .def("mu", &mmse_interpolator_ff::mu, D(mmse_interpolator_ff, mu)) - - - .def("interp_ratio", - &mmse_interpolator_ff::interp_ratio, - D(mmse_interpolator_ff, interp_ratio)) - - - .def("set_mu", - &mmse_interpolator_ff::set_mu, - py::arg("mu"), - D(mmse_interpolator_ff, set_mu)) - - - .def("set_interp_ratio", - &mmse_interpolator_ff::set_interp_ratio, - py::arg("interp_ratio"), - D(mmse_interpolator_ff, set_interp_ratio)) - - ; -} diff --git a/gr-filter/python/filter/bindings/python_bindings.cc b/gr-filter/python/filter/bindings/python_bindings.cc index 8147847e4a..cd29a1cb1b 100644 --- a/gr-filter/python/filter/bindings/python_bindings.cc +++ b/gr-filter/python/filter/bindings/python_bindings.cc @@ -44,8 +44,6 @@ void bind_mmse_fir_interpolator_cc(py::module&); void bind_mmse_fir_interpolator_ff(py::module&); void bind_mmse_interp_differentiator_cc(py::module&); void bind_mmse_interp_differentiator_ff(py::module&); -void bind_mmse_interpolator_cc(py::module&); -void bind_mmse_interpolator_ff(py::module&); void bind_mmse_resampler_cc(py::module&); void bind_mmse_resampler_ff(py::module&); void bind_pfb_arb_resampler(py::module&); @@ -111,8 +109,6 @@ PYBIND11_MODULE(filter_python, m) bind_mmse_fir_interpolator_ff(m); bind_mmse_interp_differentiator_cc(m); bind_mmse_interp_differentiator_ff(m); - bind_mmse_interpolator_cc(m); - bind_mmse_interpolator_ff(m); bind_mmse_resampler_cc(m); bind_mmse_resampler_ff(m); bind_pfb_arb_resampler(m); diff --git a/gr-filter/python/filter/qa_fractional_interpolator.py b/gr-filter/python/filter/qa_fractional_interpolator.py index f8457a0e5d..dddd8a3fff 100644 --- a/gr-filter/python/filter/qa_fractional_interpolator.py +++ b/gr-filter/python/filter/qa_fractional_interpolator.py @@ -43,7 +43,7 @@ class test_mmse_resampler(gr_unittest.TestCase): freq = 10 data = sig_source_f(fs, freq, 1, N) signal = blocks.vector_source_f(data) - op = filter.mmse_interpolator_ff(0, rrate) + op = filter.mmse_resampler_ff(0, rrate) snk = blocks.vector_sink_f() self.tb.connect(signal, op, snk) @@ -69,7 +69,7 @@ class test_mmse_resampler(gr_unittest.TestCase): freq = 10 data = sig_source_c(fs, freq, 1, N) signal = blocks.vector_source_c(data) - op = filter.mmse_interpolator_cc(0.0, rrate) + op = filter.mmse_resampler_cc(0.0, rrate) snk = blocks.vector_sink_c() self.tb.connect(signal, op, snk) |