[Commit-gnuradio] r4740 - gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter

[nldudok1]

Author: nldudok1
Date: 2007-03-12 17:32:53 -0600 (Mon, 12 Mar 2007)
New Revision: 4740

Added:
   
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.cc
   
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
   
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.i
   
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.cc
   
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h
   
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.i
Removed:
   
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator.cc
   
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator.h
Modified:
   
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/Makefile.am
   
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/filter.i
Log:
moved fractional_interpolator to fractional_interpolator_cc and 
fractional_interpolator_ff and made instantiatable from python

Modified: 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/Makefile.am
  2007-03-12 22:08:06 UTC (rev 4739)
+++ 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/Makefile.am
  2007-03-12 23:32:53 UTC (rev 4740)
@@ -170,7 +170,8 @@
        gr_fft_filter_fff.cc            \
        gr_goertzel_fc.cc               \
        gr_filter_delay_fc.cc           \
-       gr_fractional_interpolator.cc   \
+       gr_fractional_interpolator_ff.cc        \
+       gr_fractional_interpolator_cc.cc        \
        gr_hilbert_fc.cc                \
        gr_iir_filter_ffd.cc            \
        gr_sincos.c                     \
@@ -229,7 +230,8 @@
        gr_fft_filter_fff.h             \
        gr_filter_delay_fc.h            \
        gr_fir_sysconfig_x86.h          \
-       gr_fractional_interpolator.h    \
+       gr_fractional_interpolator_ff.h \
+       gr_fractional_interpolator_cc.h \
        gr_goertzel_fc.h                \
        gr_hilbert_fc.h                 \
        gr_iir_filter_ffd.h             \
@@ -291,6 +293,8 @@
        gr_fft_filter_ccc.i             \
        gr_fft_filter_fff.i             \
        gr_filter_delay_fc.i            \
+       gr_fractional_interpolator_ff.i \
+       gr_fractional_interpolator_cc.i \
        gr_goertzel_fc.i                \
        gr_hilbert_fc.i                 \
        gr_iir_filter_ffd.i             \

Modified: 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/filter.i
===================================================================
--- 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/filter.i
     2007-03-12 22:08:06 UTC (rev 4739)
+++ 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/filter.i
     2007-03-12 23:32:53 UTC (rev 4740)
@@ -28,6 +28,7 @@
 #include <gr_filter_delay_fc.h>
 #include <gr_fft_filter_ccc.h>
 #include <gr_fft_filter_fff.h>
+#include <gr_fractional_interpolator_ff.h>
 #include <gr_goertzel_fc.h>
 #include <gr_cma_equalizer_cc.h>
 %}
@@ -40,6 +41,7 @@
 %include "gr_fft_filter_ccc.i"
 %include "gr_fft_filter_fff.i"
 %include "gr_goertzel_fc.i"
+%include "gr_fractional_interpolator_ff.i"
 %include "gr_cma_equalizer_cc.i"
 
 %include "filter_generated.i"

Deleted: 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator.cc

Deleted: 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator.h

Added: 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.cc
===================================================================
--- 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.cc
                             (rev 0)
+++ 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.cc
     2007-03-12 23:32:53 UTC (rev 4740)
@@ -0,0 +1,97 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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 2, 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_io_signature.h>
+#include <gr_fractional_interpolator_cc.h>
+#include <gri_mmse_fir_interpolator_cc.h>
+#include <stdexcept>
+
+// Public constructor
+gr_fractional_interpolator_cc_sptr gr_make_fractional_interpolator_cc(float 
phase_shift, float interp_ratio)
+{
+  return gr_fractional_interpolator_cc_sptr(new 
gr_fractional_interpolator_cc(phase_shift, interp_ratio));
+}
+
+gr_fractional_interpolator_cc::gr_fractional_interpolator_cc(float 
phase_shift, float interp_ratio)
+  : gr_block ("fractional_interpolator_cc",
+             gr_make_io_signature (1, 1, sizeof (float)),
+             gr_make_io_signature (1, 1, sizeof (float))),
+    d_mu (phase_shift), d_mu_inc (interp_ratio), d_interp(new 
gri_mmse_fir_interpolator_cc())
+{
+  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_relative_rate (1.0 / interp_ratio);
+}
+
+gr_fractional_interpolator_cc::~gr_fractional_interpolator_cc()
+{
+    delete d_interp;
+}
+
+void
+gr_fractional_interpolator_cc::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
+gr_fractional_interpolator_cc::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){
+
+    // produce output sample
+
+    out[oo++] = d_interp->interpolate(&in[ii], d_mu);
+
+    //  printf( "%4d %9.6f\n", ii, 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;
+}

Added: 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
===================================================================
--- 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
                              (rev 0)
+++ 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
      2007-03-12 23:32:53 UTC (rev 4740)
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2007 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 2, 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.
+ */
+
+#ifndef INCLUDED_GR_FRACTIONAL_INTERPOLATOR_CC_H
+#define        INCLUDED_GR_FRACTIONAL_INTERPOLATOR_CC_H
+
+#include <gr_block.h>
+
+class gri_mmse_fir_interpolator_cc;
+
+class gr_fractional_interpolator_cc;
+typedef boost::shared_ptr<gr_fractional_interpolator_cc> 
gr_fractional_interpolator_cc_sptr;
+
+// public constructor
+gr_fractional_interpolator_cc_sptr gr_make_fractional_interpolator_cc (float 
phase_shift, float interp_ratio);
+
+/*!
+ * \brief Interpolating mmse filter with gr_complex input, gr_complex output
+ * \ingroup filter
+ */
+class gr_fractional_interpolator_cc : public gr_block
+{
+ public:
+  ~gr_fractional_interpolator_cc ();
+  void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+  int general_work (int noutput_items,
+                   gr_vector_int &ninput_items,
+                   gr_vector_const_void_star &input_items,
+                   gr_vector_void_star &output_items);
+  float mu() const { return d_mu;}
+  float interp_ratio() const { return d_mu_inc;}
+  void set_mu (float mu) { d_mu = mu; }
+  void set_interp_ratio (float interp_ratio) { d_mu_inc = interp_ratio; }
+
+protected:
+  gr_fractional_interpolator_cc (float phase_shift, float interp_ratio);
+
+ private:
+  float                        d_mu;
+  float                        d_mu_inc;
+  gri_mmse_fir_interpolator_cc         *d_interp;
+
+  friend gr_fractional_interpolator_cc_sptr
+    gr_make_fractional_interpolator_cc (float phase_shift, float interp_ratio);
+};
+
+#endif

Added: 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.i
===================================================================
--- 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.i
                              (rev 0)
+++ 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.i
      2007-03-12 23:32:53 UTC (rev 4740)
@@ -0,0 +1,36 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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 2, 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(gr,fractional_interpolator_cc);
+
+gr_fractional_interpolator_cc_sptr gr_make_fractional_interpolator_cc (float 
phase_shift, float interp_ratio);
+
+class gr_fractional_interpolator_cc : public gr_block
+{
+ private:
+    gr_fractional_interpolator_cc (float phase_shift, float interp_ratio);
+ public:
+   float mu() const;
+   float interp_ratio() const;
+   void set_mu (float mu);
+   void set_interp_ratio (float interp_ratio);
+};

Added: 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.cc
===================================================================
--- 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.cc
                             (rev 0)
+++ 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.cc
     2007-03-12 23:32:53 UTC (rev 4740)
@@ -0,0 +1,97 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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 2, 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.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gr_io_signature.h>
+#include <gr_fractional_interpolator_ff.h>
+#include <gri_mmse_fir_interpolator.h>
+#include <stdexcept>
+
+// Public constructor
+gr_fractional_interpolator_ff_sptr gr_make_fractional_interpolator_ff(float 
phase_shift, float interp_ratio)
+{
+  return gr_fractional_interpolator_ff_sptr(new 
gr_fractional_interpolator_ff(phase_shift, interp_ratio));
+}
+
+gr_fractional_interpolator_ff::gr_fractional_interpolator_ff(float 
phase_shift, float interp_ratio)
+  : gr_block ("fractional_interpolator_ff",
+             gr_make_io_signature (1, 1, sizeof (float)),
+             gr_make_io_signature (1, 1, sizeof (float))),
+    d_mu (phase_shift), d_mu_inc (interp_ratio), d_interp(new 
gri_mmse_fir_interpolator())
+{
+  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_relative_rate (1.0 / interp_ratio);
+}
+
+gr_fractional_interpolator_ff::~gr_fractional_interpolator_ff()
+{
+    delete d_interp;
+}
+
+void
+gr_fractional_interpolator_ff::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
+gr_fractional_interpolator_ff::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){
+
+    // produce output sample
+
+    out[oo++] = d_interp->interpolate(&in[ii], d_mu);
+
+    //  printf( "%4d %9.6f\n", ii, 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;
+}

Added: 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h
===================================================================
--- 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h
                              (rev 0)
+++ 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h
      2007-03-12 23:32:53 UTC (rev 4740)
@@ -0,0 +1,66 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004 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 2, 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.
+ */
+
+#ifndef INCLUDED_GR_FRACTIONAL_INTERPOLATOR_FF_H
+#define        INCLUDED_GR_FRACTIONAL_INTERPOLATOR_FF_H
+
+#include <gr_block.h>
+
+class gri_mmse_fir_interpolator;
+
+class gr_fractional_interpolator_ff;
+typedef boost::shared_ptr<gr_fractional_interpolator_ff> 
gr_fractional_interpolator_ff_sptr;
+
+// public constructor
+gr_fractional_interpolator_ff_sptr gr_make_fractional_interpolator_ff (float 
phase_shift, float interp_ratio);
+
+/*!
+ * \brief Interpolating mmse filter with float input, float output
+ * \ingroup filter
+ */
+class gr_fractional_interpolator_ff : public gr_block
+{
+ public:
+  ~gr_fractional_interpolator_ff ();
+  void forecast(int noutput_items, gr_vector_int &ninput_items_required);
+  int general_work (int noutput_items,
+                   gr_vector_int &ninput_items,
+                   gr_vector_const_void_star &input_items,
+                   gr_vector_void_star &output_items);
+  float mu() const { return d_mu;}
+  float interp_ratio() const { return d_mu_inc;}
+  void set_mu (float mu) { d_mu = mu; }
+  void set_interp_ratio (float interp_ratio) { d_mu_inc = interp_ratio; }
+
+protected:
+  gr_fractional_interpolator_ff (float phase_shift, float interp_ratio);
+
+ private:
+  float                        d_mu;
+  float                        d_mu_inc;
+  gri_mmse_fir_interpolator    *d_interp;
+
+  friend gr_fractional_interpolator_ff_sptr
+    gr_make_fractional_interpolator_ff (float phase_shift, float interp_ratio);
+};
+
+#endif

Added: 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.i
===================================================================
--- 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.i
                              (rev 0)
+++ 
gnuradio/branches/developers/nldudok1/general-wip/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.i
      2007-03-12 23:32:53 UTC (rev 4740)
@@ -0,0 +1,36 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2007 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 2, 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.
+ */
+
+GR_SWIG_BLOCK_MAGIC(gr,fractional_interpolator_ff);
+
+gr_fractional_interpolator_ff_sptr gr_make_fractional_interpolator_ff (float 
phase_shift, float interp_ratio);
+
+class gr_fractional_interpolator_ff : public gr_block
+{
+ private:
+    gr_fractional_interpolator_ff (float phase_shift, float interp_ratio);
+ public:
+   float mu() const;
+   float interp_ratio() const;
+   void set_mu (float mu);
+   void set_interp_ratio (float interp_ratio);
+};