Showing the changes to python/test (1 of 3 files). Show all
Unified · Split
| @@ -8,61 +8,104 @@ class benchpitch(bench): · 7 unmodified lines | |||
| 8 | """ list of values to store per file """ | 8 | """ list of values to store per file """ |
| 9 | valuenames = ['mode'] | 9 | valuenames = ['mode'] |
| 10 | """ list of lists to store per file """ | 10 | """ list of lists to store per file """ |
| 11 | valuelists = ['orig', 'mean', 'med'] | 11 | valuelists = ['truth', 'osil', 'esil', 'opit', 'epit', 'echr', |
| 12 | 'Msil', 'Mpit', 'Mchr'] | ||
| 12 | """ list of values to print per dir """ | 13 | """ list of values to print per dir """ |
| 13 | printnames = [ 'mode'] | 14 | printnames = [ 'mode', 'truth', 'Msil', 'Mpit', 'Mchr'] |
| 14 | 15 | ||
| 15 | """ per dir """ | 16 | """ per dir """ |
| 16 | formats = {'mode': "%12s" , 'thres': "%5.4s", | 17 | formats = {'mode': "%12s" , |
| 17 | 'dist': "%5.4s", 'prec': "%5.4s", 'recl': "%5.4s", | 18 | 'truth': "%s", |
| 18 | 'Ttrue': "%5.4s", 'Tfp': "%5.4s", 'Tfn': "%5.4s", | 19 | 'osil': "%s", 'esil': "%s", |
| 19 | 'Tm': "%5.4s", 'Td': "%5.4s", | 20 | 'opit': "%s", 'epit': "%s", 'echr': "%s", |
| 20 | 'aTtrue':"%5.4s", 'aTfp': "%5.4s", 'aTfn': "%5.4s", | 21 | 'Msil': "%s", 'Mpit': "%s", 'Mchr': "%s"} |
| 21 | 'aTm': "%5.4s", 'aTd': "%5.4s", | ||
| 22 | 'mean': "%5.40s", 'smean': "%5.40s", | ||
| 23 | 'amean': "%5.40s", 'samean': "%5.40s"} | ||
| 24 | 22 | ||
| 25 | def dir_eval(self): | 23 | def dir_eval(self): |
| 26 | """ evaluate statistical data over the directory """ | 24 | """ evaluate statistical data over the directory """ |
| 27 | v = self.v | 25 | v = self.v |
| 28 | |||
| 29 | v['mode'] = self.params.pitchmode | 26 | v['mode'] = self.params.pitchmode |
| 30 | 27 | ||
| 31 | def file_exec(self,input,output): | 28 | def file_exec(self,input,output): |
| 32 | filetask = self.task(input,params=self.params) | 29 | filetask = self.task(input,params=self.params) |
| 33 | computed_data = filetask.compute_all() | 30 | computed_data = filetask.compute_all() |
| 34 | orig,mean,med = filetask.eval(computed_data) | 31 | osil, esil, opit, epit, echr = filetask.eval(computed_data) |
| 32 | self.v['truth'].append(int(filetask.truth)) | ||
| 33 | assert opit > 0 | ||
| 35 | 34 | ||
| 36 | self.v['orig'].append(orig) | 35 | self.v['osil'].append(osil) |
| 37 | self.v['mean'].append(mean) | 36 | self.v['esil'].append(esil) |
| 38 | self.v['med'].append(med) | 37 | self.v['opit'].append(opit) |
| 38 | self.v['epit'].append(epit) | ||
| 39 | self.v['echr'].append(echr) | ||
| 40 | |||
| 41 | self.v['Msil'].append(esil/float(osil)*100.) | ||
| 42 | self.v['Mpit'].append(epit/float(opit)*100.) | ||
| 43 | self.v['Mchr'].append(echr/float(opit)*100.) | ||
| 39 | #print results#, computed_data | 44 | #print results#, computed_data |
| 40 | #print input, results, results - float(input.split('.')[-2]) | 45 | #print input, results, results - float(input.split('.')[-2]) |
| 41 | 46 | ||
| 42 | def run_bench(self,modes=['schmitt']): | 47 | def run_bench(self,modes=['schmitt']): |
| 43 | from os.path import basename | 48 | from os.path import basename |
| 44 | d = [] | ||
| 45 | self.modes = modes | 49 | self.modes = modes |
| 46 | self.pretty_titles() | 50 | self.pretty_titles() |
| 51 | d = [] | ||
| 47 | for mode in self.modes: | 52 | for mode in self.modes: |
| 48 | self.params.pitchmode = mode | 53 | self.params.pitchmode = mode |
| 49 | self.dir_eval_print() | 54 | self.dir_eval_print() |
| 50 | self.plotpitchtessiture(d, | 55 | truth = [i for i in range(min(self.v['truth']),max(self.v['truth'])+1)] |
| 51 | self.v['orig'], | 56 | allOsil = [0 for i in range(min(self.v['truth']),max(self.v['truth'])+1)] |
| 52 | self.v['med'], | 57 | allEsil = [0 for i in range(min(self.v['truth']),max(self.v['truth'])+1)] |
| 53 | plottitle=self.v['mode'], | 58 | allOpit = [0 for i in range(min(self.v['truth']),max(self.v['truth'])+1)] |
| 54 | plotmode='points') | 59 | allEpit = [0 for i in range(min(self.v['truth']),max(self.v['truth'])+1)] |
| 55 | #d.append('beta = .25,orig(x) title \"-2 octave\"') | 60 | allEchr = [0 for i in range(min(self.v['truth']),max(self.v['truth'])+1)] |
| 56 | d.append('beta = .50,orig(x) title \"-1 octave\"') | 61 | allMsil = [0 for i in range(min(self.v['truth']),max(self.v['truth'])+1)] |
| 57 | d.append('beta = 1.0,orig(x) title \"original\"') | 62 | allMpit = [0 for i in range(min(self.v['truth']),max(self.v['truth'])+1)] |
| 58 | d.append('beta = 2.0,orig(x) title \"+1 octave\"') | 63 | allMchr = [0 for i in range(min(self.v['truth']),max(self.v['truth'])+1)] |
| 59 | title = basename(self.datadir) | 64 | for i in range(len(self.v['truth'])): |
| 65 | allOsil[self.v['truth'][i]-min(self.v['truth'])] += self.v['osil'][i] | ||
| 66 | allEsil[self.v['truth'][i]-min(self.v['truth'])] += self.v['esil'][i] | ||
| 67 | allOpit[self.v['truth'][i]-min(self.v['truth'])] += self.v['opit'][i] | ||
| 68 | allEpit[self.v['truth'][i]-min(self.v['truth'])] += self.v['epit'][i] | ||
| 69 | allEchr[self.v['truth'][i]-min(self.v['truth'])] += self.v['echr'][i] | ||
| 70 | for i in range(len(truth)): | ||
| 71 | allMsil[i] = allEsil[i]/float(allOsil[i])*100. | ||
| 72 | allMpit[i] = allEpit[i]/float(allOpit[i])*100. | ||
| 73 | allMchr[i] = allEchr[i]/float(allOpit[i])*100. | ||
| 74 | |||
| 75 | plot = [] | ||
| 76 | self.plotpitchtessiture(plot, | ||
| 77 | truth, | ||
| 78 | allMpit, | ||
| 79 | plottitle="%s %s" % (self.v['mode'],self.params.bufsize), | ||
| 80 | plotmode='lines') | ||
| 81 | self.plotpitchtessiture(plot, | ||
| 82 | truth, | ||
| 83 | allMchr, | ||
| 84 | plottitle="%s %s" % (self.v['mode'],"%12"), | ||
| 85 | plotmode='lines') | ||
| 86 | """ | ||
| 87 | self.plotpitchtessiture(plot, | ||
| 88 | truth, | ||
| 89 | allMsil, | ||
| 90 | plottitle="%s %s" % (self.v['mode'],"sil"), | ||
| 91 | plotmode='lines') | ||
| 92 | """ | ||
| 93 | title = basename(self.datadir) | ||
| 94 | d.append(plot) | ||
| 60 | outplot = "_-_".join(('pitchtessiture',title)) | 95 | outplot = "_-_".join(('pitchtessiture',title)) |
| 96 | self.xmin = 20. #min(self.v['truth']) | ||
| 97 | self.xmax = 110. #max(self.v['truth']) | ||
| 61 | for ext in ('ps','png','svg',''): | 98 | for ext in ('ps','png','svg',''): |
| 62 | self.plotplotpitchtessiture(d, | 99 | self.plotplotpitchtessiture(d, |
| 63 | plottitle=title, | 100 | plottitle="".join(['Performance against MIDI Note number (', |
| 101 | title, | ||
| 102 | ", %s" % len(self.sndlist), " samples)"]), | ||
| 64 | outplot=outplot, | 103 | outplot=outplot, |
| 65 | extension=ext) | 104 | extension=ext) |
| 105 | #d.append('beta = .25,orig(x) title \"-2 octave\"') | ||
| 106 | #d.append('beta = .50,orig(x) title \"-1 octave\"') | ||
| 107 | #d.append('beta = 1.0,orig(x) title \"original\"') | ||
| 108 | #d.append('beta = 2.0,orig(x) title \"+1 octave\"') | ||
| 66 | 109 | ||
| 67 | """ | 110 | """ |
| 68 | Plot functions | 111 | Plot functions |
| @@ -72,18 +115,38 @@ class benchpitch(bench): · 3 unmodified lines | |||
| 72 | import Gnuplot, Gnuplot.funcutils | 115 | import Gnuplot, Gnuplot.funcutils |
| 73 | d.append(Gnuplot.Data(lx, ly, with=plotmode, title="%s" % (plottitle) )) | 116 | d.append(Gnuplot.Data(lx, ly, with=plotmode, title="%s" % (plottitle) )) |
| 74 | 117 | ||
| 75 | def plotplotpitchtessiture(self,d,plottitle='',outplot=0,extension=''): | 118 | def plotplotpitchtessiture(self,d,plottitle='',outplot=0,extension='',multiplot=1): |
| 76 | from aubio.gnuplot import gnuplot_create | 119 | from aubio.gnuplot import gnuplot_create |
| 77 | g = gnuplot_create(outplot=outplot,extension=extension) | 120 | g = gnuplot_create(outplot=outplot,extension=extension) |
| 78 | g.title(plottitle) | 121 | #g.title(plottitle) |
| 79 | g('orig(x) = beta*x') | 122 | #g('orig(x) = beta*x') |
| 80 | g.xlabel('original pitch (Hz)') | 123 | #g.xlabel('original pitch (Hz)') |
| 81 | g.ylabel('detected pitch (Hz)') | 124 | #g.ylabel('detected pitch (Hz)') |
| 82 | g('set key left top') | 125 | #g('set key left top') |
| 83 | g('set log xy') | 126 | #g('set log xy') |
| 84 | g('set xrange [50:2000]') | 127 | #g('set xrange [50:2000]') |
| 85 | g('set yrange [50:2000]') | 128 | g('set yrange [0:100]') |
| 86 | g.plot(*d) | 129 | #g.plot(*d) |
| 130 | if multiplot: | ||
| 131 | g('set multiplot') | ||
| 132 | for i in range(len(d)): | ||
| 133 | # plot onset detection functions | ||
| 134 | g('set size 1,%f' % ( 1.0/float(len(d)) ) ) | ||
| 135 | g('set origin 0,%f' % ( 1.0*float(len(d)-i-1)/float(len(d)) ) ) | ||
| 136 | # erase axis | ||
| 137 | g('set border 3') | ||
| 138 | g('set xtics nomirror') | ||
| 139 | g('set ytics nomirror') | ||
| 140 | g('set key left top') | ||
| 141 | g('set xrange [%f:%f]' % (self.xmin,self.xmax)) #(self.xmax - (self.xmax-self.xmin)*5./4.,self.xmax)) | ||
| 142 | #g.ylabel('%Correct detections') | ||
| 143 | if i == len(d)-1: | ||
| 144 | g.xlabel(plottitle) | ||
| 145 | g.plot(*d[i]) | ||
| 146 | g('unset title') | ||
| 147 | g('unset multiplot') | ||
| 148 | else: | ||
| 149 | g.plot(*d) | ||
| 87 | 150 | ||
| 88 | 151 | ||
| 89 | if __name__ == "__main__": | 152 | if __name__ == "__main__": |
| @@ -93,13 +156,15 @@ if __name__ == "__main__": · 3 unmodified lines | |||
| 93 | if len(sys.argv) > 2: | 156 | if len(sys.argv) > 2: |
| 94 | for each in sys.argv[3:-1]: print each | 157 | for each in sys.argv[3:-1]: print each |
| 95 | modes = ['schmitt', 'yin', 'mcomb', 'fcomb'] | 158 | modes = ['schmitt', 'yin', 'mcomb', 'fcomb'] |
| 96 | #modes = ['fcomb'] | 159 | modes = ['schmitt', 'yin', 'fcomb'] |
| 97 | 160 | ||
| 98 | params = taskparams() | 161 | params = taskparams() |
| 99 | params.bufsize = 4096 | 162 | params.bufsize = 2048 |
| 100 | params.hopsize = params.bufsize/4 | 163 | params.hopsize = params.bufsize/8 |
| 101 | params.silence = -1000. | 164 | params.silence = -60. |
| 102 | params.pitchsmooth = 50 | 165 | params.pitchsmooth = 0 |
| 166 | params.pitchmax = 20000 | ||
| 167 | params.pitchmin = 20 | ||
| 103 | benchpitch = benchpitch(datapath,params=params) | 168 | benchpitch = benchpitch(datapath,params=params) |
| 104 | benchpitch.task = taskpitch | 169 | benchpitch.task = taskpitch |
| 105 | 170 | ||