Showing the changes to python (2 of 2 files). Show all
Unified · Split
| @@ -143,19 +143,15 @@ class bench: · 142 unmodified lines | ||
| 143 | 143 | print "Creating results directory" |
| 144 | 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 | 147 | for i in range(len(values)): |
| 148 | − print self.formats[i] % values[i], | |
| 148 | + print self.formats[i] % values[i], sep, | |
| 149 | 149 | |
| 150 | 150 | |
| 151 | 151 | def dir_exec(self): |
| 152 | 152 | """ run file_exec on every input file """ |
| 153 | − self.orig, self.missed, self.merged, self.expc, \ | |
| 154 | − self.bad, self.doubled = 0, 0, 0, 0, 0, 0 | |
| 155 | − self.l , self.mean = [], 0 | |
| 156 | − act_on_files(self.file_exec,self.sndlist,self.reslist, \ | |
| 157 | − suffix='',filter=sndfile_filter) | |
| 158 | − | |
| 153 | + pass | |
| 154 | + | |
| 159 | 155 | def dir_eval(self): |
| 160 | 156 | pass |
| 161 | 157 | |
| @@ -401,9 +401,10 @@ class taskonset(task): · 400 unmodified lines | ||
| 401 | 401 | self.expc, self.bad, self.doubled = \ |
| 402 | 402 | onset_roc(ltru,lres,self.params.tol) |
| 403 | 403 | elif mode == 'rocloc': |
| 404 | − self.orig, self.missed, self.merged, \ | |
| 405 | − self.expc, self.bad, self.doubled, \ | |
| 406 | − self.l, self.mean = \ | |
| 404 | + self.v = {} | |
| 405 | + self.v['orig'], self.v['missed'], self.v['Tm'], \ | |
| 406 | + self.v['expc'], self.v['bad'], self.v['Td'], \ | |
| 407 | + self.v['l'], self.v['labs'] = \ | |
| 407 | 408 | onset_rocloc(ltru,lres,self.params.tol) |
| 408 | 409 | |
| 409 | 410 | def plot(self,onsets,ofunc): |