[Commit-gnuradio] r8219 - gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general

[eb]

Author: eb
Date: 2008-04-17 11:51:20 -0600 (Thu, 17 Apr 2008)
New Revision: 8219

Added:
   
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
   
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
Modified:
   
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/Makefile.am
   
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.cc
   
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.h
   
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.i
Log:
Refactored gr_fft_vcc into an abstract base class and a concrete
subclass that uses fftw.  This enables gcell_fft_vcc to inherit from
the abstract base class.


Modified: 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/Makefile.am 
    2008-04-17 16:49:47 UTC (rev 8218)
+++ 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/Makefile.am 
    2008-04-17 17:51:20 UTC (rev 8219)
@@ -72,6 +72,7 @@
        gr_feedforward_agc_cc.cc        \
        gr_feval.cc                     \
        gr_fft_vcc.cc                   \
+       gr_fft_vcc_fftw.cc              \
        gr_fft_vfc.cc                   \
        gr_firdes.cc                    \
        gr_float_to_char.cc             \
@@ -215,6 +216,7 @@
        gr_feedforward_agc_cc.h         \
        gr_feval.h                      \
        gr_fft_vcc.h                    \
+       gr_fft_vcc_fftw.h               \
        gr_fft_vfc.h                    \
        gr_firdes.h                     \
        gr_float_to_char.h              \

Modified: 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.cc
===================================================================
--- 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.cc
   2008-04-17 16:49:47 UTC (rev 8218)
+++ 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.cc
   2008-04-17 17:51:20 UTC (rev 8219)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2007 Free Software Foundation, Inc.
+ * Copyright 2004,2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -24,90 +24,35 @@
 #include "config.h"
 #endif
 
-#include <gr_fft_vcc.h>
+#include <gr_fft_vcc.h>                // abstract class
+#include <gr_fft_vcc_fftw.h>   // concrete class
 #include <gr_io_signature.h>
 #include <gri_fft.h>
 #include <math.h>
 
 gr_fft_vcc_sptr
-gr_make_fft_vcc (int fft_size, bool forward,const std::vector<float> window, 
bool shift)
+gr_make_fft_vcc (int fft_size, bool forward,const std::vector<float> &window, 
bool shift)
 {
-  return gr_fft_vcc_sptr (new gr_fft_vcc (fft_size, forward, window, shift));
+  return gr_make_fft_vcc_fftw(fft_size, forward, window, shift);
 }
 
-gr_fft_vcc::gr_fft_vcc (int fft_size, bool forward, const std::vector<float> 
window, bool shift)
-  : gr_sync_block ("fft_vcc",
+gr_fft_vcc::gr_fft_vcc (const std::string &name,
+                       int fft_size, bool forward, const std::vector<float> 
&window,
+                       bool shift)
+  : gr_sync_block (name,
                   gr_make_io_signature (1, 1, fft_size * sizeof (gr_complex)),
                   gr_make_io_signature (1, 1, fft_size * sizeof (gr_complex))),
     d_fft_size(fft_size), d_forward(forward), d_shift(shift)
 {
-  d_fft = new gri_fft_complex (d_fft_size, forward);
-
   set_window(window);
-
 }
 
 gr_fft_vcc::~gr_fft_vcc ()
 {
-  delete d_fft;
 }
 
-int
-gr_fft_vcc::work (int noutput_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];
-
-  unsigned int input_data_size = input_signature()->sizeof_stream_item (0);
-  unsigned int output_data_size = output_signature()->sizeof_stream_item (0);
-
-  int count = 0;
-
-  while (count++ < noutput_items){
-    
-    // copy input into optimally aligned buffer
-    
-    if (d_window.size()){
-      gr_complex *dst = d_fft->get_inbuf();
-      for (unsigned int i = 0; i < d_fft_size; i++)            // apply window
-       dst[i] = in[i] * d_window[i];
-    }
-    else {
-      if(!d_forward && d_shift) {  // apply an ifft shift on the data
-       gr_complex *dst = d_fft->get_inbuf();
-       unsigned int len = (unsigned int)(floor(d_fft_size/2.0)); // half 
length of complex array
-       memcpy(&dst[0], &in[len], sizeof(gr_complex)*(d_fft_size - len));
-       memcpy(&dst[d_fft_size - len], &in[0], sizeof(gr_complex)*len);
-      }
-      else {
-       memcpy (d_fft->get_inbuf(), in, input_data_size);
-      }
-    }
-    
-    // compute the fft
-    d_fft->execute ();
-    
-    // copy result to our output
-    if(d_forward && d_shift) {  // apply a fft shift on the data
-      unsigned int len = (unsigned int)(ceil(d_fft_size/2.0));
-      memcpy(&out[0], &d_fft->get_outbuf()[len], 
sizeof(gr_complex)*(d_fft_size - len));
-      memcpy(&out[d_fft_size - len], &d_fft->get_outbuf()[0], 
sizeof(gr_complex)*len);
-    }
-    else {
-      memcpy (out, d_fft->get_outbuf (), output_data_size);
-    }
-    
-    in  += d_fft_size;
-    out += d_fft_size;
-  }
-  
-  return noutput_items;
-}
-
 bool 
-gr_fft_vcc::set_window(const std::vector<float> window)
+gr_fft_vcc::set_window(const std::vector<float> &window)
 {
   if(window.size()==0 || window.size()==d_fft_size) {
     d_window=window;
@@ -116,18 +61,3 @@
   else 
     return false;
 }
-
-/*
-fftshift
-
-  for(i=0; i < ceil(d_occupied_carriers/2.0); i++) {
-    unsigned int k=ceil(d_occupied_carriers/2.0);
-    out[i] = gr_complex(-1+2*in[i+k],0);
-  }
-  for(; i < d_vlen - ceil(d_occupied_carriers/2.0); i++) {
-    out[i]=gr_complex(0,0);
-  }
-  for(unsigned int j=0;i<d_vlen;i++,j++) {
-    out[i]= gr_complex((-1+2*in[j]),0);
-  }
-*/

Modified: 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.h
===================================================================
--- 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.h
    2008-04-17 16:49:47 UTC (rev 8218)
+++ 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.h
    2008-04-17 17:51:20 UTC (rev 8219)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2007 Free Software Foundation, Inc.
+ * Copyright 2004,2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -25,40 +25,36 @@
 
 #include <gr_sync_block.h>
 
-class gri_fft_complex;
-
 class gr_fft_vcc;
 typedef boost::shared_ptr<gr_fft_vcc> gr_fft_vcc_sptr;
 
 gr_fft_vcc_sptr
-gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> window, 
bool shift=false);
+gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> &window, 
bool shift=false);
 
 /*!
  * \brief Compute forward or reverse FFT.  complex vector in / complex vector 
out.
  * \ingroup dft
+ *
+ * Abstract base class
  */
-
 class gr_fft_vcc : public gr_sync_block
 {
+protected:
   friend gr_fft_vcc_sptr
-  gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> 
window, bool shift);
+  gr_make_fft_vcc (int fft_size, bool forward, const std::vector<float> 
&window, bool shift);
 
-  unsigned int    d_fft_size;
+  unsigned int        d_fft_size;
   std::vector<float>   d_window;
-  gri_fft_complex *d_fft;
   bool d_forward;
   bool d_shift;
 
-  gr_fft_vcc (int fft_size, bool forward, const std::vector<float> window, 
bool shift);
+  gr_fft_vcc (const std::string &name, int fft_size, bool forward,
+             const std::vector<float> &window, bool shift);
 
  public:
   ~gr_fft_vcc ();
 
-  int work (int noutput_items,
-           gr_vector_const_void_star &input_items,
-           gr_vector_void_star &output_items);
-  bool set_window(const std::vector<float> window);
+  bool set_window(const std::vector<float> &window);
 };
 
-
 #endif /* INCLUDED_GR_FFT_VCC_H */

Modified: 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.i
===================================================================
--- 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.i
    2008-04-17 16:49:47 UTC (rev 8218)
+++ 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.i
    2008-04-17 17:51:20 UTC (rev 8219)
@@ -1,6 +1,6 @@
 /* -*- c++ -*- */
 /*
- * Copyright 2004,2007 Free Software Foundation, Inc.
+ * Copyright 2004,2007,2008 Free Software Foundation, Inc.
  * 
  * This file is part of GNU Radio
  * 
@@ -31,5 +31,5 @@
   gr_fft_vcc (int fft_size, bool forward, const std::vector<float> window, 
bool shift);
 
  public:
-  bool set_window(const std::vector<float> window);
+  bool set_window(const std::vector<float> &window);
 };

Copied: 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
 (from rev 8215, 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.cc)
===================================================================
--- 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
                              (rev 0)
+++ 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
      2008-04-17 17:51:20 UTC (rev 8219)
@@ -0,0 +1,103 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2007,2008 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 3, 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_fft_vcc_fftw.h>
+#include <gr_io_signature.h>
+#include <gri_fft.h>
+#include <math.h>
+
+gr_fft_vcc_sptr
+gr_make_fft_vcc_fftw (int fft_size, bool forward, const std::vector<float> 
&window, bool shift)
+{
+  return gr_fft_vcc_sptr (new gr_fft_vcc_fftw (fft_size, forward, window, 
shift));
+}
+
+gr_fft_vcc_fftw::gr_fft_vcc_fftw (int fft_size, bool forward,
+                                 const std::vector<float> &window, bool shift)
+  : gr_fft_vcc("fft_vcc_fftw", fft_size, forward, window, shift)
+{
+  d_fft = new gri_fft_complex (d_fft_size, forward);
+}
+
+gr_fft_vcc_fftw::~gr_fft_vcc_fftw ()
+{
+  delete d_fft;
+}
+
+int
+gr_fft_vcc_fftw::work (int noutput_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];
+
+  unsigned int input_data_size = input_signature()->sizeof_stream_item (0);
+  unsigned int output_data_size = output_signature()->sizeof_stream_item (0);
+
+  int count = 0;
+
+  while (count++ < noutput_items){
+    
+    // copy input into optimally aligned buffer
+    
+    if (d_window.size()){
+      gr_complex *dst = d_fft->get_inbuf();
+      for (unsigned int i = 0; i < d_fft_size; i++)            // apply window
+       dst[i] = in[i] * d_window[i];
+    }
+    else {
+      if(!d_forward && d_shift) {  // apply an ifft shift on the data
+       gr_complex *dst = d_fft->get_inbuf();
+       unsigned int len = (unsigned int)(floor(d_fft_size/2.0)); // half 
length of complex array
+       memcpy(&dst[0], &in[len], sizeof(gr_complex)*(d_fft_size - len));
+       memcpy(&dst[d_fft_size - len], &in[0], sizeof(gr_complex)*len);
+      }
+      else {
+       memcpy (d_fft->get_inbuf(), in, input_data_size);
+      }
+    }
+    
+    // compute the fft
+    d_fft->execute ();
+    
+    // copy result to our output
+    if(d_forward && d_shift) {  // apply a fft shift on the data
+      unsigned int len = (unsigned int)(ceil(d_fft_size/2.0));
+      memcpy(&out[0], &d_fft->get_outbuf()[len], 
sizeof(gr_complex)*(d_fft_size - len));
+      memcpy(&out[d_fft_size - len], &d_fft->get_outbuf()[0], 
sizeof(gr_complex)*len);
+    }
+    else {
+      memcpy (out, d_fft->get_outbuf (), output_data_size);
+    }
+    
+    in  += d_fft_size;
+    out += d_fft_size;
+  }
+  
+  return noutput_items;
+}
+

Copied: 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
 (from rev 8215, 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc.h)
===================================================================
--- 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
                               (rev 0)
+++ 
gnuradio/branches/developers/eb/gcell/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
       2008-04-17 17:51:20 UTC (rev 8219)
@@ -0,0 +1,57 @@
+/* -*- c++ -*- */
+/*
+ * Copyright 2004,2007,2008 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 3, 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_FFT_VCC_FFTW_H
+#define INCLUDED_GR_FFT_VCC_FFTW_H
+
+#include <gr_fft_vcc.h>
+
+class gri_fft_complex;
+
+gr_fft_vcc_sptr
+gr_make_fft_vcc_fftw (int fft_size, bool forward, const std::vector<float> 
&window, bool shift=false);
+
+/*!
+ * \brief Compute forward or reverse FFT.  complex vector in / complex vector 
out.
+ * \ingroup dft
+ *
+ * Concrete class that uses FFTW.
+ */
+class gr_fft_vcc_fftw : public gr_fft_vcc
+{
+  friend gr_fft_vcc_sptr
+  gr_make_fft_vcc_fftw (int fft_size, bool forward, const std::vector<float> 
&window, bool shift);
+
+  gri_fft_complex *d_fft;
+
+  gr_fft_vcc_fftw (int fft_size, bool forward, const std::vector<float> 
&window, bool shift);
+
+ public:
+  ~gr_fft_vcc_fftw ();
+
+  int work (int noutput_items,
+           gr_vector_const_void_star &input_items,
+           gr_vector_void_star &output_items);
+};
+
+
+#endif /* INCLUDED_GR_FFT_VCC_FFTW_H */