[Commit-gnuradio] r8264 - in gnuradio/branches/releases/3.1/gnuradio-core/src: lib/gengen python/gnuradio/gr

[jcorgan]

Author: jcorgan
Date: 2008-04-24 00:08:47 -0600 (Thu, 24 Apr 2008)
New Revision: 8264

Modified:
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t
   gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_max.py
Log:
Applied changeset r8186:8189 on trunk to release branch, with modification.

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t   
    2008-04-24 05:57:21 UTC (rev 8263)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t   
    2008-04-24 06:08:47 UTC (rev 8264)
@@ -57,7 +57,7 @@
 
        for (int i=0; i<noutput_items; i++) {
 
-               @I_TYPE@ max = 0;
+               @I_TYPE@ max = ((@I_TYPE@ *) input_items[0])[i*d_vlen];
                int x = 0;
                int y = 0;
 

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t  
2008-04-24 05:57:21 UTC (rev 8263)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t  
2008-04-24 06:08:47 UTC (rev 8264)
@@ -54,7 +54,7 @@
        
        for (int i=0; i<noutput_items; i++) {
 
-               @I_TYPE@ max = 0;
+               @I_TYPE@ max = ((@I_TYPE@ *) input_items[0])[i*d_vlen];
                
                for (int j=0; j < (int) d_vlen; j++ ) {
                        for (int k=0; k<ninputs; k++) {

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_max.py
===================================================================
--- 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_max.py   
    2008-04-24 05:57:21 UTC (rev 8263)
+++ 
gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_max.py   
    2008-04-24 06:08:47 UTC (rev 8264)
@@ -50,7 +50,21 @@
         result_data = dst.data()
         self.assertEqual(expected_result, result_data)
 
+    def test_002(self):
 
+       src_data=(-100,-99,-98,-97,-96,-1)
+       expected_result = (float(max(src_data)), )
+
+       src = gr.vector_source_f(src_data)
+       s2v = gr.stream_to_vector(gr.sizeof_float, len(src_data))
+       op = gr.max_ff( len(src_data) )
+       dst = gr.vector_sink_f()
+
+       self.fg.connect(src, s2v, op, dst)
+       self.fg.run()
+       result_data = dst.data()
+       self.assertEqual(expected_result, result_data)
+
 if __name__ == '__main__':
     gr_unittest.main ()