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
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
parent: f29776e2c39c06c958e7b4dfeae8883b47305969 (diff)
20 files changed, 32 insertions, 48 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)
diff --git a/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py b/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
index 2760eb77b9..0488461ba0 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.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/blksimpl2/dbpsk.py b/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
index 380fa54f21..4ff4e5aefb 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/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/blksimpl2/dqpsk.py b/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
index e9fc2092d3..31518e2d0b 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/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/blksimpl2/gmsk.py b/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
index bc601e6797..72b53ca6ed 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/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
 
@@ -97,7 +97,7 @@ class gmsk_mod(gr.hier_block2):
 		)
 
 	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/blksimpl2/pkt.py b/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
index c94c27338f..aa4b2c3457 100644
--- a/gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py
+++ b/gnuradio-core/src/python/gnuradio/blksimpl2/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/gruimpl/freqz.py b/gnuradio-core/src/python/gnuradio/gruimpl/freqz.py
index 66023e7884..27d4f4d719 100644
--- a/gnuradio-core/src/python/gnuradio/gruimpl/freqz.py
+++ b/gnuradio-core/src/python/gnuradio/gruimpl/freqz.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -54,9 +54,9 @@
 
 __all__ = ['freqz']
 
-import Numeric
-from Numeric import *
-Num=Numeric
+import numpy
+from numpy import *
+Num=numpy
 
 def atleast_1d(*arys):
     """ Force a sequence of arrays to each be at least 1D.
@@ -74,7 +74,7 @@ def atleast_1d(*arys):
     for ary in arys:
         ary = asarray(ary)
         if len(ary.shape) == 0: 
-            result = Numeric.array([ary[0]])
+            result = numpy.array([ary[0]])
         else:
             result = ary
         res.append(result)
@@ -101,7 +101,7 @@ def polyval(p,x):
         y = 0
     else:
         x = asarray(x)
-        y = Numeric.zeros(x.shape,x.typecode())
+        y = numpy.zeros(x.shape,x.typecode())
     for i in range(len(p)):
         y = x * y + p[i]
     return y
@@ -135,7 +135,7 @@ class poly1d:
             raise ValueError, "Polynomial must be 1d only."
         c_or_r = trim_zeros(c_or_r, trim='f')
         if len(c_or_r) == 0:
-            c_or_r = Numeric.array([0])
+            c_or_r = numpy.array([0])
         self.__dict__['coeffs'] = c_or_r
         self.__dict__['order'] = len(c_or_r) - 1
 
@@ -281,8 +281,8 @@ class poly1d:
         if key < 0:
             raise ValueError, "Does not support negative powers."
         if key > self.order:
-            zr = Numeric.zeros(key-self.order,self.coeffs.typecode())
-            self.__dict__['coeffs'] = Numeric.concatenate((zr,self.coeffs))
+            zr = numpy.zeros(key-self.order,self.coeffs.typecode())
+            self.__dict__['coeffs'] = numpy.concatenate((zr,self.coeffs))
             self.__dict__['order'] = key
             ind = 0
         self.__dict__['coeffs'][ind] = val
diff --git a/gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.py b/gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.py
index 45aa1faf80..ee94cbd0f6 100755
--- a/gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.py
+++ b/gnuradio-core/src/python/gnuradio/gruimpl/gnuplot_freqz.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2005 Free Software Foundation, Inc.
+# Copyright 2005,2007 Free Software Foundation, Inc.
 # 
 # This file is part of GNU Radio
 # 
@@ -25,7 +25,7 @@ __all__ = ['gnuplot_freqz']
 import tempfile
 import os
 import math
-import Numeric
+import numpy
 
 from gnuradio import gr
 from gnuradio.gruimpl.freqz import freqz
@@ -45,7 +45,7 @@ def gnuplot_freqz (hw, Fs=None, logfreq=False):
     cmd_file = os.popen ('gnuplot', 'w')
 
     h, w = hw
-    ampl = 20 * Numeric.log10 (Numeric.absolute (h) + 1e-9)
+    ampl = 20 * numpy.log10 (numpy.absolute (h) + 1e-9)
     phase = map (lambda x: math.atan2 (x.imag, x.real), h)
     
     if Fs:
diff --git a/gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py b/gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py
index c3700c7e8c..e2b26306cb 100644
--- a/gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py
+++ b/gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py
@@ -20,7 +20,7 @@
 # 
 
 import struct
-import Numeric
+import numpy
 from gnuradio import gru
 
 def conv_packed_binary_string_to_1_0_string(s):
@@ -84,7 +84,7 @@ def string_to_hex_list(s):
 
 
 def whiten(s, o):
-    sa = Numeric.fromstring(s, Numeric.UnsignedInt8)
+    sa = numpy.fromstring(s, numpy.uint8)
     z = sa ^ random_mask_vec8[o:len(sa)+o]
     return z.tostring()
 
@@ -444,5 +444,5 @@ random_mask_tuple = (
   199, 113, 146, 164, 109, 187, 109, 179, 109, 181, 237, 183,  13, 182, 133, 182, 
   227,  54, 201, 214, 214, 222, 222, 216,  88,  90, 186, 187,  51,  51, 255,  63 )
 
-random_mask_vec8 = Numeric.array(random_mask_tuple, Numeric.UnsignedInt8)
+random_mask_vec8 = numpy.array(random_mask_tuple, numpy.uint8)
 
diff --git a/gnuradio-core/src/python/gnuradio/packet_utils.py b/gnuradio-core/src/python/gnuradio/packet_utils.py
index f3552582e4..e4de621337 100644
--- a/gnuradio-core/src/python/gnuradio/packet_utils.py
+++ b/gnuradio-core/src/python/gnuradio/packet_utils.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,7 +20,7 @@
 # 
 
 import struct
-import Numeric
+import numpy
 from gnuradio import gru
 
 
@@ -87,7 +87,7 @@ def string_to_hex_list(s):
 
 
 def whiten(s, o):
-    sa = Numeric.fromstring(s, Numeric.UnsignedInt8)
+    sa = numpy.fromstring(s, numpy.uint8)
     z = sa ^ random_mask_vec8[o:len(sa)+o]
     return z.tostring()
 
@@ -451,5 +451,5 @@ random_mask_tuple = (
   199, 113, 146, 164, 109, 187, 109, 179, 109, 181, 237, 183,  13, 182, 133, 182, 
   227,  54, 201, 214, 214, 222, 222, 216,  88,  90, 186, 187,  51,  51, 255,  63 )
 
-random_mask_vec8 = Numeric.array(random_mask_tuple, Numeric.UnsignedInt8)
+random_mask_vec8 = numpy.array(random_mask_tuple, numpy.uint8)
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
parent	f29776e2c39c06c958e7b4dfeae8883b47305969 (diff)