[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8329 - in gnuradio/branches/releases/3.1/gnuradio-cor
|
From: |
jcorgan |
|
Subject: |
[Commit-gnuradio] r8329 - in gnuradio/branches/releases/3.1/gnuradio-core/src: lib/general python/gnuradio/gr |
|
Date: |
Thu, 8 May 2008 19:44:47 -0600 (MDT) |
Author: jcorgan
Date: 2008-05-08 19:44:41 -0600 (Thu, 08 May 2008)
New Revision: 8329
Added:
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_fft.py
Modified:
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.cc
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.h
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.i
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_math.h
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/Makefile.am
Log:
Applied relevant portion of changeset r8244 on trunk to release branch.
Refactors FFT blocks, no user visible changes.
Modified:
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am
2008-05-08 23:09:28 UTC (rev 8328)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/Makefile.am
2008-05-09 01:44:41 UTC (rev 8329)
@@ -70,6 +70,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 \
@@ -201,6 +202,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/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.cc
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.cc
2008-05-08 23:09:28 UTC (rev 8328)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.cc
2008-05-09 01:44:41 UTC (rev 8329)
@@ -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/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.h
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.h
2008-05-08 23:09:28 UTC (rev 8328)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.h
2008-05-09 01:44:41 UTC (rev 8329)
@@ -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/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.i
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.i
2008-05-08 23:09:28 UTC (rev 8328)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc.i
2008-05-09 01:44:41 UTC (rev 8329)
@@ -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
*
@@ -28,8 +28,8 @@
class gr_fft_vcc : public gr_sync_block
{
protected:
- gr_fft_vcc (int fft_size, bool forward, const std::vector<float> window,
bool shift);
+ 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/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
(from rev 8244, gnuradio/trunk/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc)
===================================================================
---
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
(rev 0)
+++
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.cc
2008-05-09 01:44:41 UTC (rev 8329)
@@ -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/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
(from rev 8244, gnuradio/trunk/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h)
===================================================================
---
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
(rev 0)
+++
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_fft_vcc_fftw.h
2008-05-09 01:44:41 UTC (rev 8329)
@@ -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 */
Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_math.h
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_math.h
2008-05-08 23:09:28 UTC (rev 8328)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/general/gr_math.h
2008-05-09 01:44:41 UTC (rev 8329)
@@ -29,6 +29,12 @@
#include <gr_complex.h>
+static inline bool
+gr_is_power_of_2(long x)
+{
+ return x != 0 && (x & (x-1)) == 0;
+}
+
long gr_gcd (long m, long n);
// returns a non-zero value if value is "not-a-number" (NaN), and 0 otherwise
Modified:
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/Makefile.am
===================================================================
---
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/Makefile.am
2008-05-08 23:09:28 UTC (rev 8328)
+++
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/Makefile.am
2008-05-09 01:44:41 UTC (rev 8329)
@@ -61,6 +61,7 @@
qa_diff_encoder.py \
qa_diff_phasor_cc.py \
qa_feval.py \
+ qa_fft.py \
qa_fft_filter.py \
qa_filter_delay_fc.py \
qa_flow_graph.py \
Copied:
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_fft.py
(from rev 8244, gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/qa_fft.py)
===================================================================
---
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_fft.py
(rev 0)
+++
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_fft.py
2008-05-09 01:44:41 UTC (rev 8329)
@@ -0,0 +1,158 @@
+#!/usr/bin/env python
+#
+# Copyright 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 this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+from gnuradio import gr, gr_unittest
+import sys
+import random
+
+primes = (2,3,5,7,11,13,17,19,23,29,31,37,41,43,47,53,
+ 59,61,67,71,73,79,83,89,97,101,103,107,109,113,127,131,
+ 137,139,149,151,157,163,167,173,179,181,191,193,197,199,211,223,
+ 227,229,233,239,241,251,257,263,269,271,277,281,283,293,307,311)
+
+
+class test_fft_filter(gr_unittest.TestCase):
+
+ def setUp(self):
+ pass
+
+ def tearDown(self):
+ pass
+
+ def assert_fft_ok2(self, expected_result, result_data):
+ expected_result = expected_result[:len(result_data)]
+ self.assertComplexTuplesAlmostEqual2 (expected_result, result_data,
+ abs_eps=1e-9, rel_eps=4e-4)
+
+ def assert_fft_float_ok2(self, expected_result, result_data, abs_eps=1e-9,
rel_eps=4e-4):
+ expected_result = expected_result[:len(result_data)]
+ self.assertFloatTuplesAlmostEqual2 (expected_result, result_data,
+ abs_eps, rel_eps)
+
+ def test_001(self):
+ tb = gr.top_block()
+ fft_size = 32
+ src_data = tuple([complex(primes[2*i], primes[2*i+1]) for i in
range(fft_size)])
+
+ expected_result = ((4377+4516j),
+ (-1706.1268310546875+1638.4256591796875j),
+ (-915.2083740234375+660.69427490234375j),
+ (-660.370361328125+381.59600830078125j),
+ (-499.96044921875+238.41630554199219j),
+ (-462.26748657226562+152.88948059082031j),
+ (-377.98440551757812+77.5928955078125j),
+ (-346.85821533203125+47.152004241943359j),
+ (-295+20j),
+ (-286.33609008789062-22.257017135620117j),
+ (-271.52999877929688-33.081821441650391j),
+ (-224.6358642578125-67.019538879394531j),
+ (-244.24473571777344-91.524826049804688j),
+ (-203.09068298339844-108.54627227783203j),
+ (-198.45195007324219-115.90768432617188j),
+ (-182.97744750976562-128.12318420410156j),
+ (-167-180j),
+ (-130.33688354492188-173.83778381347656j),
+ (-141.19784545898438-190.28807067871094j),
+ (-111.09677124023438-214.48896789550781j),
+ (-70.039543151855469-242.41630554199219j),
+ (-68.960540771484375-228.30015563964844j),
+ (-53.049201965332031-291.47097778320312j),
+ (-28.695289611816406-317.64553833007812j),
+ (57-300j),
+ (45.301143646240234-335.69509887695312j),
+ (91.936195373535156-373.32437133789062j),
+ (172.09465026855469-439.275146484375j),
+ (242.24473571777344-504.47515869140625j),
+ (387.81732177734375-666.6788330078125j),
+ (689.48553466796875-918.2142333984375j),
+ (1646.539306640625-1694.1956787109375j))
+
+ src = gr.vector_source_c(src_data)
+ s2v = gr.stream_to_vector(gr.sizeof_gr_complex, fft_size)
+ fft = gr.fft_vcc(fft_size, True, [], False)
+ v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fft_size)
+ dst = gr.vector_sink_c()
+ tb.connect(src, s2v, fft, v2s, dst)
+ tb.run()
+ result_data = dst.data()
+ #print 'expected:', expected_result
+ #print 'results: ', result_data
+ #self.assertComplexTuplesAlmostEqual (expected_result, result_data, 5)
+ self.assert_fft_ok2(expected_result, result_data)
+
+ def test_002(self):
+ tb = gr.top_block()
+ fft_size = 32
+
+ tmp_data = ((4377+4516j),
+ (-1706.1268310546875+1638.4256591796875j),
+ (-915.2083740234375+660.69427490234375j),
+ (-660.370361328125+381.59600830078125j),
+ (-499.96044921875+238.41630554199219j),
+ (-462.26748657226562+152.88948059082031j),
+ (-377.98440551757812+77.5928955078125j),
+ (-346.85821533203125+47.152004241943359j),
+ (-295+20j),
+ (-286.33609008789062-22.257017135620117j),
+ (-271.52999877929688-33.081821441650391j),
+ (-224.6358642578125-67.019538879394531j),
+ (-244.24473571777344-91.524826049804688j),
+ (-203.09068298339844-108.54627227783203j),
+ (-198.45195007324219-115.90768432617188j),
+ (-182.97744750976562-128.12318420410156j),
+ (-167-180j),
+ (-130.33688354492188-173.83778381347656j),
+ (-141.19784545898438-190.28807067871094j),
+ (-111.09677124023438-214.48896789550781j),
+ (-70.039543151855469-242.41630554199219j),
+ (-68.960540771484375-228.30015563964844j),
+ (-53.049201965332031-291.47097778320312j),
+ (-28.695289611816406-317.64553833007812j),
+ (57-300j),
+ (45.301143646240234-335.69509887695312j),
+ (91.936195373535156-373.32437133789062j),
+ (172.09465026855469-439.275146484375j),
+ (242.24473571777344-504.47515869140625j),
+ (387.81732177734375-666.6788330078125j),
+ (689.48553466796875-918.2142333984375j),
+ (1646.539306640625-1694.1956787109375j))
+
+ src_data = tuple([x/fft_size for x in tmp_data])
+
+ expected_result = tuple([complex(primes[2*i], primes[2*i+1]) for i in
range(fft_size)])
+
+ src = gr.vector_source_c(src_data)
+ s2v = gr.stream_to_vector(gr.sizeof_gr_complex, fft_size)
+ fft = gr.fft_vcc(fft_size, False, [], False)
+ v2s = gr.vector_to_stream(gr.sizeof_gr_complex, fft_size)
+ dst = gr.vector_sink_c()
+ tb.connect(src, s2v, fft, v2s, dst)
+ tb.run()
+ result_data = dst.data()
+ #print 'expected:', expected_result
+ #print 'results: ', result_data
+ #self.assertComplexTuplesAlmostEqual (expected_result, result_data, 5)
+ self.assert_fft_ok2(expected_result, result_data)
+
+
+if __name__ == '__main__':
+ gr_unittest.main ()
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8329 - in gnuradio/branches/releases/3.1/gnuradio-core/src: lib/general python/gnuradio/gr,
jcorgan <=