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

Paul Brossier committed 20 years ago

Commit dbc03511 parent 0cd995a2 files · +8 −11Browse files

Showing the changes to python (2 of 2 files). Show all

Unified · Split

2 files

@@ -143,19 +143,15 @@ class bench: · 142 unmodified lines
143	print "Creating results directory"	143	print "Creating results directory"
144	act_on_results(mkdir,self.datadir,self.resdir,filter='d')	144	act_on_results(mkdir,self.datadir,self.resdir,filter='d')
145		145
146	def pretty_print(self,values):	146	def pretty_print(self,values,sep='\|'):
147	for i in range(len(values)):	147	for i in range(len(values)):
148	print self.formats[i] % values[i],	148	print self.formats[i] % values[i], sep,
149	print	149	print
150		150
151	def dir_exec(self):	151	def dir_exec(self):
152	""" run file_exec on every input file """	152	""" run file_exec on every input file """
153	self.orig, self.missed, self.merged, self.expc, \	153	pass
154	self.bad, self.doubled = 0, 0, 0, 0, 0, 0	154
155	self.l , self.mean = [], 0
156	act_on_files(self.file_exec,self.sndlist,self.reslist, \
157	suffix='',filter=sndfile_filter)
158
159	def dir_eval(self):	155	def dir_eval(self):
160	pass	156	pass
161		157

 				self.expc, self.bad, self.doubled = \
 				onset_roc(ltru,lres,self.params.tol)
 		elif mode == 'rocloc':
-			self.orig, self.missed, self.merged, \
+			self.v = {}
-				self.expc, self.bad, self.doubled, \
+			self.v['orig'], self.v['missed'], self.v['Tm'], \
-				self.l, self.mean = \
+				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):

Keyboard shortcuts