summaryrefslogtreecommitdiff
path: root/gr-blocks/python
diff options
context:
space:
mode:
authorJohnathan Corgan2012-06-14 10:09:14 -0700
committerJohnathan Corgan2012-06-14 10:09:14 -0700
commit6a2d514fab10f692d49f724d1d09afce1c603fa0 (patch)
tree301bb37ed3158e4506cb206f5c18ade499da633c /gr-blocks/python
parent926f7cba99c4fa3906853e11ff4e91eea93a5a53 (diff)
downloadgnuradio-6a2d514fab10f692d49f724d1d09afce1c603fa0.tar.gz
gnuradio-6a2d514fab10f692d49f724d1d09afce1c603fa0.tar.bz2
gnuradio-6a2d514fab10f692d49f724d1d09afce1c603fa0.zip
blocks: added multiply_xx, some cleanup on add_xx
Diffstat (limited to 'gr-blocks/python')
-rwxr-xr-xgr-blocks/python/qa_add_and_friends.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/gr-blocks/python/qa_add_and_friends.py b/gr-blocks/python/qa_add_and_friends.py
index f38c135f2..0c8a91ce9 100755
--- a/gr-blocks/python/qa_add_and_friends.py
+++ b/gr-blocks/python/qa_add_and_friends.py
@@ -134,12 +134,12 @@ class test_add_and_friends(gr_unittest.TestCase):
expected_result = (-3-7j, 0+0j, 3+7j, 6+14j, 9+21j)
op = gr.multiply_const_cc(5+2j)
self.help_cc((src_data,), expected_result, op)
-
+ """
def test_mult_ii(self):
src1_data = (1, 2, 3, 4, 5)
src2_data = (8, -3, 4, 8, 2)
expected_result = (8, -6, 12, 32, 10)
- op = gr.multiply_ii()
+ op = blocks_swig.multiply_ii()
self.help_ii((src1_data, src2_data),
expected_result, op)
@@ -147,7 +147,7 @@ class test_add_and_friends(gr_unittest.TestCase):
src1_data = (1, 2, 3, 4, 5)
src2_data = (8, -3, 4, 8, 2)
expected_result = (8, -6, 12, 32, 10)
- op = gr.multiply_ff()
+ op = blocks_swig.multiply_ff()
self.help_ff((src1_data, src2_data),
expected_result, op)
@@ -155,10 +155,10 @@ class test_add_and_friends(gr_unittest.TestCase):
src1_data = (1+1j, 2+2j, 3+3j, 4+4j, 5+5j)
src2_data = (8, -3, 4, 8, 2)
expected_result = (8+8j, -6-6j, 12+12j, 32+32j, 10+10j)
- op = gr.multiply_cc()
+ op = blocks_swig.multiply_cc()
self.help_cc((src1_data, src2_data),
expected_result, op)
-
+ """
def test_sub_ii_1(self):
src1_data = (1, 2, 3, 4, 5)
expected_result = (-1, -2, -3, -4, -5)