Changeset 7445aea for python

Timestamp:

Mar 29, 2005, 5:46:05 PM (19 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:

19b56b0

Parents:

20f9748

Message:

updated aubiocompare-onset and onsetcompare.py

Location:

python

Files:

• aubio/onsetcompare.py (modified) (1 diff)
• aubiocompare-onset (modified) (3 diffs)

python/aubio/onsetcompare.py

@@ -54 +54 @@
     ok    = n - missed
     hits  = m - bad
+    # at this point, we must have ok = hits. if not we had
+    #   - a case were one onset counted for two labels (ok>hits)
+    #   - a case were one labels matched two onsets (hits>ok)
+    # bad hack for now (fails if both above cases have happened):
+    if ok > hits: bad += ok-hits; ok = hits
+    if hits > ok: missed += hits-ok; hits = ok
     total = n
     return ok,bad,missed,total,hits

python/aubiocompare-onset

@@ -61 +61 @@
 fileo=None;filec=None;vmode=None;dmode=None;delay=0.
 # default tolerance is 50 ms
-tol = 0.050
+#tol = 0.050
+tol = 0.048
 
 while len(sys.argv) >=2:
@@ -71 +72 @@
     if option == '-d': dmode = 'debug'
     if option == '-D': delay = float(sys.argv[1]); del sys.argv[1] 
+    if option == '-tol': tol = float(sys.argv[1]); del sys.argv[1] 
 
 # arguments required
@@ -81 +83 @@
 
 # delay onsets as required with -D
-for i in range(len(lres)):
-    lres[i] = lres[i] + delay
+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)