Imported Upstream version 3.2.2

[debian/gnuradio] / gnuradio-core / src / python / gnuradio / gr / qa_goertzel.py

diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_goertzel.py b/gnuradio-core/src/python/gnuradio/gr/qa_goertzel.py
index 7371677d6be1d8eb8e3e4db8e0483b200baea573..d5dc595c9f442be05ab0fc633698a38a4accd3f3 100755 (executable)
--- a/gnuradio-core/src/python/gnuradio/gr/qa_goertzel.py
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_goertzel.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2006 Free Software Foundation, Inc.
+# Copyright 2006,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -26,10 +26,10 @@ from math import pi, cos
 class test_goertzel(gr_unittest.TestCase):
 
     def setUp(self):
-        self.fg = gr.flow_graph()
+        self.tb = gr.top_block()
 
     def tearDown(self):
-        self.fg = None
+        self.tb = None
 
     def make_tone_data(self, rate, freq):
         return [cos(2*pi*x*freq/rate) for x in range(rate)]
@@ -38,8 +38,8 @@ class test_goertzel(gr_unittest.TestCase):
        src = gr.vector_source_f(src_data, False)
         dft = gr.goertzel_fc(rate, rate, freq)
        dst = gr.vector_sink_c()
-       self.fg.connect(src, dft, dst)
-       self.fg.run()
+       self.tb.connect(src, dft, dst)
+       self.tb.run()
        return dst.data()       
 
     def test_001(self): # Measure single tone magnitude
@@ -49,7 +49,7 @@ class test_goertzel(gr_unittest.TestCase):
        src_data = self.make_tone_data(rate, freq)
        expected_result = 0.5
        actual_result = abs(self.transform(src_data, rate, bin)[0])
-       self.assertAlmostEqual(expected_result, actual_result, places=5)
+       self.assertAlmostEqual(expected_result, actual_result, places=4)
 
     def test_002(self): # Measure off frequency magnitude
        rate = 8000
@@ -58,7 +58,7 @@ class test_goertzel(gr_unittest.TestCase):
        src_data = self.make_tone_data(rate, freq)
        expected_result = 0.0
        actual_result = abs(self.transform(src_data, rate, bin)[0])
-       self.assertAlmostEqual(expected_result, actual_result, places=5)
+       self.assertAlmostEqual(expected_result, actual_result, places=4)
 
 if __name__ == '__main__':
     gr_unittest.main()