ref: 5f23f66050fc20497638ca99af3820ef05ddc6df
parent: 55ed67a6dbdddc1a12912db6aac3534be698e25f
author: Paul Brossier <piem@piem.org>
date: Fri Sep 25 21:42:52 EDT 2009
python/aubio: use Gnuplot.Data with_ keywords, with is a reserved keyword in python 2.6 (debian #512622)
--- a/python/aubio/bench/onset.py
+++ b/python/aubio/bench/onset.py
@@ -111,7 +111,7 @@
for i in self.vlist:
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']) ))
def plotplotroc(self,d,outplot=0,extension='ps'):
@@ -147,7 +147,7 @@
for i in self.vlist:
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']) ))
def plotplotpr(self,d,outplot=0,extension='ps'):
@@ -172,7 +172,7 @@
for i in self.vlist:
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']) ))
def plotplotfmeas(self,d,outplot="",extension='ps', title="F-measure"):
@@ -205,7 +205,7 @@
for i in self.vlist:
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']) ))
def plotplotfmeasvar(self,d,var,outplot="",extension='ps', title="F-measure"):
@@ -244,7 +244,7 @@
total = v['Torig']
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)) #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean))@@ -275,7 +275,7 @@
total = v['Torig']
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)) #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean))--- a/python/aubio/plot/notes.py
+++ b/python/aubio/plot/notes.py
@@ -51,7 +51,7 @@
la[:,2], # y centers
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
@@ -66,7 +66,7 @@
la[:-1,1], # y centers
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
def plotnote_do(d,fileout=None):
--- a/python/aubio/task/beat.py
+++ b/python/aubio/task/beat.py
@@ -247,7 +247,7 @@
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):
import Gnuplot
@@ -258,5 +258,5 @@
#f = make_audio_plot(time,data)
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)
--- a/python/aubio/task/notes.py
+++ b/python/aubio/task/notes.py
@@ -94,15 +94,15 @@
def plot(self,now,onset,freq,ifreq,oplots):
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))
temponsets = []
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))
def plotplot(self,wplot,oplots,outplot=None,multiplot = 0):
@@ -116,10 +116,10 @@
# check if ground truth exists
#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)
g('set title \'%s\'' % (re.sub('.*/','',self.input)))--- a/python/aubio/task/onset.py
+++ b/python/aubio/task/onset.py
@@ -92,7 +92,7 @@
import Gnuplot, Gnuplot.funcutils
import aubio.txtfile
import os.path
- from numpy import arange, array, ones
+ from numpy import arange, array, ones
from aubio.onsetcompare import onset_roc
x1,y1,y1p = [],[],[]
@@ -103,7 +103,7 @@
self.maxofunc = max(ofunc)
# 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
if not nplot:
@@ -114,8 +114,8 @@
#x1 = array(onsets)*self.params.step
#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))
@@ -128,7 +128,7 @@
t_onsets = aubio.txtfile.read_datafile(datafile)
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
--- a/python/aubio/task/pitch.py
+++ b/python/aubio/task/pitch.py
@@ -156,7 +156,7 @@
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)
@@ -170,7 +170,7 @@
if truth:
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
g = gnuplot_create(outplot=outplot, extension=extension)
--- a/python/aubioplot-yinfft
+++ b/python/aubioplot-yinfft
@@ -73,10 +73,10 @@
y = [yin.get(i,0) for i in range(params.bufsize/2)]
thresh = [0.1 for i in range(params.bufsize/2)]
#t.append((i/float(params.hopsize)+taskfile.frameread)*params.step),t.pop(0)
- d = [plotdata(n,a,plottitle="signal", with='lines'),
- plotdata(n,c,plottitle="d[t]",axes='x1y2', with='lines lt 1'),
- plotdata(n,y,plottitle="d'[t]",axes='x1y1', with='lines lt 2'),
- plotdata(n,thresh,plottitle="threshold",axes='x1y1', with='lines lt 3')]
+ d = [plotdata(n,a,plottitle="signal", with_='lines'),
+ plotdata(n,c,plottitle="d[t]",axes='x1y2', with_='lines lt 1'),
+ plotdata(n,y,plottitle="d'[t]",axes='x1y1', with_='lines lt 2'),
+ plotdata(n,thresh,plottitle="threshold",axes='x1y1', with_='lines lt 3')]
#g('set xrange [%f:%f]' % (t[0],t[-1]))#time.sleep(.2)
g.reset()