start using results structure, move onset specific out of node

start using results structure, move onset specific out of node

diff --git a/python/aubio/bench/node.py b/python/aubio/bench/node.py
index 38069aa45d95bfd2c182500d49650c446dc6c239..9ab753bab7713ca2a517afd87dcbcf32620dad65 100644 (file)
--- a/python/aubio/bench/node.py
+++ b/python/aubio/bench/node.py
@@ -143,19 +143,15 @@ class bench:
                print "Creating results directory"
                act_on_results(mkdir,self.datadir,self.resdir,filter='d')
 
-       def pretty_print(self,values):
+       def pretty_print(self,values,sep='|'):
                for i in range(len(values)):
-                       print self.formats[i] % values[i],
+                       print self.formats[i] % values[i], sep,
                print
 
        def dir_exec(self):
                """ run file_exec on every input file """
-               self.orig, self.missed, self.merged, self.expc, \
-                       self.bad, self.doubled = 0, 0, 0, 0, 0, 0
-               self.l , self.mean = [], 0
-               act_on_files(self.file_exec,self.sndlist,self.reslist, \
-                       suffix='',filter=sndfile_filter)
-       
+               pass
+
        def dir_eval(self):
                pass
 

diff --git a/python/aubio/tasks.py b/python/aubio/tasks.py
index 49fd5b7e608b08ba579d07df45fd9fd0eab4bdcb..f8069a9c91272f6ed21508371105596c10f3234b 100644 (file)
--- a/python/aubio/tasks.py
+++ b/python/aubio/tasks.py
@@ -401,9 +401,10 @@ class taskonset(task):
                                self.expc, self.bad, self.doubled = \
                                onset_roc(ltru,lres,self.params.tol)
                elif mode == 'rocloc':
-                       self.orig, self.missed, self.merged, \
-                               self.expc, self.bad, self.doubled, \
-                               self.l, self.mean = \
+                       self.v = {}
+                       self.v['orig'], self.v['missed'], self.v['Tm'], \
+                               self.v['expc'], self.v['bad'], self.v['Td'], \
+                               self.v['l'], self.v['labs'] = \
                                onset_rocloc(ltru,lres,self.params.tol)
 
        def plot(self,onsets,ofunc):