diff options
| author | Tom Rondeau | 2012-02-07 13:18:47 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2012-02-07 13:18:47 -0500 |
| commit | 83c5a8a66d619423beec55f689640a89e2bd762b (patch) | |
| tree | 0f14b023246fe4312948293bea15aa370b378f7b /gnuradio-core/src/lib | |
| parent | 10ece2bbb3d2ba34ea18dadfb06ce6e6fd1ae6c3 (diff) | |
| parent | f12f7ba606d67155be4026ddf3f5ac44680556ae (diff) | |
| download | gnuradio-83c5a8a66d619423beec55f689640a89e2bd762b.tar.gz gnuradio-83c5a8a66d619423beec55f689640a89e2bd762b.tar.bz2 gnuradio-83c5a8a66d619423beec55f689640a89e2bd762b.zip | |
Merge branch 'master' into next
Diffstat (limited to 'gnuradio-core/src/lib')
3 files changed, 18 insertions, 6 deletions
diff --git a/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h b/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h index ba0c78486..84be57768 100644 --- a/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h +++ b/gnuradio-core/src/lib/filter/gr_iir_filter_ffd.h @@ -43,18 +43,22 @@ gr_make_iir_filter_ffd (const std::vector<double> &fftaps, * * * The input and output satisfy a difference equation of the form - \f{html}{ + \htmlonly + \f{ y[n] - \sum_{k=1}^{M} a_k y[n-k] = \sum_{k=0}^{N} b_k x[n-k] \f} + \endhtmlonly \xmlonly y[n] - \sum_{k=1}^{M} a_k y[n-k] = \sum_{k=0}^{N} b_k x[n-k] \endxmlonly * with the corresponding rational system function - \f{html}{ + \htmlonly + \f{ H(z) = \ frac{\sum_{k=0}^{M} b_k z^{-k}}{1 - \sum_{k=1}^{N} a_k z^{-k}} \f} + \endhtmlonly \xmlonly H(z) = \ frac{\sum_{k=0}^{M} b_k z^{-k}}{1 - \sum_{k=1}^{N} a_k z^{-k}} diff --git a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h index c330c2140..78fa25393 100644 --- a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h +++ b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_cc.h @@ -40,18 +40,22 @@ gr_make_single_pole_iir_filter_cc (double alpha, unsigned int vlen=1); * \ingroup filter_blk * * The input and output satisfy a difference equation of the form - \f{html}{ + \htmlonly + \f{ y[n] - (1-alpha) y[n-1] = alpha x[n] \f} + \endhtmlonly \xmlonly y[n] - (1-alpha) y[n-1] = alpha x[n] \endxmlonly * with the corresponding rational system function - \f{html}{ + \htmlonly + \f{ H(z) = \frac{alpha}{1 - (1-alpha) z^{-1}} \f} + \endhtmlonly \xmlonly H(z) = \ frac{alpha}{1 - (1-alpha) z^{-1}} diff --git a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h index ee6a554bf..d2bae5c26 100644 --- a/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h +++ b/gnuradio-core/src/lib/filter/gr_single_pole_iir_filter_ff.h @@ -39,18 +39,22 @@ gr_make_single_pole_iir_filter_ff (double alpha, unsigned int vlen=1); * \ingroup filter_blk * * The input and output satisfy a difference equation of the form - \f{html}{ + \htmlonly + \f{ y[n] - (1-alpha) y[n-1] = alpha x[n] \f} + \endhtmlonly \xmlonly y[n] - (1-alpha) y[n-1] = alpha x[n] \endxmlonly * with the corresponding rational system function - \f{html}{ + \htmlonly + \f{ H(z) = \frac{alpha}{1 - (1-alpha) z^{-1}} \f} + \endhtmlonly \xmlonly H(z) = \ frac{alpha}{1 - (1-alpha) z^{-1}} |