From b91ae9949255f403b186fe5e6e8d0f3300f33cd0 Mon Sep 17 00:00:00 2001
From: n4hy <n4hy@221aa14e-8319-0410-a670-987f0aec2ac5>
Date: Fri, 11 Apr 2008 23:33:53 +0000
Subject: fixing bug in gr_max_XX.cc.t and modifying qa_max.py to test fix
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@8187 221aa14e-8319-0410-a670-987f0aec2ac5
---
gnuradio-core/src/lib/gengen/gr_max_XX.cc.t | 2 +-
gnuradio-core/src/python/gnuradio/gr/qa_max.py | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
(limited to 'gnuradio-core/src')
diff --git a/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t b/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t
index 26c44f44eb..ee88261f91 100644
--- a/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t
+++ b/gnuradio-core/src/lib/gengen/gr_max_XX.cc.t
@@ -54,7 +54,7 @@ int
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++) {
diff --git a/gnuradio-core/src/python/gnuradio/gr/qa_max.py b/gnuradio-core/src/python/gnuradio/gr/qa_max.py
index fdf118cd1b..0171c93db4 100755
--- a/gnuradio-core/src/python/gnuradio/gr/qa_max.py
+++ b/gnuradio-core/src/python/gnuradio/gr/qa_max.py
@@ -50,6 +50,20 @@ class test_sig_source (gr_unittest.TestCase):
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.tb.connect(src, s2v, op, dst)
+ self.tb.run()
+ result_data = dst.data()
+ self.assertEqual(expected_result, result_data)
if __name__ == '__main__':
gr_unittest.main ()
--
cgit v1.2.3