From 61680aa127dca6cd6c4f043433a2301063c639cb Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Wed, 14 Dec 2005 13:42:45 +0000 Subject: [PATCH] correct default bufsize, fix function level import correct default bufsize, fix function level import --- python/aubio/onsetcompare.py | 10 +++++----- python/aubiocut | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/python/aubio/onsetcompare.py b/python/aubio/onsetcompare.py index 0eb66432..0e98c9a1 100644 --- a/python/aubio/onsetcompare.py +++ b/python/aubio/onsetcompare.py @@ -72,17 +72,17 @@ def onset_diffs(ltru, lexp, eps): return l def notes_roc (la, lb, eps): - from numarray import * + from numarray import transpose, add, resize """ creates a matrix of size len(la)*len(lb) then look for hit and miss in it within eps tolerance windows """ gdn,fpw,fpg,fpa,fdo,fdp = 0,0,0,0,0,0 m = len(la) n = len(lb) - x = resize(la[:,0],(n,m)) - y = transpose(resize(lb[:,0],(m,n))) + x = resize(la[:][0],(n,m)) + y = transpose(resize(lb[:][0],(m,n))) teps = (abs(x-y) <= eps[0]) - x = resize(la[:,1],(n,m)) - y = transpose(resize(lb[:,1],(m,n))) + x = resize(la[:][1],(n,m)) + y = transpose(resize(lb[:][1],(m,n))) tpitc = (abs(x-y) <= eps[1]) res = teps * tpitc res = add.reduce(res,axis=0) diff --git a/python/aubiocut b/python/aubiocut index b4af3c85..8c2fac0e 100755 --- a/python/aubiocut +++ b/python/aubiocut @@ -21,7 +21,7 @@ def parse_args(): complexdomain|hfc|phase|specdiff|energy|kl|mkl|dual") parser.add_option("-B","--bufsize", action="store", dest="bufsize", default=512, - help="buffer size [default=1024]") + help="buffer size [default=512]") parser.add_option("-H","--hopsize", action="store", dest="hopsize", default=256, help="overlap size [default=256]") -- 2.26.2