Changeset 296c33a for python

Timestamp:

May 23, 2005, 12:41:22 AM (20 years ago)

Author:

Paul Brossier <piem@altern.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

2a33cc9

Parents:

71f98f1

Message:

update aubiocompare-onset to new evaluation function
update aubiocompare-onset to new evaluation function

File:

• python/aubiocompare-onset (modified) (2 diffs)

python/aubiocompare-onset

@@ -5 +5 @@
 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__ = """\
@@ -87 +87 @@
         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