[Commit-gnuradio] r3883 - gnuradio/branches/developers/eb/binstats/gnuradio-core/src/python/gnuradio/gr

[eb]

Author: eb
Date: 2006-10-27 16:32:12 -0600 (Fri, 27 Oct 2006)
New Revision: 3883

Modified:
   
gnuradio/branches/developers/eb/binstats/gnuradio-core/src/python/gnuradio/gr/qa_bin_statistics.py
Log:
additional qa code

Modified: 
gnuradio/branches/developers/eb/binstats/gnuradio-core/src/python/gnuradio/gr/qa_bin_statistics.py
===================================================================
--- 
gnuradio/branches/developers/eb/binstats/gnuradio-core/src/python/gnuradio/gr/qa_bin_statistics.py
  2006-10-27 22:24:38 UTC (rev 3882)
+++ 
gnuradio/branches/developers/eb/binstats/gnuradio-core/src/python/gnuradio/gr/qa_bin_statistics.py
  2006-10-27 22:32:12 UTC (rev 3883)
@@ -56,32 +56,62 @@
     def test_001(self):
         vlen = 4
         tune = counter(1)
-        #tune = gr.feval_dd()
         tune_delay = 0
         dwell_delay = 1
         msgq = gr.msg_queue()
 
-        src_data =         ( 1,  2,  3,  4,
-                             5,  6,  7,  8,
-                             9, 10, 11, 12,
+        src_data = tuple([float(x) for x in
+                          ( 1,  2,  3,  4,
+                            5,  6,  7,  8,
+                            9, 10, 11, 12,
                             13, 14, 15, 16
-                            )
+                            )])
 
-        expected_results = ( 1,  2,  3,  4,
-                             5,  6,  7,  8,
-                             9, 10, 11, 12,
+        expected_results = tuple([float(x) for x in
+                                  ( 1,  2,  3,  4,
+                                    5,  6,  7,  8,
+                                    9, 10, 11, 12,
+                                    13, 14, 15, 16
+                                    )])
+                            
+        src = gr.vector_source_f(src_data, False)
+        s2v = gr.stream_to_vector(gr.sizeof_float, vlen)
+        stats = gr.bin_statistics_f(vlen, msgq, tune, tune_delay, dwell_delay)
+        self.fg.connect(src, s2v, stats)
+        self.fg.run()
+        self.assertEqual(4, msgq.count())
+        for i in range(4):
+            m = parse_msg(msgq.delete_head())
+            #print "m =", m.center_freq, m.data
+            self.assertEqual(expected_results[vlen*i:vlen*i + vlen], m.data)
+
+    def test_002(self):
+        vlen = 4
+        tune = counter(1)
+        tune_delay = 1
+        dwell_delay = 2
+        msgq = gr.msg_queue()
+
+        src_data = tuple([float(x) for x in
+                          ( 1,  2,  3,  4,
+                            9,  6, 11,  8,
+                            5, 10,  7, 12,
                             13, 14, 15, 16
-                            )
+                            )])
+
+        expected_results = tuple([float(x) for x in
+                                  ( 9, 10, 11, 12)])
                             
         src = gr.vector_source_f(src_data, False)
         s2v = gr.stream_to_vector(gr.sizeof_float, vlen)
         stats = gr.bin_statistics_f(vlen, msgq, tune, tune_delay, dwell_delay)
         self.fg.connect(src, s2v, stats)
         self.fg.run()
-        #self.assertEqual(4, msgq.count())
-        while not msgq.empty_p():
+        self.assertEqual(1, msgq.count())
+        for i in range(1):
             m = parse_msg(msgq.delete_head())
-            print "m =", m.center_freq, m.data
+            #print "m =", m.center_freq, m.data
+            self.assertEqual(expected_results[vlen*i:vlen*i + vlen], m.data)
 
 
 if __name__ == '__main__':