Changeset a9d9c5c for python/aubiocompare-onset

Timestamp:

May 28, 2005, 8:45:34 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:

ead2920

Parents:

5a1ff62

Message:

updated to new onset_roc, added -l for onset_diffs
updated to new onset_roc, added -l for onset_diffs

File:

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

python/aubiocompare-onset

@@ -55 +55 @@
 
 import sys
-from aubio.onsetcompare import onset_roc
+from aubio.onsetcompare import onset_roc, onset_diffs
 from aubio.txtfile import read_datafile
 
@@ -63 +63 @@
 #tol = 0.050
 tol = 0.048
+# default mode is onset
+mode = 'onset'
 
 while len(sys.argv) >=2:
@@ -73 +75 @@
     if option == '-D': delay = float(sys.argv[1]); del sys.argv[1] 
     if option == '-tol': tol = float(sys.argv[1]); del sys.argv[1] 
+    if option == '-l': mode = 'localisation'
 
 # arguments required
@@ -87 +90 @@
         lres[i] = lres[i] + delay
 # compute errors types
-orig, missed, merged, expc, bad, doubled = \
-        onset_roc(ltru,lres,tol)
-
-# print results
-#print "orig, missed, merged, expc, bad, doubled:"
-if vmode=='verbose':
-    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))                
+if mode == 'localisation':
+        l = onset_diffs(ltru,lres,tol)
+        for i in l: print i
 else:
-    print  orig, missed, merged, expc, bad, doubled
+        orig, missed, merged, expc, bad, doubled = onset_roc(ltru,lres,tol)
+        
+        # print results
+        #print "orig, missed, merged, expc, bad, doubled:"
+        if vmode=='verbose':
+            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  orig, missed, merged, expc, bad, doubled