Changeset fcacd88

Timestamp:

Sep 26, 2009, 1:09:50 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:

707c30e

Parents:

a250b35

Message:

python/aubio/task/onset.py: use numarray, not numpy (debian #478438)

File:

• python/aubio/task/onset.py (modified) (4 diffs)

python/aubio/task/onset.py

@@ -93 +93 @@
                 import aubio.txtfile
                 import os.path
-                import numarray
+    from numpy import arange, array, ones
                 from aubio.onsetcompare import onset_roc
 
@@ -103 +103 @@
                 self.maxofunc = max(ofunc)
                 # onset detection function 
-                downtime = numarray.arange(len(ofunc))*self.params.step
+                downtime = arange(len(ofunc))*self.params.step
                 oplot.append(Gnuplot.Data(downtime,ofunc,with='lines',title=self.params.onsetmode))
 
@@ -112 +112 @@
                                 y1.append(self.maxofunc)
                                 y1p.append(-self.maxofunc)
-                        #x1 = numarray.array(onsets)*self.params.step
-                        #y1 = self.maxofunc*numarray.ones(len(onsets))
+                        #x1 = array(onsets)*self.params.step
+                        #y1 = self.maxofunc*ones(len(onsets))
                         if x1:
                                 oplot.append(Gnuplot.Data(x1,y1,with='impulses'))
@@ -127 +127 @@
                 else:
                         t_onsets = aubio.txtfile.read_datafile(datafile)
-                        x2 = numarray.array(t_onsets).resize(len(t_onsets))
-                        y2 = self.maxofunc*numarray.ones(len(t_onsets))
+                        x2 = array(t_onsets).resize(len(t_onsets))
+                        y2 = self.maxofunc*ones(len(t_onsets))
                         wplot.append(Gnuplot.Data(x2,y2,with='impulses'))