Changeset 8264

Show
Ignore:
Timestamp:
04/24/08 00:08:47
Author:
jcorgan
Message:

Applied changeset r8186:8189 on trunk to release branch, with modification.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_argmax_XX.cc.t

    r6044 r8264  
    5858        for (int i=0; i<noutput_items; i++) { 
    5959 
    60                 @I_TYPE@ max = 0
     60                @I_TYPE@ max = ((@I_TYPE@ *) input_items[0])[i*d_vlen]
    6161                int x = 0; 
    6262                int y = 0; 
  • gnuradio/branches/releases/3.1/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t

    r6044 r8264  
    5555        for (int i=0; i<noutput_items; i++) { 
    5656 
    57                @I_TYPE@ max = 0
     57                @I_TYPE@ max = ((@I_TYPE@ *) input_items[0])[i*d_vlen]
    5858                 
    5959                for (int j=0; j < (int) d_vlen; j++ ) { 
  • gnuradio/branches/releases/3.1/gnuradio-core/src/python/gnuradio/gr/qa_max.py

    r6044 r8264  
    5151        self.assertEqual(expected_result, result_data) 
    5252 
     53    def test_002(self): 
     54 
     55        src_data=(-100,-99,-98,-97,-96,-1) 
     56        expected_result = (float(max(src_data)), ) 
     57 
     58        src = gr.vector_source_f(src_data) 
     59        s2v = gr.stream_to_vector(gr.sizeof_float, len(src_data)) 
     60        op = gr.max_ff( len(src_data) ) 
     61        dst = gr.vector_sink_f() 
     62 
     63        self.fg.connect(src, s2v, op, dst) 
     64        self.fg.run() 
     65        result_data = dst.data() 
     66        self.assertEqual(expected_result, result_data) 
    5367 
    5468if __name__ == '__main__':