[Commit-gnuradio] r4754 - in gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src: lib/filter python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2007-03-14 15:47:12 -0600 (Wed, 14 Mar 2007)
New Revision: 4754

Added:
   
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.cc
   
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
   
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.i
Modified:
   
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/Makefile.am
   
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/filter.i
   
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/python/gnuradio/gr/qa_fractional_interpolator.py
Log:
Added gr_fractional_interpolator_cc.

Modified: 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/Makefile.am
  2007-03-14 21:33:30 UTC (rev 4753)
+++ 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/Makefile.am
  2007-03-14 21:47:12 UTC (rev 4754)
@@ -1,5 +1,5 @@
 #
-# Copyright 2001,2002,2004,2005,2006 Free Software Foundation, Inc.
+# Copyright 2001,2002,2004,2005,2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -171,6 +171,7 @@
        gr_goertzel_fc.cc               \
        gr_filter_delay_fc.cc           \
        gr_fractional_interpolator_ff.cc \
+       gr_fractional_interpolator_cc.cc \
        gr_hilbert_fc.cc                \
        gr_iir_filter_ffd.cc            \
        gr_sincos.c                     \
@@ -230,6 +231,7 @@
        gr_filter_delay_fc.h            \
        gr_fir_sysconfig_x86.h          \
        gr_fractional_interpolator_ff.h \
+       gr_fractional_interpolator_cc.h \
        gr_goertzel_fc.h                \
        gr_hilbert_fc.h                 \
        gr_iir_filter_ffd.h             \

Modified: 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/filter.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/filter.i 
    2007-03-14 21:33:30 UTC (rev 4753)
+++ 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/filter.i 
    2007-03-14 21:47:12 UTC (rev 4754)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2005,2006 Free Software Foundation, Inc.
+ * Copyright 2004,2005,2006,2007 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -29,6 +29,7 @@
 #include <gr_fft_filter_ccc.h>
 #include <gr_fft_filter_fff.h>
 #include <gr_fractional_interpolator_ff.h>
+#include <gr_fractional_interpolator_cc.h>
 #include <gr_goertzel_fc.h>
 #include <gr_cma_equalizer_cc.h>
 %}
@@ -41,6 +42,7 @@
 %include "gr_fft_filter_ccc.i"
 %include "gr_fft_filter_fff.i"
 %include "gr_fractional_interpolator_ff.i"
+%include "gr_fractional_interpolator_cc.i"
 %include "gr_goertzel_fc.i"
 %include "gr_cma_equalizer_cc.i"
 

Copied: 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.cc
 (from rev 4751, 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.cc)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.cc
                             (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.cc
     2007-03-14 21:47:12 UTC (rev 4754)
@@ -0,0 +1,93 @@
+/* -*- 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.
+ */
+
+#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) {
+
+    out[oo++] = d_interp->interpolate(&in[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;
+}

Copied: 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
 (from rev 4752, 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.h)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
                              (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.h
      2007-03-14 21:47:12 UTC (rev 4754)
@@ -0,0 +1,67 @@
+/* -*- 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

Copied: 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.i
 (from rev 4752, 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_ff.i)
===================================================================
--- 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.i
                              (rev 0)
+++ 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/lib/filter/gr_fractional_interpolator_cc.i
      2007-03-14 21:47:12 UTC (rev 4754)
@@ -0,0 +1,37 @@
+/* -*- 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);
+};

Modified: 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/python/gnuradio/gr/qa_fractional_interpolator.py
===================================================================
--- 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/python/gnuradio/gr/qa_fractional_interpolator.py
        2007-03-14 21:33:30 UTC (rev 4753)
+++ 
gnuradio/branches/developers/jcorgan/frac/gnuradio-core/src/python/gnuradio/gr/qa_fractional_interpolator.py
        2007-03-14 21:47:12 UTC (rev 4754)
@@ -32,6 +32,7 @@
 
     def test_000_make(self):
         op = gr.fractional_interpolator_ff(0.0, 1.0)
+        op2 = gr.fractional_interpolator_cc(0.0, 1.0)
         
 if __name__ == '__main__':
     gr_unittest.main()