Changeset 5f23f66 for python/aubio

Timestamp:

Sep 26, 2009, 1:42:52 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:

634d238

Parents:

55ed67a

Message:

python/aubio: use Gnuplot.Data with_ keywords, with is a reserved keyword in python 2.6 (debian #512622)

Location:

python/aubio

Files:

• bench/onset.py (modified) (6 diffs)
• plot/notes.py (modified) (2 diffs)
• task/beat.py (modified) (2 diffs)
• task/notes.py (modified) (3 diffs)
• task/onset.py (modified) (4 diffs)
• task/pitch.py (modified) (2 diffs)

python/aubio/bench/onset.py

@@ -112 +112 @@
                         gd.append(i['GD']) 
                         fp.append(i['FP']) 
-                d.append(Gnuplot.Data(fp, gd, with='linespoints', 
+                d.append(Gnuplot.Data(fp, gd, with_='linespoints', 
                         title="%s %s" % (plottitle,i['mode']) ))
 
@@ -148 +148 @@
                         x.append(i['prec']) 
                         y.append(i['recl']) 
-                d.append(Gnuplot.Data(x, y, with='linespoints', 
+                d.append(Gnuplot.Data(x, y, with_='linespoints', 
                         title="%s %s" % (plottitle,i['mode']) ))
 
@@ -173 +173 @@
                         x.append(i['thres']) 
                         y.append(i['dist']) 
-                d.append(Gnuplot.Data(x, y, with='linespoints', 
+                d.append(Gnuplot.Data(x, y, with_='linespoints', 
                         title="%s %s" % (plottitle,i['mode']) ))
 
@@ -206 +206 @@
                         x.append(i[var]) 
                         y.append(i['dist']) 
-                d.append(Gnuplot.Data(x, y, with='linespoints', 
+                d.append(Gnuplot.Data(x, y, with_='linespoints', 
                         title="%s %s" % (plottitle,i['mode']) ))
         
@@ -245 +245 @@
                 for i in range(len(per)): per[i] /= total/100.
 
-                d.append(Gnuplot.Data(val, per, with='fsteps', 
+                d.append(Gnuplot.Data(val, per, with_='fsteps', 
                         title="%s %s" % (plottitle,v['mode']) ))
                 #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean))
@@ -276 +276 @@
                 for i in range(len(per)): per[i] /= total/100.
 
-                d.append(Gnuplot.Data(val, per, with='fsteps', 
+                d.append(Gnuplot.Data(val, per, with_='fsteps', 
                         title="%s %s" % (plottitle,v['mode']) ))
                 #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean))

python/aubio/plot/notes.py

@@ -52 +52 @@
                 x_widths,                       # x errors
                 __notesheight*ones(len(la)),    # y errors
-                title=plot_title,with=('boxxyerrorbars fs 3')))
+                title=plot_title,with_=('boxxyerrorbars fs 3')))
         return d
 
@@ -67 +67 @@
                 x_widths,                       # x errors
                 __notesheight*ones(len(la)-1),  # y errors
-                title=plot_title,with=('boxxyerrorbars fs 3')))
+                title=plot_title,with_=('boxxyerrorbars fs 3')))
         return d
 

python/aubio/task/beat.py

@@ -248 +248 @@
         def plot(self,oplots,results):
                 import Gnuplot
-                oplots.append(Gnuplot.Data(results,with='linespoints',title="auto"))
+                oplots.append(Gnuplot.Data(results,with_='linespoints',title="auto"))
 
         def plotplot(self,wplot,oplots,outplot=None,extension=None,xsize=1.,ysize=1.,spectro=False):
@@ -259 +259 @@
 
                 g = gnuplot_create(outplot=outplot, extension=extension)
-                oplots = [Gnuplot.Data(self.gettruth(),with='linespoints',title="orig")] + oplots
+                oplots = [Gnuplot.Data(self.gettruth(),with_='linespoints',title="orig")] + oplots
                 g.plot(*oplots)

python/aubio/task/notes.py

@@ -95 +95 @@
                 import Gnuplot
 
-                oplots.append(Gnuplot.Data(now,freq,with='lines',
+                oplots.append(Gnuplot.Data(now,freq,with_='lines',
                         title=self.params.pitchmode))
-                oplots.append(Gnuplot.Data(now,ifreq,with='lines',
+                oplots.append(Gnuplot.Data(now,ifreq,with_='lines',
                         title=self.params.pitchmode))
 
@@ -103 +103 @@
                 for i in onset:
                         temponsets.append(i*1000)
-                oplots.append(Gnuplot.Data(now,temponsets,with='impulses',
+                oplots.append(Gnuplot.Data(now,temponsets,with_='impulses',
                         title=self.params.pitchmode))
 
@@ -117 +117 @@
                 #timet,pitcht = self.gettruth()
                 #if timet and pitcht:
-                #       oplots = [Gnuplot.Data(timet,pitcht,with='lines',
+                #       oplots = [Gnuplot.Data(timet,pitcht,with_='lines',
                 #               title='ground truth')] + oplots
 
-                t = Gnuplot.Data(0,0,with='impulses') 
+                t = Gnuplot.Data(0,0,with_='impulses') 
 
                 g = gnuplot_init(outplot)

python/aubio/task/onset.py

@@ -93 +93 @@
                 import aubio.txtfile
                 import os.path
-    from numpy import arange, array, ones
+                from numpy import arange, array, ones
                 from aubio.onsetcompare import onset_roc
 
@@ -104 +104 @@
                 # onset detection function 
                 downtime = arange(len(ofunc))*self.params.step
-                oplot.append(Gnuplot.Data(downtime,ofunc,with='lines',title=self.params.onsetmode))
+                oplot.append(Gnuplot.Data(downtime,ofunc,with_='lines',title=self.params.onsetmode))
 
                 # detected onsets
@@ -115 +115 @@
                         #y1 = self.maxofunc*ones(len(onsets))
                         if x1:
-                                oplot.append(Gnuplot.Data(x1,y1,with='impulses'))
-                                wplot.append(Gnuplot.Data(x1,y1p,with='impulses'))
+                                oplot.append(Gnuplot.Data(x1,y1,with_='impulses'))
+                                wplot.append(Gnuplot.Data(x1,y1p,with_='impulses'))
 
                 oplots.append((oplot,self.params.onsetmode,self.maxofunc))
@@ -129 +129 @@
                         x2 = array(t_onsets).resize(len(t_onsets))
                         y2 = self.maxofunc*ones(len(t_onsets))
-                        wplot.append(Gnuplot.Data(x2,y2,with='impulses'))
+                        wplot.append(Gnuplot.Data(x2,y2,with_='impulses'))
                         
                         tol = 0.050 

python/aubio/task/pitch.py

@@ -157 +157 @@
                 time = [ (i+self.params.pitchdelay)*self.params.step for i in range(len(pitch)) ]
                 pitch = [aubio_freqtomidi(i) for i in pitch]
-                oplots.append(Gnuplot.Data(time,pitch,with='lines',
+                oplots.append(Gnuplot.Data(time,pitch,with_='lines',
                         title=self.params.pitchmode))
                 titles.append(self.params.pitchmode)
@@ -171 +171 @@
                         timet,pitcht = self.gettruth()
                         if timet and pitcht:
-                                oplots = [Gnuplot.Data(timet,pitcht,with='lines',
+                                oplots = [Gnuplot.Data(timet,pitcht,with_='lines',
                                         title='ground truth')] + oplots