From 296c33a87621c5a2cc5fd56e19946c2d20c4406f Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Sun, 22 May 2005 22:41:22 +0000 Subject: [PATCH] update aubiocompare-onset to new evaluation function update aubiocompare-onset to new evaluation function --- python/aubiocompare-onset | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/python/aubiocompare-onset b/python/aubiocompare-onset index 3b24a5a0..af327863 100755 --- a/python/aubiocompare-onset +++ b/python/aubiocompare-onset @@ -4,7 +4,7 @@ print aubio.__LICENSE__ for the terms of use -or see LICENSE.txt in the numarray installation directory. +or see LICENSE.txt in the aubio installation directory. """ __LICENSE__ = """\ Copyright (C) 2004 Paul Brossier @@ -86,14 +86,15 @@ if delay: for i in range(len(lres)): lres[i] = lres[i] + delay # compute errors types -ok, bad, missed, total, hits = onset_roc(ltru,lres,tol) +orig, missed, merged, expc, bad, doubled = \ + onset_roc(ltru,lres,tol) # print results +#print "orig, missed, merged, expc, bad, doubled:" if vmode=='verbose': - print '( ok bad missed ) tot / hits \t', - print '(', ok, bad, missed, ')', total, '/', hits, - print '\t', - print 100*float(ok)/(ok+missed), '%GD\t', - print 100*float(bad)/(hits+bad), '%FP\t' + print "GD %2.8f\t" % (100*float(orig-missed-merged)/(orig)), + print "FP %2.8f\t" % (100*float(bad+doubled)/(orig)) , + print "GD-merged %2.8f\t" % (100*float(orig-missed)/(orig)) , + print "FP-pruned %2.8f\t" % (100*float(bad)/(orig)) else: - print ok, bad, missed, total, hits + print orig, missed, merged, expc, bad, doubled -- 2.26.2