diff options
| author | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-05-28 17:04:09 +0000 |
|---|---|---|
| committer | jcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5> | 2007-05-28 17:04:09 +0000 |
| commit | 9880e7bb383054aa43681b52ebd33c8fd4cb8fcb (patch) | |
| tree | c9cd097baefda9ec392da2944fb799cbffabaa40 /gnuradio-core/src/python/gnuradio/blksimpl | |
| parent | f29776e2c39c06c958e7b4dfeae8883b47305969 (diff) | |
Merged r5547:5542 from jcorgan/num into trunk. Converts from using Python Numeric to numpy. Trunk passes distcheck. gr-radio-astronomy still needs conversion.
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@5553 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src/python/gnuradio/blksimpl')
11 files changed, 11 insertions, 22 deletions
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/cpm.py b/gnuradio-core/src/python/gnuradio/blksimpl/cpm.py index e6da34a1fd..8463c2c8a6 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/cpm.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/cpm.py @@ -2,7 +2,7 @@ # CPM modulation and demodulation. # # -# Copyright 2005,2006 Free Software Foundation, Inc. +# Copyright 2005,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -27,7 +27,7 @@ from gnuradio import gr from gnuradio import modulation_utils from math import pi -import Numeric +import numpy from pprint import pprint import inspect @@ -39,7 +39,7 @@ _def_h_denominator = 2 _def_cpm_type = 0 # 0=CPFSK, 1=GMSK, 2=RC, 3=GENERAL _def_bt = 0.35 _def_symbols_per_pulse = 1 -_def_generic_taps = Numeric.empty(1) +_def_generic_taps = numpy.empty(1) _def_verbose = False _def_log = False @@ -113,13 +113,13 @@ class cpm_mod(gr.hier_block): else: raise TypeError, ("cpm_type must be an integer in {0,1,2,3}, is %r" % (cpm_type,)) - self._generic_taps=Numeric.array(generic_taps) + self._generic_taps=numpy.array(generic_taps) if not isinstance(samples_per_symbol, int) or samples_per_symbol < 2: raise TypeError, ("samples_per_symbol must be an integer >= 2, is %r" % (samples_per_symbol,)) self.nsymbols = 2**bits_per_symbol - self.sym_alphabet=Numeric.arrayrange(-(self.nsymbols-1),self.nsymbols,2) + self.sym_alphabet=numpy.arange(-(self.nsymbols-1),self.nsymbols,2) self.ntaps = self._symbols_per_pulse * samples_per_symbol @@ -143,10 +143,10 @@ class cpm_mod(gr.hier_block): self.ntaps # number of taps ) sqwave = (1,) * samples_per_symbol # rectangular window - self.taps = Numeric.convolve(Numeric.array(gaussian_taps),Numeric.array(sqwave)) + self.taps = numpy.convolve(numpy.array(gaussian_taps),numpy.array(sqwave)) elif cpm_type == 2: # Raised Cosine # generalize it for arbitrary roll-off factor - self.taps = (1-Numeric.cos(2*pi*Numeric.arrayrange(0,self.ntaps)/samples_per_symbol/self._symbols_per_pulse))/(2*self._symbols_per_pulse) + self.taps = (1-numpy.cos(2*pi*numpy.arange(0,self.ntaps)/samples_per_symbol/self._symbols_per_pulse))/(2*self._symbols_per_pulse) elif cpm_type == 3: # Generic CPM self.taps = generic_taps else: diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py b/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py index 42839a0c35..87cde7df5b 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/d8psk.py @@ -1,5 +1,5 @@ # -# Copyright 2005,2006 Free Software Foundation, Inc. +# Copyright 2005,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -29,7 +29,6 @@ from gnuradio import gr, gru, modulation_utils from math import pi, sqrt import psk import cmath -import Numeric from pprint import pprint # default values (used in __init__ and add_options) diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py b/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py index 28fb426637..f6cd4ae32a 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/dbpsk.py @@ -29,7 +29,6 @@ from gnuradio import gr, gru, modulation_utils from math import pi, sqrt import psk import cmath -import Numeric from pprint import pprint # default values (used in __init__ and add_options) diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py b/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py index b6701ef9f6..5a43e67569 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/dqpsk.py @@ -29,7 +29,6 @@ from gnuradio import gr, gru, modulation_utils from math import pi, sqrt import psk import cmath -import Numeric from pprint import pprint # default values (used in __init__ and add_options) diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py b/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py index 29bf8e1442..2bc4f2d956 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/gmsk.py @@ -27,7 +27,7 @@ from gnuradio import gr from gnuradio import modulation_utils from math import pi -import Numeric +import numpy from pprint import pprint import inspect @@ -96,7 +96,7 @@ class gmsk_mod(gr.hier_block): ) self.sqwave = (1,) * samples_per_symbol # rectangular window - self.taps = Numeric.convolve(Numeric.array(self.gaussian_taps),Numeric.array(self.sqwave)) + self.taps = numpy.convolve(numpy.array(self.gaussian_taps),numpy.array(self.sqwave)) self.gaussian_filter = gr.interp_fir_filter_fff(samples_per_symbol, self.taps) # FM modulation diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py b/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py index d72bc14a78..355455da18 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/ofdm_pkt.py @@ -1,5 +1,5 @@ # -# Copyright 2005,2006 Free Software Foundation, Inc. +# Copyright 2005,2006,2007 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -20,8 +20,6 @@ # from math import pi -import Numeric - from gnuradio import gr, ofdm_packet_utils import gnuradio.gr.gr_threading as _threading diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/pkt.py b/gnuradio-core/src/python/gnuradio/blksimpl/pkt.py index 96b48657f6..823a10795a 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/pkt.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/pkt.py @@ -20,8 +20,6 @@ # from math import pi -import Numeric - from gnuradio import gr, packet_utils import gnuradio.gr.gr_threading as _threading diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/qam16.py b/gnuradio-core/src/python/gnuradio/blksimpl/qam16.py index c04a287431..e7379f98cd 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/qam16.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/qam16.py @@ -29,7 +29,6 @@ from gnuradio import gr, gru, modulation_utils from math import pi, sqrt import qam import cmath -import Numeric from pprint import pprint # default values (used in __init__ and add_options) diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/qam256.py b/gnuradio-core/src/python/gnuradio/blksimpl/qam256.py index 66d1158a6d..822a3a5107 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/qam256.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/qam256.py @@ -29,7 +29,6 @@ from gnuradio import gr, gru, modulation_utils from math import pi, sqrt import qam import cmath -import Numeric from pprint import pprint # default values (used in __init__ and add_options) diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/qam64.py b/gnuradio-core/src/python/gnuradio/blksimpl/qam64.py index cadded6de0..7b2ab107f9 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/qam64.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/qam64.py @@ -29,7 +29,6 @@ from gnuradio import gr, gru, modulation_utils from math import pi, sqrt import qam import cmath -import Numeric from pprint import pprint # default values (used in __init__ and add_options) diff --git a/gnuradio-core/src/python/gnuradio/blksimpl/qam8.py b/gnuradio-core/src/python/gnuradio/blksimpl/qam8.py index e1895a4b3d..44cfee763f 100644 --- a/gnuradio-core/src/python/gnuradio/blksimpl/qam8.py +++ b/gnuradio-core/src/python/gnuradio/blksimpl/qam8.py @@ -29,7 +29,6 @@ from gnuradio import gr, gru, modulation_utils from math import pi, sqrt import qam import cmath -import Numeric from pprint import pprint # default values (used in __init__ and add_options) |