Showing the changes to python (5 of 5 files). Show all
Unified · Split
| @@ -89,7 +89,7 @@ def act_on_files (action,listfiles,listres=None,suffix='.txt',filter='f',sub='\. · 88 unmodified lines | |||
| 89 | class bench: | 89 | class bench: |
| 90 | """ class to run benchmarks on directories """ | 90 | """ class to run benchmarks on directories """ |
| 91 | def __init__(self,datadir,resdir=None,checkres=False,checkanno=False,params=[]): | 91 | def __init__(self,datadir,resdir=None,checkres=False,checkanno=False,params=[]): |
| 92 | from aubio.tasks import taskparams | 92 | from aubio.task.params import taskparams |
| 93 | self.datadir = datadir | 93 | self.datadir = datadir |
| 94 | # path to write results path to | 94 | # path to write results path to |
| 95 | self.resdir = resdir | 95 | self.resdir = resdir |
File renamed without changes.
| @@ -60,8 +60,8 @@ class taskonset(task): · 59 unmodified lines | |||
| 60 | print self.params.step*foo[0] | 60 | print self.params.step*foo[0] |
| 61 | 61 | ||
| 62 | def eval(self,inputdata,ftru,mode='roc',vmode=''): | 62 | def eval(self,inputdata,ftru,mode='roc',vmode=''): |
| 63 | from txtfile import read_datafile | 63 | from aubio.txtfile import read_datafile |
| 64 | from onsetcompare import onset_roc, onset_diffs, onset_rocloc | 64 | from aubio.onsetcompare import onset_roc, onset_diffs, onset_rocloc |
| 65 | ltru = read_datafile(ftru,depth=0) | 65 | ltru = read_datafile(ftru,depth=0) |
| 66 | lres = [] | 66 | lres = [] |
| 67 | for i in range(len(inputdata)): lres.append(inputdata[i][0]*self.params.step) | 67 | for i in range(len(inputdata)): lres.append(inputdata[i][0]*self.params.step) |
| @@ -1,8 +1,8 @@ | |||
| 1 | #! /usr/bin/python | 1 | #! /usr/bin/python |
| 2 | 2 | ||
| 3 | from aubio.tasks import * | 3 | from aubio.task import * |
| 4 | 4 | ||
| 5 | from benchonset import mmean, stdev, benchonset | 5 | from aubio.bench.onset import mmean, stdev, benchonset |
| 6 | 6 | ||
| 7 | class mybenchonset(benchonset): | 7 | class mybenchonset(benchonset): |
| 8 | 8 | ||
| @@ -1,7 +1,7 @@ | |||
| 1 | #! /usr/bin/python | 1 | #! /usr/bin/python |
| 2 | 2 | ||
| 3 | from aubio.bench.node import * | 3 | from aubio.bench.node import * |
| 4 | from aubio.tasks import * | 4 | from aubio.task import * |
| 5 | 5 | ||
| 6 | class benchpitch(bench): | 6 | class benchpitch(bench): |
| 7 | 7 | ||