1 files changed, 116 insertions, 2 deletions
diff --git a/gr-blocks/python/blocks/qa_max.py b/gr-blocks/python/blocks/qa_max.py
index 441582ac88..709dbee72e 100755
--- a/gr-blocks/python/blocks/qa_max.py
+++ b/gr-blocks/python/blocks/qa_max.py
@@ -46,7 +46,7 @@ class test_max(gr_unittest.TestCase):
         result_data = dst.data()
         self.assertEqual(expected_result, result_data)
 
-    def test_002(self):
+    def stest_002(self):
 	src_data=(-100,-99,-98,-97,-96,-1)
 	expected_result = (float(max(src_data)),)
 
@@ -60,6 +60,120 @@ class test_max(gr_unittest.TestCase):
 	result_data = dst.data()
 	self.assertEqual(expected_result, result_data)
 
+    def stest_003(self):
+        src_data0 = (0, 2, -3, 0, 12, 0)
+        src_data1 = (1, 1,  1, 1,  1, 1)
+
+        expected_result = [float(max(x,y)) for x,y in zip(src_data0, src_data1)]
+
+        src0 = blocks.vector_source_f(src_data0)
+        src1 = blocks.vector_source_f(src_data1)
+        op = blocks.max_ff(1)
+        dst = blocks.vector_sink_f()
+
+        self.tb.connect(src0, (op, 0))
+        self.tb.connect(src1, (op, 1))
+        self.tb.connect(op, dst)
+        self.tb.run()
+        result_data = dst.data()
+        self.assertEqual(expected_result, result_data)
+
+    def stest_004(self):
+        dim = 2
+        src_data0 = (0, 2, -3, 0, 12, 0)
+        src_data1 = (1, 1,  1, 1,  1, 1)
+
+        expected_data = []
+        tmp = [float(max(x,y)) for x,y in zip(src_data0, src_data1)]
+        for i in xrange(len(tmp)/dim):
+            expected_data.append(float(max(tmp[i*dim:(i+1)*dim])))
+
+        src0 = blocks.vector_source_f(src_data0)
+        s2v0 = blocks.stream_to_vector(gr.sizeof_float,dim)
+        src1 = blocks.vector_source_f(src_data1)
+        s2v1 = blocks.stream_to_vector(gr.sizeof_float,dim)
+        op = blocks.max_ff(dim)
+        dst = blocks.vector_sink_f()
+
+        self.tb.connect(src0, s2v0, (op, 0))
+        self.tb.connect(src1, s2v1, (op, 1))
+        self.tb.connect(op, dst)
+        self.tb.run()
+        result_data = dst.data()
+        self.assertEqual(expected_result, result_data)
+
+
+    def stest_s001(self):
+        src_data = (0, 2, -3, 0, 12, 0)
+        expected_result = (max(src_data),)
+
+        src = blocks.vector_source_s(src_data)
+        s2v = blocks.stream_to_vector(gr.sizeof_short,len(src_data))
+        op = blocks.max_ss(len(src_data))
+        dst = blocks.vector_sink_s()
+
+        self.tb.connect(src, s2v, op, dst)
+        self.tb.run()
+        result_data = dst.data()
+        self.assertEqual(expected_result, result_data)
+
+    def stest_s002(self):
+	src_data=(-100,-99,-98,-97,-96,-1)
+	expected_result = (max(src_data),)
+
+	src = blocks.vector_source_s(src_data)
+	s2v = blocks.stream_to_vector(gr.sizeof_short, len(src_data))
+	op = blocks.max_ss(len(src_data))
+	dst = blocks.vector_sink_s()
+
+	self.tb.connect(src, s2v, op, dst)
+	self.tb.run()
+	result_data = dst.data()
+	self.assertEqual(expected_result, result_data)
+
+
+    def stest_s003(self):
+        src_data0 = (0, 2, -3, 0, 12, 0)
+        src_data1 = (1, 1,  1, 1,  1, 1)
+
+        expected_result = [max(x,y) for x,y in zip(src_data0, src_data1)]
+
+        src0 = blocks.vector_source_s(src_data0)
+        src1 = blocks.vector_source_s(src_data1)
+        op = blocks.max_ss(1)
+        dst = blocks.vector_sink_s()
+
+        self.tb.connect(src0, (op, 0))
+        self.tb.connect(src1, (op, 1))
+        self.tb.connect(op, dst)
+        self.tb.run()
+        result_data = dst.data()
+        self.assertEqual(expected_result, result_data)
+
+    def stest_s004(self):
+        dim = 2
+        src_data0 = (0, 2, -3, 0, 12, 0)
+        src_data1 = (1, 1,  1, 1,  1, 1)
+
+        expected_data = []
+        tmp = [max(x,y) for x,y in zip(src_data0, src_data1)]
+        for i in xrange(len(tmp)/dim):
+            expected_data.append(max(tmp[i*dim:(i+1)*dim]))
+
+        src0 = blocks.vector_source_s(src_data0)
+        s2v0 = blocks.stream_to_vector(gr.sizeof_short,dim)
+        src1 = blocks.vector_source_s(src_data1)
+        s2v1 = blocks.stream_to_vector(gr.sizeof_short,dim)
+        op = blocks.max_ss(dim)
+        dst = blocks.vector_sink_s()
+
+        self.tb.connect(src0, s2v0, (op, 0))
+        self.tb.connect(src1, s2v1, (op, 1))
+        self.tb.connect(op, dst)
+        self.tb.run()
+        result_data = dst.data()
+        self.assertEqual(expected_result, result_data)
+
+
 if __name__ == '__main__':
     gr_unittest.run(test_max, "test_max.xml")
-