Bugfixes in mlab.py to coerce inputs into numpy arrays.

astraw · astraw · commit dbbdfcbf281c · 2007-07-12T18:31:15.000Z
svn path=/trunk/matplotlib/; revision=3505
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,5 @@
+2007-07-12 Bugfixes in mlab.py to coerce inputs into numpy arrays. -ADS
+
 2007-07-11 Added linespacing kwarg to text.Text - EF
 
 2007-07-11 Added code to store font paths in SVG files. - MGD
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -173,6 +173,8 @@ def psd(x, NFFT=256, Fs=2, detrend=detrend_none,
     if NFFT % 2:
         raise ValueError, 'NFFT must be a power of 2'
 
+    x = asarray(x) # make sure we're dealing with a numpy array
+
     # zero pad x up to NFFT if it is shorter than NFFT
     if len(x)<NFFT:
         n = len(x)
@@ -240,6 +242,9 @@ def csd(x, y, NFFT=256, Fs=2, detrend=detrend_none,
 
     if NFFT % 2:
         raise ValueError, 'NFFT must be a power of 2'
+    
+    x = asarray(x) # make sure we're dealing with a numpy array
+    y = asarray(y) # make sure we're dealing with a numpy array
 
     # zero pad x and y up to NFFT if they are shorter than NFFT
     if len(x)<NFFT:
@@ -331,7 +336,7 @@ def corrcoef(*args):
     if len(args)==2:
         X = transpose(array([args[0]]+[args[1]]))
     elif len(args)==1:
-        X = args[0]
+        X = asarray(args[0])
     else:
         raise RuntimeError, 'Only expecting 1 or 2 arguments'
 

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+2007-07-12 Bugfixes in mlab.py to coerce inputs into numpy arrays. -ADS`
	`2`	`+`
`1`	`3`	`2007-07-11 Added linespacing kwarg to text.Text - EF`
`2`	`4`
`3`	`5`	`2007-07-11 Added code to store font paths in SVG files. - MGD`