filter: added firdes for generating FIR filters to gr-filter.

Addes QA code in both Python and C++.

2 files changed, 203 insertions, 1 deletions

diff --git a/gr-filter/python/qa_fir_filter.py b/gr-filter/python/qa_fir_filter.py
index f0f08afca..38bfd9ea5 100755
--- a/gr-filter/python/qa_fir_filter.py
+++ b/gr-filter/python/qa_fir_filter.py
@@ -70,7 +70,7 @@ class test_filter(gr_unittest.TestCase):
         # results derived from original gr.fir_filter_ccc
         expected_data = ((7.537424837948042e-20+7.537424837948042e-20j), (9.131923434324563e-05+9.131923434324563e-05j), (0.0003317668742965907+0.0003317668742965907j), (0.0007230418268591166+0.0007230418268591166j), (0.0012087896466255188+0.0012087896466255188j), (0.0013292605290189385+0.0013292605290189385j), (0.001120875240303576+0.001120875240303576j), (0.000744672492146492+0.000744672492146492j), (0.000429437990533188+0.000429437990533188j), (2.283908543176949e-05+2.283908543176949e-05j), (-0.0002245186478830874-0.0002245186478830874j), (-0.0001157080550910905-0.0001157080550910905j), (0.00041409023106098175+0.00041409023106098175j), (0.0009017843985930085+0.0009017843985930085j), (0.0012520025484263897+0.0012520025484263897j), (0.0014116164529696107+0.0014116164529696107j), (0.001393353333696723+0.001393353333696723j), (0.000912194955162704+0.000912194955162704j), (0.00022649182938039303+0.00022649182938039303j), (-0.00031363096786662936-0.00031363096786662936j), (-0.0003966730728279799-0.0003966730728279799j), (-0.00023757052258588374-0.00023757052258588374j), (0.00021952332463115454+0.00021952332463115454j), (0.0009092430118471384+0.0009092430118471384j), (0.001662317430600524+0.001662317430600524j), (0.0019024648936465383+0.0019024648936465383j), (0.0015955769922584295+0.0015955769922584295j), (0.0009144138311967254+0.0009144138311967254j), (0.0001872836146503687+0.0001872836146503687j), (-0.000581968342885375-0.000581968342885375j), (-0.0009886166080832481-0.0009886166080832481j), (-0.0007480768254026771-0.0007480768254026771j), (0.00018211957649327815+0.00018211957649327815j), (0.0012042406015098095+0.0012042406015098095j), (0.0020200139842927456+0.0020200139842927456j), (0.0023816542234271765+0.0023816542234271765j), (0.002195809967815876+0.002195809967815876j), (0.0012113333214074373+0.0012113333214074373j), (-0.00014088614261709154-0.00014088614261709154j), (-0.0012574587017297745-0.0012574587017297745j))
 
-        taps = gr.firdes.low_pass(1, 1, 0.1, 0.01)
+        taps = filter.firdes.low_pass(1, 1, 0.1, 0.01)
         src = gr.vector_source_c(src_data)
         op  = filter.fir_filter_ccc(1, taps)
         dst = gr.vector_sink_c()
diff --git a/gr-filter/python/qa_firdes.py b/gr-filter/python/qa_firdes.py
new file mode 100755
index 000000000..cfd10435f
--- /dev/null
+++ b/gr-filter/python/qa_firdes.py
@@ -0,0 +1,202 @@
+#!/usr/bin/env python
+#
+# Copyright 2012 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.
+#
+
+from gnuradio import gr, gr_unittest
+import filter_swig as filter
+import sys
+
+class test_firdes(gr_unittest.TestCase):
+
+    def setUp(self):
+	pass
+
+    def tearDown(self):
+	pass
+
+    def test_low_pass(self):
+        known_taps = (0.0030193300917744637, -0.004960992839187384,
+                      0.006678304169327021, -1.132049690556083e-17,
+                      -0.0251916591078043, 0.07206480950117111,
+                      -0.13062666356563568, 0.18007083237171173,
+                      0.7978920936584473, 0.18007083237171173,
+                      -0.13062666356563568, 0.07206480950117111,
+                      -0.0251916591078043, -1.132049690556083e-17,
+                      0.006678304169327021, -0.004960992839187384,
+                      0.0030193300917744637)
+        new_taps = filter.firdes.low_pass(1, 1, 0.4, 0.2)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_low_pass_2(self):
+        known_taps = (0.0024871660862118006, -4.403502608370943e-18,
+                      -0.014456653036177158, 0.0543283149600029,
+                      -0.116202212870121, 0.17504146695137024,
+                      0.7976038455963135, 0.17504146695137024,
+                      -0.116202212870121, 0.0543283149600029,
+                      -0.014456653036177158, -4.403502608370943e-18,
+                      0.0024871660862118006)
+        new_taps = filter.firdes.low_pass_2(1, 1, 0.4, 0.2, 60)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_high_pass(self):
+        known_taps = (-0.003062003292143345, 0.005031108390539885,
+                       -0.0067726909182965755, 1.1480492661182674e-17,
+                       0.025547700002789497, -0.0730833187699318,
+                       0.13247284293174744, -0.18261581659317017,
+                       0.20229223370552063, -0.18261581659317017,
+                       0.13247284293174744, -0.0730833187699318,
+                       0.025547700002789497, 1.1480492661182674e-17,
+                       -0.0067726909182965755, 0.005031108390539885,
+                       -0.003062003292143345)
+        new_taps = filter.firdes.high_pass(1, 1, 0.4, 0.2)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_high_pass_2(self):
+        known_taps = (-0.0027197482995688915, 4.815287179370254e-18,
+                       0.01580853760242462, -0.05940871313214302,
+                       0.1270686239004135, -0.1914101094007492,
+                       0.21804752945899963, -0.1914101094007492,
+                       0.1270686239004135, -0.05940871313214302,
+                       0.01580853760242462, 4.815287179370254e-18,
+                       -0.0027197482995688915)
+        new_taps = filter.firdes.high_pass_2(1, 1, 0.4, 0.2, 60)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_band_pass(self):
+        known_taps = (0.004961997736245394, -0.008152946829795837,
+                      -0.004192151129245758, -5.749020235348687e-18,
+                      0.01581347920000553, 0.11843203753232956,
+                      -0.21467317640781403, -0.11303528398275375,
+                      0.40520283579826355, -0.11303528398275375,
+                      -0.21467317640781403, 0.11843203753232956,
+                      0.01581347920000553, -5.749020235348687e-18,
+                      -0.004192151129245758, -0.008152946829795837,
+                      0.004961997736245394)
+        new_taps = filter.firdes.band_pass(1, 1, 0.2, 0.4, 0.2)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_band_pass_2(self):
+        known_taps = (-0.001676854444667697, -2.4018533253972557e-18,
+                       0.009746716357767582, 0.09589414298534393,
+                       -0.20510689914226532, -0.11801345646381378,
+                       0.4350462853908539, -0.11801345646381378,
+                       -0.20510689914226532, 0.09589414298534393,
+                       0.009746716357767582, -2.4018533253972557e-18,
+                       -0.001676854444667697)
+        new_taps = filter.firdes.band_pass_2(1, 1, 0.2, 0.4, 0.2, 60)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_complex_band_pass(self):
+        known_taps = ((0.0024772135075181723+0.0017997993854805827j),
+                      (-0.004070250317454338+0.002957213670015335j),
+                      (-0.0020928815938532352-0.006441210396587849j),
+                      (-2.8701231652956686e-18+2.805614574993832e-24j),
+                      (0.007894645445048809-0.024297315627336502j),
+                      (0.05912570655345917+0.04295721650123596j),
+                      (-0.10717268288135529+0.07786571979522705j),
+                      (-0.0564316064119339-0.17367789149284363j),
+                      (0.20229223370552063-2.4115112751132983e-07j),
+                      (-0.05643119290471077+0.17367802560329437j),
+                      (-0.10717286914587021-0.07786546647548676j),
+                      (0.05912560224533081-0.0429573580622673j),
+                      (0.007894691079854965+0.024297300726175308j),
+                      (-2.8701231652956686e-18+2.6687109203363464e-24j),
+                      (-0.0020928694866597652+0.006441214121878147j),
+                      (-0.004070255905389786-0.0029572059866040945j),
+                      (0.0024772100150585175-0.0017998040420934558j))
+        new_taps = filter.firdes.complex_band_pass(1, 1, 0.2, 0.4, 0.2)
+        self.assertComplexTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_complex_band_pass_2(self):
+        known_taps = ((-0.0008404505206272006-0.0025866336654871702j),
+                      (-1.2038217948425635e-18+1.1767648157397848e-24j),
+                      (0.0048850891180336475-0.015034818090498447j),
+                      (0.048062704503536224+0.03491950035095215j),
+                      (-0.10280057787895203+0.07468919456005096j),
+                      (-0.05914920195937157-0.18204176425933838j),
+                      (0.21804752945899963-2.5993290364567656e-07j),
+                      (-0.059148769825696945+0.18204189836978912j),
+                      (-0.10280075669288635-0.07468894869089127j),
+                      (0.04806262254714966-0.0349196158349514j),
+                      (0.004885117989033461+0.015034808777272701j),
+                      (-1.2038217948425635e-18+1.1193430388030685e-24j),
+                      (-0.000840445572976023+0.002586635295301676j))
+        new_taps = filter.firdes.complex_band_pass_2(1, 1, 0.2, 0.4, 0.2, 60)
+        self.assertComplexTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_band_reject(self):
+        known_taps = (-0.004915320314466953, 0.008076251484453678,
+                       0.00415271520614624, 5.694938753309664e-18,
+                       -0.01566472090780735, -0.11731793731451035,
+                       0.2126537412405014, 0.11197195947170258,
+                       0.6020866632461548, 0.11197195947170258,
+                       0.2126537412405014, -0.11731793731451035,
+                       -0.01566472090780735, 5.694938753309664e-18,
+                       0.00415271520614624, 0.008076251484453678,
+                       -0.004915320314466953)
+        new_taps = filter.firdes.band_reject(1, 1, 0.2, 0.4, 0.2)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_band_reject_2(self):
+        known_taps = (0.0015371545450761914, 2.201753372137003e-18,
+                      -0.00893471110612154, -0.08790513873100281,
+                      0.1880193054676056, 0.1081816703081131,
+                      0.5982034206390381, 0.1081816703081131,
+                      0.1880193054676056, -0.08790513873100281,
+                      -0.00893471110612154, 2.201753372137003e-18,
+                      0.0015371545450761914)
+        new_taps = filter.firdes.band_reject_2(1, 1, 0.2, 0.4, 0.2, 60)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_hilbert(self):
+        known_taps = (-0.010056184604763985, 0.0,
+                       -0.08335155993700027, 0.0,
+                       -0.5732954144477844, 0.0,
+                       0.5732954144477844, 0.0,
+                       0.08335155993700027, 0.0,
+                       0.010056184604763985)
+        new_taps = filter.firdes.hilbert(11)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_root_raised_cosine(self):
+        known_taps = (-0.04609205573797226, -0.02069387212395668,
+                       0.050548505038022995, 0.14850808680057526,
+                       0.23387153446674347, 0.2677156329154968,
+                       0.23387153446674347, 0.14850808680057526,
+                       0.050548505038022995, -0.02069387212395668,
+                       -0.04609205573797226)
+        new_taps = filter.firdes.root_raised_cosine(1, 4, 1, 0.35, 11)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+    def test_gaussian(self):
+        known_taps = (0.0003600157215259969, 0.0031858310103416443,
+                      0.0182281993329525, 0.06743486225605011,
+                      0.16130395233631134, 0.24947398900985718,
+                      0.24947398900985718, 0.16130395233631134,
+                      0.06743486225605011, 0.0182281993329525,
+                      0.0031858310103416443, 0.0003600157215259969,
+                      2.630509879963938e-05)
+        new_taps = filter.firdes.gaussian(1, 4, 0.35, 13)
+        self.assertFloatTuplesAlmostEqual(known_taps, new_taps, 5)
+
+if __name__ == '__main__':
+    gr_unittest.run(test_firdes, "test_firdes.xml")
+