blocks: removes blocks moved to gr-blocks from gnuradio-core.

Also fixes up some other missing moves.
author: Tom Rondeau <trondeau@vt.edu> 2012-12-21 15:11:39 -0500
committer: Tom Rondeau <trondeau@vt.edu> 2012-12-21 21:19:13 -0500
commit: 55d3e4a47958be287648a2021f7e92d81086b2d9 (patch)
tree: ae0195c457f2cf2734376679cc88c2d728040680 /gr-blocks/python/qa_add_mult_v.py
parent: fa781237f341a74a243a9fb930daee7e62c3a682 (diff)
1 files changed, 49 insertions, 49 deletions
diff --git a/gr-blocks/python/qa_add_mult_v.py b/gr-blocks/python/qa_add_mult_v.py
index d362cb8859..13cb71df2c 100755
--- a/gr-blocks/python/qa_add_mult_v.py
+++ b/gr-blocks/python/qa_add_mult_v.py
@@ -21,7 +21,7 @@
 #
 
 from gnuradio import gr, gr_unittest
-import blocks_swig
+import blocks_swig as blocks
 
 class test_add_mult_v(gr_unittest.TestCase):
 
@@ -34,10 +34,10 @@ class test_add_mult_v(gr_unittest.TestCase):
     def help_ss(self, size, src_data, exp_data, op):
         for s in zip(range (len (src_data)), src_data):
             src = gr.vector_source_s(s[1])
-	    srcv = gr.stream_to_vector(gr.sizeof_short, size)
+	    srcv = blocks.stream_to_vector(gr.sizeof_short, size)
 	    self.tb.connect(src, srcv)
             self.tb.connect(srcv, (op, s[0]))
-	rhs = gr.vector_to_stream(gr.sizeof_short, size)
+	rhs = blocks.vector_to_stream(gr.sizeof_short, size)
         dst = gr.vector_sink_s()
         self.tb.connect(op, rhs, dst)
         self.tb.run()
@@ -47,10 +47,10 @@ class test_add_mult_v(gr_unittest.TestCase):
     def help_ii(self, size, src_data, exp_data, op):
         for s in zip(range (len (src_data)), src_data):
             src = gr.vector_source_i(s[1])
-	    srcv = gr.stream_to_vector(gr.sizeof_int, size)
+	    srcv = blocks.stream_to_vector(gr.sizeof_int, size)
 	    self.tb.connect(src, srcv)
             self.tb.connect(srcv, (op, s[0]))
-	rhs = gr.vector_to_stream(gr.sizeof_int, size)
+	rhs = blocks.vector_to_stream(gr.sizeof_int, size)
         dst = gr.vector_sink_i()
         self.tb.connect(op, rhs, dst)
         self.tb.run()
@@ -60,10 +60,10 @@ class test_add_mult_v(gr_unittest.TestCase):
     def help_ff(self, size, src_data, exp_data, op):
         for s in zip(range (len (src_data)), src_data):
             src = gr.vector_source_f(s[1])
-	    srcv = gr.stream_to_vector(gr.sizeof_float, size)
+	    srcv = blocks.stream_to_vector(gr.sizeof_float, size)
 	    self.tb.connect(src, srcv)
             self.tb.connect(srcv, (op, s[0]))
-	rhs = gr.vector_to_stream(gr.sizeof_float, size)
+	rhs = blocks.vector_to_stream(gr.sizeof_float, size)
         dst = gr.vector_sink_f()
         self.tb.connect(op, rhs, dst)
         self.tb.run()
@@ -73,10 +73,10 @@ class test_add_mult_v(gr_unittest.TestCase):
     def help_cc(self, size, src_data, exp_data, op):
         for s in zip(range (len (src_data)), src_data):
             src = gr.vector_source_c(s[1])
-	    srcv = gr.stream_to_vector(gr.sizeof_gr_complex, size)
+	    srcv = blocks.stream_to_vector(gr.sizeof_gr_complex, size)
 	    self.tb.connect(src, srcv)
             self.tb.connect(srcv, (op, s[0]))
-	rhs = gr.vector_to_stream(gr.sizeof_gr_complex, size)
+	rhs = blocks.vector_to_stream(gr.sizeof_gr_complex, size)
         dst = gr.vector_sink_c()
         self.tb.connect(op, rhs, dst)
         self.tb.run()
@@ -85,8 +85,8 @@ class test_add_mult_v(gr_unittest.TestCase):
 
     def help_const_ss(self, src_data, exp_data, op):
 	src = gr.vector_source_s(src_data)
-	srcv = gr.stream_to_vector(gr.sizeof_short, len(src_data))
-	rhs = gr.vector_to_stream(gr.sizeof_short, len(src_data))
+	srcv = blocks.stream_to_vector(gr.sizeof_short, len(src_data))
+	rhs = blocks.vector_to_stream(gr.sizeof_short, len(src_data))
         dst = gr.vector_sink_s()
         self.tb.connect(src, srcv, op, rhs, dst)
         self.tb.run()
@@ -95,8 +95,8 @@ class test_add_mult_v(gr_unittest.TestCase):
 
     def help_const_ii(self, src_data, exp_data, op):
 	src = gr.vector_source_i(src_data)
-	srcv = gr.stream_to_vector(gr.sizeof_int, len(src_data))
-	rhs = gr.vector_to_stream(gr.sizeof_int, len(src_data))
+	srcv = blocks.stream_to_vector(gr.sizeof_int, len(src_data))
+	rhs = blocks.vector_to_stream(gr.sizeof_int, len(src_data))
         dst = gr.vector_sink_i()
         self.tb.connect(src, srcv, op, rhs, dst)
         self.tb.run()
@@ -105,8 +105,8 @@ class test_add_mult_v(gr_unittest.TestCase):
 
     def help_const_ff(self, src_data, exp_data, op):
 	src = gr.vector_source_f(src_data)
-	srcv = gr.stream_to_vector(gr.sizeof_float, len(src_data))
-	rhs = gr.vector_to_stream(gr.sizeof_float, len(src_data))
+	srcv = blocks.stream_to_vector(gr.sizeof_float, len(src_data))
+	rhs = blocks.vector_to_stream(gr.sizeof_float, len(src_data))
         dst = gr.vector_sink_f()
         self.tb.connect(src, srcv, op, rhs, dst)
         self.tb.run()
@@ -115,8 +115,8 @@ class test_add_mult_v(gr_unittest.TestCase):
 
     def help_const_cc(self, src_data, exp_data, op):
 	src = gr.vector_source_c(src_data)
-	srcv = gr.stream_to_vector(gr.sizeof_gr_complex, len(src_data))
-	rhs = gr.vector_to_stream(gr.sizeof_gr_complex, len(src_data))
+	srcv = blocks.stream_to_vector(gr.sizeof_gr_complex, len(src_data))
+	rhs = blocks.vector_to_stream(gr.sizeof_gr_complex, len(src_data))
         dst = gr.vector_sink_c()
         self.tb.connect(src, srcv, op, rhs, dst)
         self.tb.run()
@@ -130,7 +130,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (2,)
 	src3_data = (3,)
 	expected_result = (6,)
-	op = blocks_swig.add_ss(1)
+	op = blocks.add_ss(1)
 	self.help_ss(1, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_add_vss_five(self):
@@ -138,7 +138,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (6, 7, 8, 9, 10)
 	src3_data = (11, 12, 13, 14, 15)
 	expected_result = (18, 21, 24, 27, 30)
-	op = blocks_swig.add_ss(5)
+	op = blocks.add_ss(5)
 	self.help_ss(5, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_add_vii_one(self):
@@ -146,7 +146,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (2,)
 	src3_data = (3,)
 	expected_result = (6,)
-	op = blocks_swig.add_ii(1)
+	op = blocks.add_ii(1)
 	self.help_ii(1, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_add_vii_five(self):
@@ -154,7 +154,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (6, 7, 8, 9, 10)
 	src3_data = (11, 12, 13, 14, 15)
 	expected_result = (18, 21, 24, 27, 30)
-	op = blocks_swig.add_ii(5)
+	op = blocks.add_ii(5)
 	self.help_ii(5, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_add_vff_one(self):
@@ -162,7 +162,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (2.0,)
 	src3_data = (3.0,)
 	expected_result = (6.0,)
-	op = blocks_swig.add_ff(1)
+	op = blocks.add_ff(1)
 	self.help_ff(1, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_add_vff_five(self):
@@ -170,7 +170,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (6.0, 7.0, 8.0, 9.0, 10.0)
 	src3_data = (11.0, 12.0, 13.0, 14.0, 15.0)
 	expected_result = (18.0, 21.0, 24.0, 27.0, 30.0)
-	op = blocks_swig.add_ff(5)
+	op = blocks.add_ff(5)
 	self.help_ff(5, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_add_vcc_one(self):
@@ -178,7 +178,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (3.0+4.0j,)
 	src3_data = (5.0+6.0j,)
 	expected_result = (9.0+12j,)
-	op = blocks_swig.add_cc(1)
+	op = blocks.add_cc(1)
 	self.help_cc(1, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_add_vcc_five(self):
@@ -186,56 +186,56 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (11.0+12.0j, 13.0+14.0j, 15.0+16.0j, 17.0+18.0j, 19.0+20.0j)
 	src3_data = (21.0+22.0j, 23.0+24.0j, 25.0+26.0j, 27.0+28.0j, 29.0+30.0j)
 	expected_result = (33.0+36.0j, 39.0+42.0j, 45.0+48.0j, 51.0+54.0j, 57.0+60.0j)
-	op = blocks_swig.add_cc(5)
+	op = blocks.add_cc(5)
 	self.help_cc(5, (src1_data, src2_data, src3_data), expected_result, op)
 
     # add_const_vXX
 
     def test_add_const_vss_one(self):
 	src_data = (1,)
-	op = blocks_swig.add_const_vss((2,))
+	op = blocks.add_const_vss((2,))
 	exp_data = (3,)
 	self.help_const_ss(src_data, exp_data, op)
 
     def test_add_const_vss_five(self):
 	src_data = (1, 2, 3, 4, 5)
-	op = blocks_swig.add_const_vss((6, 7, 8, 9, 10))
+	op = blocks.add_const_vss((6, 7, 8, 9, 10))
 	exp_data = (7, 9, 11, 13, 15)
 	self.help_const_ss(src_data, exp_data, op)
 
     def test_add_const_vii_one(self):
 	src_data = (1,)
-	op = blocks_swig.add_const_vii((2,))
+	op = blocks.add_const_vii((2,))
 	exp_data = (3,)
 	self.help_const_ii(src_data, exp_data, op)
 
     def test_add_const_vii_five(self):
 	src_data = (1, 2, 3, 4, 5)
-	op = blocks_swig.add_const_vii((6, 7, 8, 9, 10))
+	op = blocks.add_const_vii((6, 7, 8, 9, 10))
 	exp_data = (7, 9, 11, 13, 15)
 	self.help_const_ii(src_data, exp_data, op)
 
     def test_add_const_vff_one(self):
 	src_data = (1.0,)
-	op = blocks_swig.add_const_vff((2.0,))
+	op = blocks.add_const_vff((2.0,))
 	exp_data = (3.0,)
 	self.help_const_ff(src_data, exp_data, op)
 
     def test_add_const_vff_five(self):
 	src_data = (1.0, 2.0, 3.0, 4.0, 5.0)
-	op = blocks_swig.add_const_vff((6.0, 7.0, 8.0, 9.0, 10.0))
+	op = blocks.add_const_vff((6.0, 7.0, 8.0, 9.0, 10.0))
 	exp_data = (7.0, 9.0, 11.0, 13.0, 15.0)
 	self.help_const_ff(src_data, exp_data, op)
 
     def test_add_const_vcc_one(self):
 	src_data = (1.0+2.0j,)
-	op = blocks_swig.add_const_vcc((2.0+3.0j,))
+	op = blocks.add_const_vcc((2.0+3.0j,))
 	exp_data = (3.0+5.0j,)
 	self.help_const_cc(src_data, exp_data, op)
 
     def test_add_const_vcc_five(self):
 	src_data = (1.0+2.0j, 3.0+4.0j, 5.0+6.0j, 7.0+8.0j, 9.0+10.0j)
-	op = blocks_swig.add_const_vcc((11.0+12.0j, 13.0+14.0j, 15.0+16.0j, 17.0+18.0j, 19.0+20.0j))
+	op = blocks.add_const_vcc((11.0+12.0j, 13.0+14.0j, 15.0+16.0j, 17.0+18.0j, 19.0+20.0j))
 	exp_data = (12.0+14.0j, 16.0+18.0j, 20.0+22.0j, 24.0+26.0j, 28.0+30.0j)
 	self.help_const_cc(src_data, exp_data, op)
 
@@ -246,7 +246,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (2,)
 	src3_data = (3,)
 	expected_result = (6,)
-	op = gr.multiply_vss(1)
+	op = blocks.multiply_ss(1)
 	self.help_ss(1, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_multiply_vss_five(self):
@@ -254,7 +254,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (6, 7, 8, 9, 10)
 	src3_data = (11, 12, 13, 14, 15)
 	expected_result = (66, 168, 312, 504, 750)
-	op = gr.multiply_vss(5)
+	op = blocks.multiply_ss(5)
 	self.help_ss(5, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_multiply_vii_one(self):
@@ -262,7 +262,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (2,)
 	src3_data = (3,)
 	expected_result = (6,)
-	op = gr.multiply_vii(1)
+	op = blocks.multiply_ii(1)
 	self.help_ii(1, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_multiply_vii_five(self):
@@ -270,7 +270,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (6, 7, 8, 9, 10)
 	src3_data = (11, 12, 13, 14, 15)
 	expected_result = (66, 168, 312, 504, 750)
-	op = gr.multiply_vii(5)
+	op = blocks.multiply_ii(5)
 	self.help_ii(5, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_multiply_vff_one(self):
@@ -278,7 +278,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (2.0,)
 	src3_data = (3.0,)
 	expected_result = (6.0,)
-	op = gr.multiply_vff(1)
+	op = blocks.multiply_ff(1)
 	self.help_ff(1, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_multiply_vff_five(self):
@@ -286,7 +286,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (6.0, 7.0, 8.0, 9.0, 10.0)
 	src3_data = (11.0, 12.0, 13.0, 14.0, 15.0)
 	expected_result = (66.0, 168.0, 312.0, 504.0, 750.0)
-	op = gr.multiply_vff(5)
+	op = blocks.multiply_ff(5)
 	self.help_ff(5, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_multiply_vcc_one(self):
@@ -294,7 +294,7 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (3.0+4.0j,)
 	src3_data = (5.0+6.0j,)
 	expected_result = (-85+20j,)
-	op = gr.multiply_vcc(1)
+	op = blocks.multiply_cc(1)
 	self.help_cc(1, (src1_data, src2_data, src3_data), expected_result, op)
 
     def test_multiply_vcc_five(self):
@@ -302,56 +302,56 @@ class test_add_mult_v(gr_unittest.TestCase):
 	src2_data = (11.0+12.0j, 13.0+14.0j, 15.0+16.0j, 17.0+18.0j, 19.0+20.0j)
 	src3_data = (21.0+22.0j, 23.0+24.0j, 25.0+26.0j, 27.0+28.0j, 29.0+30.0j)
 	expected_result = (-1021.0+428.0j, -2647.0+1754.0j, -4945.0+3704.0j, -8011.0+6374.0j, -11941.0+9860.0j)
-	op = gr.multiply_vcc(5)
+	op = blocks.multiply_cc(5)
 	self.help_cc(5, (src1_data, src2_data, src3_data), expected_result, op)
 
     # multiply_const_vXX
 
     def test_multiply_const_vss_one(self):
 	src_data = (2,)
-	op = gr.multiply_const_vss((3,))
+	op = blocks.multiply_const_vss((3,))
 	exp_data = (6,)
 	self.help_const_ss(src_data, exp_data, op)
 
     def test_multiply_const_vss_five(self):
 	src_data = (1, 2, 3, 4, 5)
-	op = gr.multiply_const_vss((6, 7, 8, 9, 10))
+	op = blocks.multiply_const_vss((6, 7, 8, 9, 10))
 	exp_data = (6, 14, 24, 36, 50)
 	self.help_const_ss(src_data, exp_data, op)
 
     def test_multiply_const_vii_one(self):
 	src_data = (2,)
-	op = gr.multiply_const_vii((3,))
+	op = blocks.multiply_const_vii((3,))
 	exp_data = (6,)
 	self.help_const_ii(src_data, exp_data, op)
 
     def test_multiply_const_vii_five(self):
 	src_data = (1, 2, 3, 4, 5)
-	op = gr.multiply_const_vii((6, 7, 8, 9, 10))
+	op = blocks.multiply_const_vii((6, 7, 8, 9, 10))
 	exp_data = (6, 14, 24, 36, 50)
 	self.help_const_ii(src_data, exp_data, op)
 
     def test_multiply_const_vff_one(self):
 	src_data = (2.0,)
-	op = gr.multiply_const_vff((3.0,))
+	op = blocks.multiply_const_vff((3.0,))
 	exp_data = (6.0,)
 	self.help_const_ff(src_data, exp_data, op)
 
     def test_multiply_const_vff_five(self):
 	src_data = (1.0, 2.0, 3.0, 4.0, 5.0)
-	op = gr.multiply_const_vff((6.0, 7.0, 8.0, 9.0, 10.0))
+	op = blocks.multiply_const_vff((6.0, 7.0, 8.0, 9.0, 10.0))
 	exp_data = (6.0, 14.0, 24.0, 36.0, 50.0)
 	self.help_const_ff(src_data, exp_data, op)
 
     def test_multiply_const_vcc_one(self):
 	src_data = (1.0+2.0j,)
-	op = gr.multiply_const_vcc((2.0+3.0j,))
+	op = blocks.multiply_const_vcc((2.0+3.0j,))
 	exp_data = (-4.0+7.0j,)
 	self.help_const_cc(src_data, exp_data, op)
 
     def test_multiply_const_vcc_five(self):
 	src_data = (1.0+2.0j, 3.0+4.0j, 5.0+6.0j, 7.0+8.0j, 9.0+10.0j)
-	op = gr.multiply_const_vcc((11.0+12.0j, 13.0+14.0j, 15.0+16.0j, 17.0+18.0j, 19.0+20.0j))
+	op = blocks.multiply_const_vcc((11.0+12.0j, 13.0+14.0j, 15.0+16.0j, 17.0+18.0j, 19.0+20.0j))
 	exp_data = (-13.0+34.0j, -17.0+94.0j, -21.0+170.0j, -25.0+262.0j, -29.0+370.0j)
 	self.help_const_cc(src_data, exp_data, op)
author	Tom Rondeau <trondeau@vt.edu>	2012-12-21 15:11:39 -0500
committer	Tom Rondeau <trondeau@vt.edu>	2012-12-21 21:19:13 -0500
commit	55d3e4a47958be287648a2021f7e92d81086b2d9 (patch)
tree	ae0195c457f2cf2734376679cc88c2d728040680 /gr-blocks/python/qa_add_mult_v.py
parent	fa781237f341a74a243a9fb930daee7e62c3a682 (diff)