Remove numerix as nx from pylab

efiring · efiring · commit 0c56410c34ef · 2007-11-09T19:37:15.000Z
svn path=/trunk/matplotlib/; revision=4191
diff --git a/examples/animation_blit_fltk.py b/examples/animation_blit_fltk.py
@@ -3,7 +3,7 @@
 import matplotlib
 matplotlib.use('FltkAgg')
 import pylab as p
-import numpy as nx
+import numpy as npy
 import time
 
 
@@ -29,7 +29,7 @@ def update(self,ptr):
             self.background = self.canvas.copy_from_bbox(self.ax.bbox)
         self.canvas.restore_region(self.background)
         # update the data
-        line.set_ydata(nx.sin(x+self.cnt/10.0))
+        line.set_ydata(npy.sin(x+self.cnt/10.0))
         # just draw the animated artist
         self.ax.draw_artist(line)
         # just redraw the axes rectangle
@@ -45,8 +45,8 @@ def update(self,ptr):
 p.subplots_adjust(left=0.3, bottom=0.3) # check for flipy bugs
 p.grid() # to ensure proper background restore
 # create the initial line
-x = nx.arange(0,2*nx.pi,0.01)
-line, = p.plot(x, nx.sin(x), animated=True)
+x = npy.arange(0,2*npy.pi,0.01)
+line, = p.plot(x, npy.sin(x), animated=True)
 p.draw()
 anim=animator(ax)
 
diff --git a/examples/annotation_demo.py b/examples/annotation_demo.py
@@ -32,17 +32,19 @@
 """
 
 
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
 from matplotlib.patches import Ellipse
+import numpy as npy
+
 
 if 1:
     # if only one location is given, the text and xypoint being
     # annotated are assumed to be the same
     fig = figure()
     ax = fig.add_subplot(111, autoscale_on=False, xlim=(-1,5), ylim=(-3,5))
 
-    t = nx.arange(0.0, 5.0, 0.01)
-    s = nx.cos(2*nx.pi*t)
+    t = npy.arange(0.0, 5.0, 0.01)
+    s = npy.cos(2*npy.pi*t)
     line, = ax.plot(t, s, lw=3, color='purple')
 
     ax.annotate('axes center', xy=(.5, .5),  xycoords='axes fraction',
@@ -85,8 +87,8 @@
     # respected
     fig = figure()
     ax = fig.add_subplot(111, polar=True)
-    r = nx.arange(0,1,0.001)
-    theta = 2*2*nx.pi*r
+    r = npy.arange(0,1,0.001)
+    theta = 2*2*npy.pi*r
     line, = ax.plot(theta, r, color='#ee8d18', lw=3)
 
     ind = 800
@@ -115,8 +117,8 @@
     ax.add_artist(el)
     el.set_clip_box(ax.bbox)
     ax.annotate('the top',
-                xy=(nx.pi/2., 10.),      # theta, radius
-                xytext=(nx.pi/3, 20.),   # theta, radius
+                xy=(npy.pi/2., 10.),      # theta, radius
+                xytext=(npy.pi/3, 20.),   # theta, radius
                 xycoords='polar',
                 textcoords='polar',
                 arrowprops=dict(facecolor='black', shrink=0.05),
diff --git a/examples/barcode_demo.py b/examples/barcode_demo.py
@@ -1,14 +1,16 @@
-from pylab import figure, show, cm, nx
+from matplotlib.pyplot import figure, show, cm
+from numpy import where
+from numpy.random import rand
 
 # the bar
-x = nx.where(nx.mlab.rand(500)>0.7, 1.0, 0.0)
+x = where(rand(500)>0.7, 1.0, 0.0)
 
 axprops = dict(xticks=[], yticks=[])
 barprops = dict(aspect='auto', cmap=cm.binary, interpolation='nearest')
 
 fig = figure()
 
-# a vertical barcode
+# a vertical barcode -- this is broken at present
 x.shape = len(x), 1
 ax = fig.add_axes([0.1, 0.3, 0.1, 0.6], **axprops)
 ax.imshow(x, **barprops)
diff --git a/examples/broken_barh.py b/examples/broken_barh.py
@@ -2,7 +2,7 @@
 """
 Make a "broken" horizontal bar plot, ie one with gaps
 """
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
 
 fig = figure()
 ax = fig.add_subplot(111)
diff --git a/examples/clippath_test.py b/examples/clippath_test.py
@@ -1,8 +1,9 @@
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
 import matplotlib.transforms as transforms
 from matplotlib.patches import RegularPolygon
 import matplotlib.agg as agg
-
+from numpy import arange, sin, pi
+from numpy.random import rand
 
 class ClipWindow:
     def __init__(self, ax, line):
@@ -58,9 +59,9 @@ def _clip(self):
 
 fig = figure(figsize=(8,8))
 ax = fig.add_subplot(111)
-t = nx.arange(0.0, 4.0, 0.01)
-s = 2*nx.sin(2*nx.pi*8*t)
+t = arange(0.0, 4.0, 0.01)
+s = 2*sin(2*pi*8*t)
 
-line, = ax.plot(t, 2*(nx.mlab.rand(len(t))-0.5), 'b-')
+line, = ax.plot(t, 2*(rand(len(t))-0.5), 'b-')
 clipwin = ClipWindow(ax, line)
 show()
diff --git a/examples/custom_figure_class.py b/examples/custom_figure_class.py
@@ -1,7 +1,7 @@
 """
 You can pass a custom Figure constructor to figure if youy want to derive from the default Figure.  This simple example creates a figure with a figure title
 """
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
 from matplotlib.figure import Figure
 
 class MyFigure(Figure):
diff --git a/examples/date_demo_convert.py b/examples/date_demo_convert.py
@@ -1,16 +1,16 @@
 #!/usr/bin/env python
 
 import datetime
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
 from matplotlib.dates import DayLocator, HourLocator, DateFormatter, drange
-
+from numpy import arange
 
 date1 = datetime.datetime( 2000, 3, 2)
 date2 = datetime.datetime( 2000, 3, 6)
 delta = datetime.timedelta(hours=6)
 dates = drange(date1, date2, delta)
 
-y = nx.arange( len(dates)*1.0)
+y = arange( len(dates)*1.0)
 
 fig = figure()
 ax = fig.add_subplot(111)
@@ -25,7 +25,7 @@
 # tick, not the base multiple
 
 ax.xaxis.set_major_locator( DayLocator() )
-ax.xaxis.set_minor_locator( HourLocator(nx.arange(0,25,6)) )
+ax.xaxis.set_minor_locator( HourLocator(arange(0,25,6)) )
 ax.xaxis.set_major_formatter( DateFormatter('%Y-%m-%d') )
 
 ax.fmt_xdata = DateFormatter('%Y-%m-%d %H:%M:%S')
diff --git a/examples/dynamic_collection.py b/examples/dynamic_collection.py
@@ -1,7 +1,8 @@
 import random
 from matplotlib.collections import RegularPolyCollection
 import matplotlib.cm as cm
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
+from numpy.random import rand
 
 fig = figure()
 ax = fig.add_subplot(111, xlim=(0,1), ylim=(0,1), autoscale_on=False)
@@ -29,8 +30,8 @@ def onpress(event):
     press 'a' to add a random point from the collection, 'd' to delete one
     """
     if event.key=='a':
-        x,y = nx.mlab.rand(2)
-        color = cm.jet(nx.mlab.rand())
+        x,y = rand(2)
+        color = cm.jet(rand())
         offsets.append((x,y))
         facecolors.append(color)
         fig.canvas.draw()
diff --git a/examples/fill_demo2.py b/examples/fill_demo2.py
@@ -1,8 +1,10 @@
-from pylab import figure, nx, show
+from matplotlib.pyplot import figure, show
+from numpy import arange, sin, pi
+
 fig = figure()
 ax = fig.add_subplot(111)
-t = nx.arange(0.0,3.01,0.01)
-s = nx.sin(2*nx.pi*t)
-c = nx.sin(4*nx.pi*t)
+t = arange(0.0,3.01,0.01)
+s = sin(2*pi*t)
+c = sin(4*pi*t)
 ax.fill(t, s, 'b', t, c, 'g', alpha=0.2)
 show()
diff --git a/examples/gradient_bar.py b/examples/gradient_bar.py
@@ -1,4 +1,6 @@
-from pylab import figure, show, nx, cm
+from matplotlib.pyplot import figure, show, cm
+from numpy import arange
+from numpy.random import rand
 
 def gbar(ax, x, y, width=0.5, bottom=0):
    X = [[.6, .6],[.7,.7]]
@@ -19,8 +21,8 @@ def gbar(ax, x, y, width=0.5, bottom=0):
          extent=(xmin, xmax, ymin, ymax), alpha=1)
 
 N = 10
-x = nx.arange(N)+0.25
-y = nx.mlab.rand(N)
+x = arange(N)+0.25
+y = rand(N)
 gbar(ax, x, y, width=0.7)
 ax.set_aspect('normal')
 show()
diff --git a/examples/interp_demo.py b/examples/interp_demo.py
@@ -1,6 +1,9 @@
-from pylab import figure, show, nx, linspace, stineman_interp
-x = linspace(0,2*nx.pi,20);
-y = nx.sin(x); yp = None
+from matplotlib.pyplot import figure, show
+from numpy import pi, sin, linspace
+from matplotlib.mlab import stineman_interp
+
+x = linspace(0,2*pi,20);
+y = sin(x); yp = None
 xi = linspace(x[0],x[-1],100);
 yi = stineman_interp(xi,x,y,yp);
 
diff --git a/examples/lasso_demo.py b/examples/lasso_demo.py
@@ -13,7 +13,9 @@
 from matplotlib.colors import colorConverter
 from matplotlib.collections import RegularPolyCollection
 
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
+from numpy import nonzero
+from numpy.random import rand
 
 class Datum:
     colorin = colorConverter.to_rgba('red')
@@ -47,9 +49,7 @@ def __init__(self, ax, data):
         self.cid = self.canvas.mpl_connect('button_press_event', self.onpress)
 
     def callback(self, verts):
-        #print 'all done', verts
-        #ind = matplotlib.mlab._inside_poly_deprecated(self.xys, verts)
-        ind = nx.nonzero(points_inside_poly(self.xys, verts))
+        ind = nonzero(points_inside_poly(self.xys, verts))[0]
         for i in range(self.Nxy):
             if i in ind:
                 self.facecolors[i] = Datum.colorin
@@ -66,7 +66,7 @@ def onpress(self, event):
         # acquire a lock on the widget drawing
         self.canvas.widgetlock(self.lasso)
 
-data = [Datum(*xy) for xy in nx.mlab.rand(100, 2)]
+data = [Datum(*xy) for xy in rand(100, 2)]
 
 fig = figure()
 ax = fig.add_subplot(111, xlim=(0,1), ylim=(0,1), autoscale_on=False)
diff --git a/examples/pick_event_demo.py b/examples/pick_event_demo.py
@@ -63,23 +63,25 @@ def pick_handler(event):
 The examples below illustrate each of these methods.
 """
 
-from pylab import figure, show, nx
+from matplotlib.pyplot import figure, show
 from matplotlib.lines import Line2D
 from matplotlib.patches import Patch, Rectangle
 from matplotlib.text import Text
 from matplotlib.image import AxesImage
+import numpy as npy
+from numpy.random import rand
 
 if 1: # simple picking, lines, rectangles and text
     fig = figure()
     ax1 = fig.add_subplot(211)
     ax1.set_title('click on points, rectangles or text', picker=True)
     ax1.set_ylabel('ylabel', picker=True, bbox=dict(facecolor='red'))
-    line, = ax1.plot(nx.mlab.rand(100), 'o', picker=5)  # 5 points tolerance
+    line, = ax1.plot(rand(100), 'o', picker=5)  # 5 points tolerance
 
     # pick the rectangle
     ax2 = fig.add_subplot(212)
 
-    bars = ax2.bar(range(10), nx.mlab.rand(10), picker=True)
+    bars = ax2.bar(range(10), rand(10), picker=True)
     for label in ax2.get_xticklabels():  # make the xtick labels pickable
         label.set_picker(True)
 
@@ -90,7 +92,7 @@ def onpick1(event):
             xdata = thisline.get_xdata()
             ydata = thisline.get_ydata()
             ind = event.ind
-            print 'onpick1 line:', zip(nx.take(xdata, ind), nx.take(ydata, ind))
+            print 'onpick1 line:', zip(npy.take(xdata, ind), npy.take(ydata, ind))
         elif isinstance(event.artist, Rectangle):
             patch = event.artist
             print 'onpick1 patch:', patch.get_verts()
@@ -122,12 +124,12 @@ def line_picker(line, mouseevent):
         xdata = line.get_xdata()
         ydata = line.get_ydata()
         maxd = 0.05
-        d = nx.sqrt((xdata-mouseevent.xdata)**2. + (ydata-mouseevent.ydata)**2.)
+        d = npy.sqrt((xdata-mouseevent.xdata)**2. + (ydata-mouseevent.ydata)**2.)
 
-        ind = nx.nonzero(nx.less_equal(d, maxd))
+        ind = npy.nonzero(npy.less_equal(d, maxd))
         if len(ind):
-            pickx = nx.take(xdata, ind)
-            picky = nx.take(ydata, ind)
+            pickx = npy.take(xdata, ind)
+            picky = npy.take(ydata, ind)
             props = dict(ind=ind, pickx=pickx, picky=picky)
             return True, props
         else:
@@ -139,16 +141,16 @@ def onpick2(event):
     fig = figure()
     ax1 = fig.add_subplot(111)
     ax1.set_title('custom picker for line data')
-    line, = ax1.plot(nx.mlab.rand(100), nx.mlab.rand(100), 'o', picker=line_picker)
+    line, = ax1.plot(rand(100), rand(100), 'o', picker=line_picker)
     fig.canvas.mpl_connect('pick_event', onpick2)
 
 
 if 1: # picking on a scatter plot (matplotlib.collections.RegularPolyCollection)
 
-    x, y, c, s = nx.mlab.rand(4, 100)
+    x, y, c, s = rand(4, 100)
     def onpick3(event):
         ind = event.ind
-        print 'onpick3 scatter:', ind, nx.take(x, ind), nx.take(y, ind)
+        print 'onpick3 scatter:', ind, npy.take(x, ind), npy.take(y, ind)
 
     fig = figure()
     ax1 = fig.add_subplot(111)
@@ -159,10 +161,10 @@ def onpick3(event):
 if 1: # picking images (matplotlib.image.AxesImage)
     fig = figure()
     ax1 = fig.add_subplot(111)
-    im1 = ax1.imshow(nx.rand(10,5), extent=(1,2,1,2), picker=True)
-    im2 = ax1.imshow(nx.rand(5,10), extent=(3,4,1,2), picker=True)
-    im3 = ax1.imshow(nx.rand(20,25), extent=(1,2,3,4), picker=True)
-    im4 = ax1.imshow(nx.rand(30,12), extent=(3,4,3,4), picker=True)
+    im1 = ax1.imshow(rand(10,5), extent=(1,2,1,2), picker=True)
+    im2 = ax1.imshow(rand(5,10), extent=(3,4,1,2), picker=True)
+    im3 = ax1.imshow(rand(20,25), extent=(1,2,3,4), picker=True)
+    im4 = ax1.imshow(rand(30,12), extent=(3,4,3,4), picker=True)
     ax1.axis([0,5,0,5])
 
     def onpick4(event):
diff --git a/examples/scatter_custom_symbol.py b/examples/scatter_custom_symbol.py
@@ -1,12 +1,14 @@
-from pylab import figure, nx, show
+from matplotlib.pyplot import figure, show
+from numpy import arange, pi, cos, sin, pi
+from numpy.random import rand
 
 # unit area ellipse
 rx, ry = 3., 1.
-area = rx * ry * nx.pi
-theta = nx.arange(0, 2*nx.pi+0.01, 0.1)
-verts = zip(rx/area*nx.cos(theta), ry/area*nx.sin(theta))
+area = rx * ry * pi
+theta = arange(0, 2*pi+0.01, 0.1)
+verts = zip(rx/area*cos(theta), ry/area*sin(theta))
 
-x,y,s,c = nx.mlab.rand(4, 30)
+x,y,s,c = rand(4, 30)
 s*= 10**2.
 
 fig = figure()
diff --git a/examples/scatter_star_poly.py b/examples/scatter_star_poly.py
@@ -1,7 +1,7 @@
 import pylab
 
-x = pylab.nx.mlab.rand(10)
-y = pylab.nx.mlab.rand(10)
+x = pylab.rand(10)
+y = pylab.rand(10)
 
 pylab.subplot(321)
 pylab.scatter(x,y,s=80,marker=">")
diff --git a/examples/spy_demos.py b/examples/spy_demos.py
diff --git a/examples/xcorr_demo.py b/examples/xcorr_demo.py
diff --git a/examples/zoom_window.py b/examples/zoom_window.py
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
