Changeset 37f0352

Timestamp:

Feb 23, 2006, 3:14:30 AM (18 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:

2d975cf

Parents:

0baafcf

Message:

add mintol to taskonset, fix taskpitch.eval
add mintol to taskonset, fix taskpitch.eval

File:

• python/aubio/tasks.py (modified) (5 diffs)

python/aubio/tasks.py

@@ -207 +207 @@
                 self.samplerate = 44100
                 self.tol = 0.05
+                self.mintol = 0.0
                 self.step = float(self.hopsize)/float(self.samplerate)
                 self.threshold = 0.1
@@ -299 +300 @@
                 floatpit = self.input.split('.')[-2]
                 try:
-                        return float(floatpit)
+                        return aubio_miditofreq(float(floatpit))
                 except ValueError:
                         print "ERR: no truth file found"
@@ -305 +306 @@
 
         def eval(self,results):
+                def mmean(l):
+                        return sum(l)/max(float(len(l)),1)
+
                 from median import short_find 
                 self.truth = self.gettruth()
-                num = 0
-                sum = 0
                 res = []
                 for i in results:
                         if i == -1: pass
                         else: 
-                                res.append(i)
-                                sum += i
-                                num += 1
-                if num == 0: 
-                        avg = 0; med = 0
+                                res.append(self.truth-i)
+                if not res: 
+                        avg = self.truth; med = self.truth 
                 else:
-                        avg = aubio_freqtomidi(sum / float(num))
-                        med = aubio_freqtomidi(short_find(res,len(res)/2))
-                avgdist = self.truth - avg
-                meddist = self.truth - med
-                return avgdist, meddist
+                        avg = mmean(res) 
+                        med = short_find(res,len(res)/2) 
+                return self.truth, self.truth-med, self.truth-avg
 
         def plot(self,pitch,outplot=None):
@@ -351 +349 @@
                 self.d,self.d2 = [],[]
                 self.maxofunc = 0
+                self.last = 0
                 if self.params.localmin:
                         self.ovalist   = [0., 0., 0., 0., 0.]
@@ -377 +376 @@
                         if now < 0 :
                                 now = 0
-                        return now, val 
+                        if self.params.mintol:
+                                #print now - self.last, self.params.mintol
+                                if (now - self.last) > self.params.mintol:
+                                        self.last = now
+                                        return now, val
+                        else:
+                                return now, val