diff options
| -rw-r--r-- | gnuradio-core/src/lib/filter/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/filter.i | 4 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.cc (renamed from gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.cc) | 40 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.h (renamed from gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.h) | 26 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.i (renamed from gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.i) | 18 |
5 files changed, 45 insertions, 45 deletions
diff --git a/gnuradio-core/src/lib/filter/CMakeLists.txt b/gnuradio-core/src/lib/filter/CMakeLists.txt index d26e55fb8..02a72191c 100644 --- a/gnuradio-core/src/lib/filter/CMakeLists.txt +++ b/gnuradio-core/src/lib/filter/CMakeLists.txt @@ -333,7 +333,7 @@ set(gr_core_filter_triple_threats gr_single_pole_iir_filter_ff gr_single_pole_iir_filter_cc gr_pfb_channelizer_ccf - gr_pfb_synthesis_filterbank_ccf + gr_pfb_synthesizer_ccf gr_pfb_decimator_ccf gr_pfb_interpolator_ccf gr_pfb_arb_resampler_ccf diff --git a/gnuradio-core/src/lib/filter/filter.i b/gnuradio-core/src/lib/filter/filter.i index 8c3bb9eb6..2b7d9d0b7 100644 --- a/gnuradio-core/src/lib/filter/filter.i +++ b/gnuradio-core/src/lib/filter/filter.i @@ -32,7 +32,7 @@ #include <gr_fractional_interpolator_cc.h> #include <gr_goertzel_fc.h> #include <gr_pfb_channelizer_ccf.h> -#include <gr_pfb_synthesis_filterbank_ccf.h> +#include <gr_pfb_synthesizer_ccf.h> #include <gr_pfb_decimator_ccf.h> #include <gr_pfb_interpolator_ccf.h> #include <gr_pfb_arb_resampler_ccf.h> @@ -54,7 +54,7 @@ %include "gr_fractional_interpolator_cc.i" %include "gr_goertzel_fc.i" %include "gr_pfb_channelizer_ccf.i" -%include "gr_pfb_synthesis_filterbank_ccf.i" +%include "gr_pfb_synthesizer_ccf.i" %include "gr_pfb_decimator_ccf.i" %include "gr_pfb_interpolator_ccf.i" %include "gr_pfb_arb_resampler_ccf.i" diff --git a/gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.cc b/gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.cc index 55ba2dc3f..08fbd3df7 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.cc +++ b/gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.cc @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010 Free Software Foundation, Inc. + * Copyright 2010,2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -24,23 +24,23 @@ #include "config.h" #endif -#include <gr_pfb_synthesis_filterbank_ccf.h> +#include <gr_pfb_synthesizer_ccf.h> #include <gri_fft.h> #include <gr_io_signature.h> #include <cstdio> #include <cstring> -gr_pfb_synthesis_filterbank_ccf_sptr gr_make_pfb_synthesis_filterbank_ccf +gr_pfb_synthesizer_ccf_sptr gr_make_pfb_synthesizer_ccf (unsigned int numchans, const std::vector<float> &taps, bool twox) { - return gr_pfb_synthesis_filterbank_ccf_sptr - (new gr_pfb_synthesis_filterbank_ccf (numchans, taps, twox)); + return gr_pfb_synthesizer_ccf_sptr + (new gr_pfb_synthesizer_ccf (numchans, taps, twox)); } -gr_pfb_synthesis_filterbank_ccf::gr_pfb_synthesis_filterbank_ccf +gr_pfb_synthesizer_ccf::gr_pfb_synthesizer_ccf (unsigned int numchans, const std::vector<float> &taps, bool twox) - : gr_sync_interpolator ("pfb_synthesis_filterbank_ccf", + : gr_sync_interpolator ("pfb_synthesizer_ccf", gr_make_io_signature (1, numchans, sizeof(gr_complex)), gr_make_io_signature (1, 1, sizeof(gr_complex)), numchans), @@ -49,7 +49,7 @@ gr_pfb_synthesis_filterbank_ccf::gr_pfb_synthesis_filterbank_ccf // set up 2x multiplier; if twox==True, set to 2, otherwise to 1 d_twox = (twox ? 2 : 1); if(d_numchans % d_twox != 0) { - throw std::invalid_argument("gr_pfb_synthesis_filterbank_ccf: number of channels must be even for 2x oversampling.\n"); + throw std::invalid_argument("gr_pfb_synthesizer_ccf: number of channels must be even for 2x oversampling.\n"); } d_filters = std::vector<gri_fir_filter_with_buffer_ccf*>(d_twox*d_numchans); @@ -72,7 +72,7 @@ gr_pfb_synthesis_filterbank_ccf::gr_pfb_synthesis_filterbank_ccf set_output_multiple(d_numchans); } -gr_pfb_synthesis_filterbank_ccf::~gr_pfb_synthesis_filterbank_ccf () +gr_pfb_synthesizer_ccf::~gr_pfb_synthesizer_ccf () { for(unsigned int i = 0; i < d_twox*d_numchans; i++) { delete d_filters[i]; @@ -80,7 +80,7 @@ gr_pfb_synthesis_filterbank_ccf::~gr_pfb_synthesis_filterbank_ccf () } void -gr_pfb_synthesis_filterbank_ccf::set_taps(const std::vector<float> &taps) +gr_pfb_synthesizer_ccf::set_taps(const std::vector<float> &taps) { gruel::scoped_lock guard(d_mutex); if(d_twox == 1) @@ -90,7 +90,7 @@ gr_pfb_synthesis_filterbank_ccf::set_taps(const std::vector<float> &taps) } void -gr_pfb_synthesis_filterbank_ccf::set_taps1(const std::vector<float> &taps) +gr_pfb_synthesizer_ccf::set_taps1(const std::vector<float> &taps) { unsigned int i,j; @@ -127,7 +127,7 @@ gr_pfb_synthesis_filterbank_ccf::set_taps1(const std::vector<float> &taps) } void -gr_pfb_synthesis_filterbank_ccf::set_taps2 (const std::vector<float> &taps) +gr_pfb_synthesizer_ccf::set_taps2 (const std::vector<float> &taps) { unsigned int i,j; int state = 0; @@ -179,7 +179,7 @@ gr_pfb_synthesis_filterbank_ccf::set_taps2 (const std::vector<float> &taps) } void -gr_pfb_synthesis_filterbank_ccf::print_taps() +gr_pfb_synthesizer_ccf::print_taps() { unsigned int i, j; for(i = 0; i < d_twox*d_numchans; i++) { @@ -193,13 +193,13 @@ gr_pfb_synthesis_filterbank_ccf::print_taps() std::vector< std::vector<float> > -gr_pfb_synthesis_filterbank_ccf::taps() const +gr_pfb_synthesizer_ccf::taps() const { return d_taps; } void -gr_pfb_synthesis_filterbank_ccf::set_channel_map(const std::vector<int> &map) +gr_pfb_synthesizer_ccf::set_channel_map(const std::vector<int> &map) { gruel::scoped_lock guard(d_mutex); @@ -207,7 +207,7 @@ gr_pfb_synthesis_filterbank_ccf::set_channel_map(const std::vector<int> &map) unsigned int max = (unsigned int)*std::max_element(map.begin(), map.end()); unsigned int min = (unsigned int)*std::min_element(map.begin(), map.end()); if((max >= d_twox*d_numchans) || (min < 0)) { - throw std::invalid_argument("gr_pfb_synthesis_filterbank_ccf::set_channel_map: map range out of bounds.\n"); + throw std::invalid_argument("gr_pfb_synthesizer_ccf::set_channel_map: map range out of bounds.\n"); } d_channel_map = map; @@ -217,15 +217,15 @@ gr_pfb_synthesis_filterbank_ccf::set_channel_map(const std::vector<int> &map) } std::vector<int> -gr_pfb_synthesis_filterbank_ccf::channel_map() const +gr_pfb_synthesizer_ccf::channel_map() const { return d_channel_map; } int -gr_pfb_synthesis_filterbank_ccf::work (int noutput_items, - gr_vector_const_void_star &input_items, - gr_vector_void_star &output_items) +gr_pfb_synthesizer_ccf::work (int noutput_items, + gr_vector_const_void_star &input_items, + gr_vector_void_star &output_items) { gruel::scoped_lock guard(d_mutex); diff --git a/gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.h index d7f9d26c7..4c127b22f 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.h +++ b/gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.h @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010 Free Software Foundation, Inc. + * Copyright 2010,2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -21,24 +21,24 @@ */ -#ifndef INCLUDED_GR_PFB_SYNTHESIS_FILTERBANK_CCF_H -#define INCLUDED_GR_PFB_SYNTHESIS_FILTERBANK_CCF_H +#ifndef INCLUDED_GR_PFB_SYNTHESIZER_CCF_H +#define INCLUDED_GR_PFB_SYNTHESIZER_CCF_H #include <gr_core_api.h> #include <gr_sync_interpolator.h> #include <gri_fir_filter_with_buffer_ccf.h> #include <gruel/thread.h> -class gr_pfb_synthesis_filterbank_ccf; -typedef boost::shared_ptr<gr_pfb_synthesis_filterbank_ccf> gr_pfb_synthesis_filterbank_ccf_sptr; -GR_CORE_API gr_pfb_synthesis_filterbank_ccf_sptr gr_make_pfb_synthesis_filterbank_ccf +class gr_pfb_synthesizer_ccf; +typedef boost::shared_ptr<gr_pfb_synthesizer_ccf> gr_pfb_synthesizer_ccf_sptr; +GR_CORE_API gr_pfb_synthesizer_ccf_sptr gr_make_pfb_synthesizer_ccf (unsigned int numchans, const std::vector<float> &taps, bool twox=false); class gri_fft_complex; /*! - * \class gr_pfb_synthesis_filterbank_ccf + * \class gr_pfb_synthesizer_ccf * * \brief Polyphase synthesis filterbank with * gr_complex input, gr_complex output and float taps @@ -47,7 +47,7 @@ class gri_fft_complex; * \ingroup pfb_blk */ -class GR_CORE_API gr_pfb_synthesis_filterbank_ccf : public gr_sync_interpolator +class GR_CORE_API gr_pfb_synthesizer_ccf : public gr_sync_interpolator { private: /*! @@ -58,7 +58,7 @@ class GR_CORE_API gr_pfb_synthesis_filterbank_ccf : public gr_sync_interpolator populate the filterbank. * \param twox (bool) use 2x oversampling or not (default is no) */ - friend GR_CORE_API gr_pfb_synthesis_filterbank_ccf_sptr gr_make_pfb_synthesis_filterbank_ccf + friend GR_CORE_API gr_pfb_synthesizer_ccf_sptr gr_make_pfb_synthesizer_ccf (unsigned int numchans, const std::vector<float> &taps, bool twox); bool d_updated; @@ -90,12 +90,12 @@ class GR_CORE_API gr_pfb_synthesis_filterbank_ccf : public gr_sync_interpolator to populate the filterbank. * \param twox (bool) use 2x oversampling or not (default is no) */ - gr_pfb_synthesis_filterbank_ccf (unsigned int numchans, - const std::vector<float> &taps, - bool twox); + gr_pfb_synthesizer_ccf (unsigned int numchans, + const std::vector<float> &taps, + bool twox); public: - ~gr_pfb_synthesis_filterbank_ccf (); + ~gr_pfb_synthesizer_ccf (); /*! * Resets the filterbank's filter taps with the new prototype filter diff --git a/gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.i b/gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.i index c24abecf0..1e2c057ba 100644 --- a/gnuradio-core/src/lib/filter/gr_pfb_synthesis_filterbank_ccf.i +++ b/gnuradio-core/src/lib/filter/gr_pfb_synthesizer_ccf.i @@ -1,6 +1,6 @@ /* -*- c++ -*- */ /* - * Copyright 2010 Free Software Foundation, Inc. + * Copyright 2010,2012 Free Software Foundation, Inc. * * This file is part of GNU Radio * @@ -20,20 +20,20 @@ * Boston, MA 02110-1301, USA. */ -GR_SWIG_BLOCK_MAGIC(gr,pfb_synthesis_filterbank_ccf); +GR_SWIG_BLOCK_MAGIC(gr,pfb_synthesizer_ccf); -gr_pfb_synthesis_filterbank_ccf_sptr gr_make_pfb_synthesis_filterbank_ccf +gr_pfb_synthesizer_ccf_sptr gr_make_pfb_synthesizer_ccf (unsigned int numchans, const std::vector<float> &taps, bool twox=false); -class gr_pfb_synthesis_filterbank_ccf : public gr_sync_interpolator +class gr_pfb_synthesizer_ccf : public gr_sync_interpolator { private: - gr_pfb_synthesis_filterbank_ccf (unsigned int numchans, - const std::vector<float> &taps, - bool twox=false); - + gr_pfb_synthesizer_ccf (unsigned int numchans, + const std::vector<float> &taps, + bool twox=false); + public: - ~gr_pfb_synthesis_filterbank_ccf (); + ~gr_pfb_synthesizer_ccf (); void set_taps (const std::vector<float> &taps); void print_taps(); |