[Commit-gnuradio] gnuradio-core/src lib/general.cvsignore lib/gen...

[Robert McGwier]

CVSROOT:        /sources/gnuradio
Module name:    gnuradio-core
Changes by:     Robert McGwier <rwmcgwier>      06/06/16 05:44:37

Modified files:
        src/lib/general: .cvsignore Makefile.gen general_generated.i 
                         generate_common.py 
        src/python/gnuradio/gr: qa_add_v_and_friends.py 

Log message:
        multiply_constant-vXX templates correctly included.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/.cvsignore?cvsroot=gnuradio&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/Makefile.gen?cvsroot=gnuradio&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/general_generated.i?cvsroot=gnuradio&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/lib/general/generate_common.py?cvsroot=gnuradio&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py?cvsroot=gnuradio&r1=1.3&r2=1.4

Patches:
Index: lib/general/.cvsignore
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- lib/general/.cvsignore      16 Jun 2006 05:08:48 -0000      1.13
+++ lib/general/.cvsignore      16 Jun 2006 05:44:37 -0000      1.14
@@ -192,6 +192,18 @@
 gr_multiply_vss.cc
 gr_multiply_vss.h
 gr_multiply_vss.i
+gr_multiply_const_vcc.cc
+gr_multiply_const_vcc.h
+gr_multiply_const_vcc.i
+gr_multiply_const_vff.cc
+gr_multiply_const_vff.h
+gr_multiply_const_vff.i
+gr_multiply_const_vii.cc
+gr_multiply_const_vii.h
+gr_multiply_const_vii.i
+gr_multiply_const_vss.cc
+gr_multiply_const_vss.h
+gr_multiply_const_vss.i
 gr_noise_source_c.cc
 gr_noise_source_c.h 
 gr_noise_source_c.i 

Index: lib/general/Makefile.gen
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/Makefile.gen,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- lib/general/Makefile.gen    16 Jun 2006 05:08:48 -0000      1.10
+++ lib/general/Makefile.gen    16 Jun 2006 05:44:37 -0000      1.11
@@ -34,6 +34,10 @@
        gr_multiply_const_ff.h \
        gr_multiply_const_ii.h \
        gr_multiply_const_ss.h \
+       gr_multiply_const_vcc.h \
+       gr_multiply_const_vff.h \
+       gr_multiply_const_vii.h \
+       gr_multiply_const_vss.h \
        gr_multiply_ff.h \
        gr_multiply_ii.h \
        gr_multiply_ss.h \
@@ -107,6 +111,10 @@
        gr_multiply_const_ff.i \
        gr_multiply_const_ii.i \
        gr_multiply_const_ss.i \
+       gr_multiply_const_vcc.i \
+       gr_multiply_const_vff.i \
+       gr_multiply_const_vii.i \
+       gr_multiply_const_vss.i \
        gr_multiply_ff.i \
        gr_multiply_ii.i \
        gr_multiply_ss.i \
@@ -180,6 +188,10 @@
        gr_multiply_const_ff.cc \
        gr_multiply_const_ii.cc \
        gr_multiply_const_ss.cc \
+       gr_multiply_const_vcc.cc \
+       gr_multiply_const_vff.cc \
+       gr_multiply_const_vii.cc \
+       gr_multiply_const_vss.cc \
        gr_multiply_ff.cc \
        gr_multiply_ii.cc \
        gr_multiply_ss.cc \

Index: lib/general/general_generated.i
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/general_generated.i,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- lib/general/general_generated.i     16 Jun 2006 05:08:48 -0000      1.10
+++ lib/general/general_generated.i     16 Jun 2006 05:44:37 -0000      1.11
@@ -34,6 +34,10 @@
 #include <gr_multiply_const_ff.h>
 #include <gr_multiply_const_ii.h>
 #include <gr_multiply_const_ss.h>
+#include <gr_multiply_const_vcc.h>
+#include <gr_multiply_const_vff.h>
+#include <gr_multiply_const_vii.h>
+#include <gr_multiply_const_vss.h>
 #include <gr_multiply_ff.h>
 #include <gr_multiply_ii.h>
 #include <gr_multiply_ss.h>
@@ -107,6 +111,10 @@
 %include <gr_multiply_const_ff.i>
 %include <gr_multiply_const_ii.i>
 %include <gr_multiply_const_ss.i>
+%include <gr_multiply_const_vcc.i>
+%include <gr_multiply_const_vff.i>
+%include <gr_multiply_const_vii.i>
+%include <gr_multiply_const_vss.i>
 %include <gr_multiply_ff.i>
 %include <gr_multiply_ii.i>
 %include <gr_multiply_ss.i>

Index: lib/general/generate_common.py
===================================================================
RCS file: /sources/gnuradio/gnuradio-core/src/lib/general/generate_common.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- lib/general/generate_common.py      16 Jun 2006 05:08:48 -0000      1.11
+++ lib/general/generate_common.py      16 Jun 2006 05:44:37 -0000      1.12
@@ -49,7 +49,8 @@
     'gr_mute_XX',
     'gr_add_vXX',
     'gr_multiply_vXX',
-    'gr_add_const_vXX'
+    'gr_add_const_vXX',
+    'gr_multiply_const_vXX'
     ]
 
 # other blocks

Index: python/gnuradio/gr/qa_add_v_and_friends.py
===================================================================
RCS file: 
/sources/gnuradio/gnuradio-core/src/python/gnuradio/gr/qa_add_v_and_friends.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- python/gnuradio/gr/qa_add_v_and_friends.py  16 Jun 2006 05:08:48 -0000      
1.3
+++ python/gnuradio/gr/qa_add_v_and_friends.py  16 Jun 2006 05:44:37 -0000      
1.4
@@ -300,5 +300,54 @@
        op = gr.multiply_vcc(5)
        self.help_cc(5, (src1_data, src2_data, src3_data), expected_result, op)
 
+    def test_multiply_const_vss_one(self):
+       src_data = (2,)
+       op = gr.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))
+       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,))
+       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))
+       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,))
+       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))
+       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,))
+       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))
+       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)
+
+
 if __name__ == '__main__':
     gr_unittest.main ()