Changeset 83c6734

Timestamp:

Feb 20, 2006, 12:37:53 PM (19 years ago)

Author:

Paul Brossier <piem@altern.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:

a7880d9

Parents:

79c04d8

Message:

added bench-window, bench-delay, benchonset
added bench-window, bench-delay, benchonset

Location:

python/test/bench/onset

Files:

• Makefile.am (modified) (2 diffs)
• bench-delay (added)
• bench-onset (modified) (4 diffs)
• bench-window (added)
• benchonset.py (added)

python/test/bench/onset/Makefile.am

@@ -3 +3 @@
 export LD_LIBRARY_PATH=$(BASEDIR)/src/.libs:$(BASEDIR)/ext/.libs
 
-SOURCE = \
-        /archives/samples/DB/PercussivePhrases/CM18/Samba_Audio \
+DETAILSOURCE = \
         /var/tmp/Onset-Mirex2005/poly_pitched \
         /var/tmp/Onset-Mirex2005/solo_bars_and_bells \
-        /var/tmp/Onset-Mirex2005/solo_brass \
         /var/tmp/Onset-Mirex2005/solo_drums \
         /var/tmp/Onset-Mirex2005/solo_plucked_strings \
@@ -13 +11 @@
         /var/tmp/Onset-Mirex2005/solo_sustained_strings \
         /var/tmp/Onset-Mirex2005/solo_winds \
-        /var/tmp/Onset-Mirex2005/complex \
-        /var/tmp/Onset-Mirex2005
+        /var/tmp/Onset-Mirex2005/complex
 
-test-aubiocut:         $(patsubst %, %.aubiocut, $(SOURCE))
+SOURCE = /var/tmp/Onset-Mirex2005
+
+TESTSOURCE = \
+        /var/tmp/Onset-Mirex2005/solo_bars_and_bells \
+        /var/tmp/Onset-Mirex2005/solo_winds \
+        /archives/samples/DB/PercussivePhrases/CM18/Samba_Audio
+
+test-aubiocut:            $(patsubst %, %.aubiocut,    $(TESTSOURCE))
+test-aubiodelay:          $(patsubst %, %.aubiodelay,  $(TESTSOURCE))
+test-aubiowindow:         $(patsubst %, %.aubiowindow, $(TESTSOURCE))
+
+final-aubiocut:           $(patsubst %, %.aubiocut,    $(DETAILSOURCE) $(SOURCE))
+final-aubiodelay:         $(patsubst %, %.aubiodelay,  $(SOURCE))
+final-aubiowindow:        $(patsubst %, %.aubiowindow, $(SOURCE))
 
 %.aubiocut: %
         rm -f `basename $<`.aubiocut
         ./bench-onset $< | tee `basename $<`.aubiocut
-        diff `basename $<`.aubiocut.ref `basename $<`.aubiocut
+        -diff `basename $<`.aubiocut.ref `basename $<`.aubiocut
+
+%.aubiodelay: %
+        rm -f `basename $@`
+        ./bench-delay $< | tee `basename $@`
+        -diff `basename $@`.ref `basename $@`
+
+%.aubiowindow: %
+        rm -f `basename $@`
+        ./bench-window $< | tee `basename $@`
+        -diff `basename $@`.ref `basename $@`

python/test/bench/onset/bench-onset

@@ -1 +1 @@
 #! /usr/bin/python
 
-from aubio.bench.node import *
 from aubio.tasks import *
 
+from benchonset import mmean, stdev, benchonset
 
-
-
-def mmean(l):
-        return sum(l)/float(len(l))
-
-def stdev(l):
-        smean = 0
-        lmean = mmean(l)
-        for i in l:
-                smean += (i-lmean)**2
-        smean *= 1. / len(l)
-        return smean**.5
-
-class benchonset(bench):
-
-        """ list of values to store per file """
-        valuenames = ['orig','missed','Tm','expc','bad','Td']
-        """ list of lists to store per file """
-        valuelists = ['l','labs']
-        """ list of values to print per dir """
-        printnames = [ 'mode', 'thres', 'dist', 'prec', 'recl', 
-                'Ttrue', 'Tfp',  'Tfn',  'Tm',   'Td',
-                'aTtrue', 'aTfp', 'aTfn', 'aTm',  'aTd',  
-                'mean', 'smean',  'amean', 'samean']
-
-        """ per dir """
-        formats = {'mode': "%12s" , 'thres': "%5.4s", 
-                'dist':  "%5.4s", 'prec': "%5.4s", 'recl':  "%5.4s",
-                'Ttrue': "%5.4s", 'Tfp':   "%5.4s", 'Tfn':   "%5.4s", 
-                'Tm':    "%5.4s", 'Td':    "%5.4s",
-                'aTtrue':"%5.4s", 'aTfp':  "%5.4s", 'aTfn':  "%5.4s", 
-                'aTm':   "%5.4s", 'aTd':   "%5.4s",
-                'mean':  "%5.40s", 'smean': "%5.40s", 
-                'amean':  "%5.40s", 'samean': "%5.40s"}
-
-        def dir_eval(self):
-                """ evaluate statistical data over the directory """
-                totaltrue = sum(self.v['expc'])-sum(self.v['bad'])-sum(self.v['Td'])
-                totalfp = sum(self.v['bad'])+sum(self.v['Td'])
-                totalfn = sum(self.v['missed'])+sum(self.v['Tm'])
-                self.P = 100*float(totaltrue)/max(totaltrue + totalfp,1)
-                self.R = 100*float(totaltrue)/max(totaltrue + totalfn,1)
-                if self.R < 0: self.R = 0
-                self.F = 2.* self.P*self.R / max(float(self.P+self.R),1)
-                N = float(len(self.reslist))
-                self.v['mode']      = self.params.onsetmode
-                self.v['thres']     = self.params.threshold 
-                self.v['thres']     = "%2.3f" % self.params.threshold
-                self.v['dist']      = "%2.3f" % self.F
-                self.v['prec']      = "%2.3f" % self.P
-                self.v['recl']      = "%2.3f" % self.R
-                self.v['Ttrue']     = totaltrue
-                self.v['Tfp']       = totalfp
-                self.v['Tfn']       = totalfn
-                self.v['aTtrue']    = totaltrue/N
-                self.v['aTfp']      = totalfp/N
-                self.v['aTfn']      = totalfn/N
-                self.v['aTm']       = sum(self.v['Tm'])/N
-                self.v['aTd']       = sum(self.v['Td'])/N
-                self.v['Tm']       = sum(self.v['Tm'])
-                self.v['Td']       = sum(self.v['Td'])
-                self.v['mean']      = mmean(self.v['l'])
-                self.v['smean']     = stdev(self.v['l'])
-                self.v['amean']     = mmean(self.v['labs'])
-                self.v['samean']    = stdev(self.v['labs'])
+class mybenchonset(benchonset):
 
         def run_bench(self,modes=['dual'],thresholds=[0.5]):
-                self.modes = modes
+                from os.path import dirname,basename
                 self.thresholds = thresholds
                 self.pretty_titles()
-                for mode in self.modes:
+                d,e,f = [],[],[]
+                for mode in modes:
+                        self.vlist = []
                         self.params.onsetmode = mode
                         for threshold in self.thresholds:
@@ -83 +21 @@
                                 self.pretty_print()
                                 #print self.v
+                                self.vlist.append(self.v)
+                        self.plotroc(d)
+                        self.plotfmeas(e)
+                        self.plotpr(f)
+                        #print vlist
+                #self.plotplotroc(d)
+                #self.plotplotfmeas(e)
+                #self.plotplotpr(f)
+                outplot = basename(self.datadir)
+                for ext in ("png","svg","ps"):
+                        self.plotplotroc(d,outplot=outplot,extension=ext)
+                        self.plotplotfmeas(e,outplot=outplot,extension=ext)
+                        self.plotplotpr(f,outplot=outplot,extension=ext)
+
 
         def auto_learn(self,modes=['dual'],thresholds=[0.1,1.5]):
@@ -107 +59 @@
 
                         for i in range(steps):
+                                self.params.localmin = True
+                                self.params.delay = 1. 
+                                self.dir_exec()
+                                self.dir_eval()
                                 self.params.threshold = ( lesst + topt ) * .5 
                                 self.dir_exec()
@@ -170 +126 @@
         if len(sys.argv) > 1: datapath = sys.argv[1]
         else: print "ERR: a path is required"; sys.exit(1)
-        modes = ['complex', 'energy', 'phase', 'specdiff', 'kl', 'mkl', 'dual']
-        #modes = [ 'mkl' ]
+        modes = ['complex', 'energy', 'phase', 'hfc', 'specdiff', 'kl', 'mkl', 'dual']
         thresholds = [ 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0, 1.1, 1.2]
-        #thresholds = [1.5]
+        #modes = [ 'hfc' ]
+        #thresholds = [0.1, 1.5]
 
         #datapath = "%s%s" % (DATADIR,'/onset/DB/*/')
         respath = '/var/tmp/DB-testings'
 
-        benchonset = benchonset(datapath,respath,checkres=True,checkanno=True)
+        benchonset = mybenchonset(datapath,respath,checkres=True,checkanno=True)
         benchonset.params = taskparams()
         benchonset.task = taskonset