[Commit-gnuradio] r9849 - gnuradio/branches/developers/eb/frank/gnuradio-core/src/python/gnuradio/gr

[eb]

Author: eb
Date: 2008-10-25 16:31:29 -0600 (Sat, 25 Oct 2008)
New Revision: 9849

Modified:
   
gnuradio/branches/developers/eb/frank/gnuradio-core/src/python/gnuradio/gr/qa_classify.py
Log:
qa_classify mostly working.  Still fails test_005.


Modified: 
gnuradio/branches/developers/eb/frank/gnuradio-core/src/python/gnuradio/gr/qa_classify.py
===================================================================
--- 
gnuradio/branches/developers/eb/frank/gnuradio-core/src/python/gnuradio/gr/qa_classify.py
   2008-10-25 22:24:04 UTC (rev 9848)
+++ 
gnuradio/branches/developers/eb/frank/gnuradio-core/src/python/gnuradio/gr/qa_classify.py
   2008-10-25 22:31:29 UTC (rev 9849)
@@ -4,7 +4,9 @@
 from gnuradio import gr, gr_unittest
 import copy
 import pygsl.wavelet as wavelet
+import math
 
+
 def sqr(x):
     return x*x
 
@@ -64,9 +66,9 @@
                                 -1.0/5.0])
         trg_data = copy.deepcopy(src_data)
 
-        src = gr.vector_source_f(src_data)
+        src = gr.vector_source_f(src_data, False, len(src_data))
         st = gr.stretch_ff(-1.0/5.0, len(src_data))
-        dst = gr.vector_sink_f()
+        dst = gr.vector_sink_f(len(src_data))
         self.tb.connect(src, st)
         self.tb.connect(st, dst)
         self.tb.run()
@@ -83,9 +85,9 @@
         trg_grid = copy.deepcopy(src_grid)
         src_data = (0.0, 1.0, 0.0, 1.0, 0.0)
 
-        src = gr.vector_source_f(src_data)
+        src = gr.vector_source_f(src_data, False, len(src_grid))
         sq = gr.squash_ff(src_grid, trg_grid)
-        dst = gr.vector_sink_f()
+        dst = gr.vector_sink_f(len(trg_grid))
         self.tb.connect(src, sq)
         self.tb.connect(sq, dst)
         self.tb.run()
@@ -109,10 +111,10 @@
         c = w.transform_forward(b, ws)
         d = w.transform_inverse(c, ws)
 
-        src = gr.vector_source_f(b)
+        src = gr.vector_source_f(b, False, n)
         wv = gr.wavelet_ff(n, o, True)
 
-        dst = gr.vector_sink_f()
+        dst = gr.vector_sink_f(n)
         self.tb.connect(src, wv)
         self.tb.connect(wv, dst)
         self.tb.run()
@@ -138,9 +140,10 @@
             wvps[e] = scl*sqr(dwav[k:k+(01<<e)]).sum()
             k += 01<<e
 
-        src = gr.vector_source_f(src_data)
+        src = gr.vector_source_f(src_data, True, len(src_data))
         kon = gr.wvps_ff(len(src_data))
-        dst = gr.vector_sink_f()
+        #dst = gr.vector_sink_f(int(math.ceil(math.log(len(src_data), 2))))
+        dst = gr.vector_sink_f(len(src_data))
 
         self.tb.connect(src, kon)
         self.tb.connect(kon, dst)