Added the "numerix" Numeric/numarray selector module enabling matplotlib

jaytmiller · jaytmiller · commit 347e90d7143a · 2004-02-26T20:22:58.000Z
to work with either numarray or Numeric.  See matplotlib.numerix.__doc__.

svn path=/trunk/matplotlib/; revision=162
diff --git a/examples/anim.py b/examples/anim.py
@@ -2,15 +2,15 @@
 
 import matplotlib.matlab
 import gtk
-import Numeric
+import matplotlib.numerix as numerix
 
 fig = matplotlib.matlab.figure(1)
-ind = Numeric.arange(60)
+ind = numerix.arange(60)
 x_tmp=[]
 for i in range(100):
-    x_tmp.append(Numeric.sin((ind+i)*Numeric.pi/15.0))
+    x_tmp.append(numerix.sin((ind+i)*numerix.pi/15.0))
 
-X=Numeric.array(x_tmp)
+X=numerix.array(x_tmp)
 lines = matplotlib.matlab.plot(X[:,0],'o')
 
 manager = matplotlib.matlab.get_current_fig_manager()
diff --git a/examples/colours.py b/examples/colours.py
@@ -1,10 +1,10 @@
 """
 Some simple functions to generate colours.
 """
-from Numeric import asarray
+from matplotlib.numerix import asarray
 from matplotlib.mlab import linspace
 from matplotlib.colors import colorConverter
-from Numeric import sum
+from matplotlib.numerix import sum
 
 def pastel(colour, weight=2.4):
     """ Convert colour into a nice pastel shade"""
diff --git a/examples/data_helper.py b/examples/data_helper.py
@@ -1,6 +1,6 @@
 # Some functions to load a return data for the plot demos
 
-from Numeric import fromstring, argsort, take, array
+from matplotlib.numerix import fromstring, argsort, take, array
 def get_two_stock_data():
     """
     load stock time and price data for two stocks The return values
diff --git a/examples/dynamic_demo_wx.py b/examples/dynamic_demo_wx.py
@@ -19,6 +19,10 @@
 
 Modification History:
 $Log$
+Revision 1.2  2004/02/26 20:22:58  jaytmiller
+Added the "numerix" Numeric/numarray selector module enabling matplotlib
+to work with either numarray or Numeric.  See matplotlib.numerix.__doc__.
+
 Revision 1.1  2003/12/30 17:22:09  jodonoghue
 First version of dynamic_demo for backend_wx
 
@@ -29,7 +33,7 @@
 
 from matplotlib.backends import Figure, Toolbar, FigureManager
 from matplotlib.axes import Subplot
-import Numeric as numpy
+import matplotlib.numerix as numpy
 
 from matplotlib.matlab import *
 from wxPython.wx import *
diff --git a/examples/embedding_in_gtk.py b/examples/embedding_in_gtk.py
@@ -1,4 +1,4 @@
-from Numeric import arange, sin, pi
+from matplotlib.numerix import arange, sin, pi
 
 import matplotlib
 matplotlib.use('GTK')
diff --git a/examples/embedding_in_gtk2.py b/examples/embedding_in_gtk2.py
@@ -1,4 +1,4 @@
-from Numeric import arange, sin, pi
+from matplotlib.numerix import arange, sin, pi
 
 import matplotlib
 matplotlib.use('GTK')
diff --git a/examples/embedding_in_wx.py b/examples/embedding_in_wx.py
@@ -42,7 +42,7 @@
 
 from matplotlib.figure import Figure
 from matplotlib.axes import Subplot
-import Numeric as numpy
+import matplotlib.numerix as numpy
 from wxPython.wx import *
 
 
diff --git a/examples/mpl_with_glade.py b/examples/mpl_with_glade.py
@@ -5,7 +5,7 @@
 from matplotlib.axes import Subplot
 from matplotlib.backends.backend_gtk import FigureCanvasGTK, NavigationToolbar
 
-from Numeric import arange, sin, pi
+from matplotlib.numerix import arange, sin, pi
 import gtk
 import gtk.glade
 
diff --git a/examples/object_picker.py b/examples/object_picker.py
@@ -5,7 +5,7 @@
 """
 
 from __future__ import division
-from Numeric import sin, pi, arange, absolute, sqrt
+from matplotlib.numerix import sin, pi, arange, absolute, sqrt
 
 import matplotlib
 matplotlib.use('GTK')
diff --git a/examples/stock_demo.py b/examples/stock_demo.py
@@ -1,7 +1,7 @@
 import sys
 from matplotlib.matlab import *
 from data_helper import get_two_stock_data
-import Numeric as numpy
+import matplotlib.numerix as numpy
 (d1, p1, d2, p2 ) = get_two_stock_data()
 
 plot(d1, p1, 'bs', d2, p2, 'go')
diff --git a/examples/vline_demo.py b/examples/vline_demo.py
@@ -1,6 +1,7 @@
 from matplotlib.matlab import *
-from RandomArray import normal
-from Numeric import sin, exp, multiply, absolute, pi
+from matplotlib.numerix import sin, exp, multiply, absolute, pi
+import matplotlib.numerix as numerix
+normal = numerix.RandomArray.normal
 
 def f(t):
     s1 = sin(2*pi*t)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from Numeric import arange, sin, pi`
	`1`	`+from matplotlib.numerix import arange, sin, pi`
`2`	`2`
`3`	`3`	`import matplotlib`
`4`	`4`	`matplotlib.use('GTK')`