shithub: aubio

Info  •  Files  •  Log  •  Branches

start using results structure, move onset specific out of node
start using results structure, move onset specific out of node

--- a/python/aubio/bench/node.py

+++ b/python/aubio/bench/node.py

@@ -143,19 +143,15 @@

 		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

--- a/python/aubio/tasks.py

+++ b/python/aubio/tasks.py

@@ -401,9 +401,10 @@

 				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):