Changeset e7a7794

Timestamp:

Sep 26, 2009, 6:34:28 AM (15 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

9a91031

Parents:

342e3807

Message:

python: finish getting rid of numarray

Location:

python

Files:

• aubio/onsetcompare.py (modified) (1 diff)
• aubio/plot/notes.py (modified) (2 diffs)
• aubiodiffs-onset (modified) (1 diff)
• aubiofilter-notes (modified) (1 diff)
• aubionotes (modified) (1 diff)
• aubioplot-notes (modified) (1 diff)
• aubioweb.py (modified) (1 diff)

python/aubio/onsetcompare.py

@@ -107 +107 @@
 
 def notes_roc (la, lb, eps):
-    from numarray import transpose, add, resize 
+    from numpy import transpose, add, resize 
     """ creates a matrix of size len(la)*len(lb) then look for hit and miss
     in it within eps tolerance windows """

python/aubio/plot/notes.py

@@ -43 +43 @@
 
 def plotnote_withends(la,plot_title=None) :
-        import numarray
+        from numpy import array
         import Gnuplot, Gnuplot.funcutils
         d=[]
-        x_widths = numarray.array(la[:,1]-la[:,0])/2.
+        x_widths = array(la[:,1]-la[:,0])/2.
         d.append(Gnuplot.Data(
                 la[:,0]+x_widths,               # x centers
@@ -58 +58 @@
 def plotnote_withoutends(la,plot_title=None) :
         """ bug: fails drawing last note """
-        import numarray
+        from numpy import array
         import Gnuplot, Gnuplot.funcutils
         d=[]
-        x_widths = numarray.array(la[1:,0]-la[:-1,0])/2;
+        x_widths = array(la[1:,0]-la[:-1,0])/2;
         d.append(Gnuplot.Data(
                 la[:-1,0]+x_widths,             # x centers

python/aubiodiffs-onset

@@ -4 +4 @@
 
 print aubio.__LICENSE__ for the terms of use
-
-or see LICENSE.txt in the numarray installation directory.
 """
 __LICENSE__ = """\

python/aubiofilter-notes

@@ -79 +79 @@
         from aubio import notefilter,txtfile,gnuplot
         """ load midi and raw data """
-        from numarray import array
+        from numpy import array
         notelist = array(txtfile.read_datafile(input))
         """ filter it out """

python/aubionotes

@@ -5 +5 @@
     import aubio.aubioclass
     import aubio.median
-    #from numarray import around
     from math import floor
     hopsize   = 512

python/aubioplot-notes

@@ -19 +19 @@
     from aubio.txtfile import read_datafile
     from aubio.gnuplot import plotnote,plotnote_do 
-    from numarray import array
+    from numpy import array
     filein,fileout = parse_args(sysargs)
     #print 'checking', fileerr, 'against', fileorg

python/aubioweb.py

@@ -12 +12 @@
 vorbis-tools (oggenc)
 python-gnuplot
-python-numarray
+python-numpy
 
 Try the command line tools in aubio/python to test your installation.