Changeset 336cf77

Timestamp:

Dec 16, 2005, 5:34:00 AM (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:

50791b3

Parents:

75139a9

Message:

rename class task to bench, move pretty_print into it
rename class task to bench, move pretty_print into it

Location:

python

Files:

• aubio/bench/node.py (modified) (3 diffs)
• bench-onset (modified) (2 diffs)

python/aubio/bench/node.py

@@ -71 +71 @@
                 action("%s%s%s"%(respath,'/',s))
 
-class task:
+class bench:
 
-        def __init__(self,datadir,resdir):
+        def __init__(self,datadir,resdir,checkres=False,checkanno=False):
                 self.datadir = datadir
                 self.resdir = resdir
                 print "Checking data directory", self.datadir
                 self.checkdata()
-                self.checkres()
+                if checkanno: self.checkanno()
+                if checkres: self.checkres()
         
         def checkdata(self):
@@ -89 +90 @@
                 print " (%d elements)" % len(self.sndlist)
                 #for each in self.sndlist: print each
+        
+        def checkanno(self):
                 print "Listing annotations in data directory",
                 self.reslist = list_res_files(self.datadir)
@@ -102 +105 @@
                 print "Creating results directory"
                 act_on_results(mkdir,self.datadir,self.resdir,filter='d')
+
+        def pretty_print(self,values):
+                for i in range(len(values)):
+                        print self.formats[i] % values[i],
+                print
+

python/bench-onset

@@ -18 +18 @@
                 self.mode = 'dual'
 
-class taskonset(task):
+class benchonset(bench):
         
-        def pretty_print(self,values):
-                for i in range(len(values)):
-                        print self.formats[i] % values[i],
-                print
-
         def compute_results(self):
                 self.P = 100*float(self.expc-self.missed-self.merged)/(self.expc-self.missed-self.merged + self.bad+self.doubled)
@@ -158 +153 @@
 respath = '/var/tmp/DB-testings'
 
-taskonset = taskonset(datapath,respath)
+benchonset = benchonset(datapath,respath,checkres=True,checkanno=True)
 
-taskonset.params = onset_parameters()
+benchonset.params = onset_parameters()
 
-taskonset.titles = [ 'mode', 'thres', 'orig', 'expc', 'missd', 'mergd',
+benchonset.titles = [ 'mode', 'thres', 'orig', 'expc', 'missd', 'mergd',
 'bad', 'doubl', 'corrt', 'GD', 'FP', 'GD-merged', 'FP-pruned',
 'prec', 'recl', 'dist' ]
-taskonset.formats = ["%12s" , "| %6s", "| %6s", "| %6s", "| %6s", "| %6s", 
+benchonset.formats = ["%12s" , "| %6s", "| %6s", "| %6s", "| %6s", "| %6s", 
 "| %6s", "| %6s", "| %6s", "| %8s", "| %8s", "| %8s", "| %8s",
 "| %6s", "| %6s", "| %6s"] 
 
-#taskonset.run_bench(modes=modes,thresholds=thresholds)
-taskonset.auto_learn(modes=modes)
+#benchonset.run_bench(modes=modes,thresholds=thresholds)
+benchonset.auto_learn(modes=modes)
 
 #        gatherdata