Changeset 5d1c070 for python/aubio

Timestamp:

Mar 5, 2006, 4:21:16 AM (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:

d8604ac

Parents:

43938de

Message:

updated to new bench-pitch, fixed gettruth
updated to new bench-pitch, fixed gettruth

Location:

python/aubio

Files:

• bench/node.py (modified) (1 diff)
• task/pitch.py (modified) (5 diffs)

python/aubio/bench/node.py

@@ -26 +26 @@
         if maxdepth >= 0: maxstring = " -maxdepth %d " % maxdepth       
         else: maxstring = ""
-        cmd = '%s' * 5 % ('find ',datapath,maxstring,' -type ',filter)
+        cmd = '%s' * 6 % ('find ',datapath,maxstring,' -type ',filter, "| sort -n")
         return runcommand(cmd)
 

python/aubio/task/pitch.py

@@ -61 +61 @@
                 elif floatpit:
                         try:
-                                self.truth = aubio_miditofreq(float(floatpit))
-                                print "ground truth found in filename:", self.truth
-                                tasksil = tasksilence(self.input)
+                                self.truth = float(floatpit)
+                                #print "ground truth found in filename:", self.truth
+                                tasksil = tasksilence(self.input,params=self.params)
                                 time,pitch =[],[]
                                 while(tasksil.readsize==tasksil.params.hopsize):
@@ -84 +84 @@
                                         for i in range(len(values)):
                                                 time.append(values[i][0])
-                                                pitch.append(values[i][1])
+                                                pitch.append(aubio_freqtomidi(values[i][1]))
                                         return time,pitch
 
-        def eval(self,results):
+        def oldeval(self,results):
                 def mmean(l):
                         return sum(l)/max(float(len(l)),1)
@@ -105 +105 @@
                 return self.truth, self.truth-med, self.truth-avg
 
-        def neweval(self,results):
+        def eval(self,pitch,tol=0.9):
                 timet,pitcht = self.gettruth()
-                for i in timet:
-                        print results[i]
-                return self.truth, self.truth-med, self.truth-avg
+                pitch = [aubio_freqtomidi(i) for i in pitch]
+                for i in range(len(pitch)):
+                        if pitch[i] == "nan" or pitch[i] == -1:
+                                pitch[i] = -1
+                time = [ i*self.params.step for i in range(len(pitch)) ]
+                assert len(timet) == len(time) 
+                assert len(pitcht) == len(pitch)
+                osil, esil, opit, epit, echr = 0, 0, 0, 0, 0
+                for i in range(len(pitcht)):
+                        if pitcht[i] == -1: # currently silent
+                                osil += 1 # count a silence
+                                if pitch[i] == -1. or pitch[i] == "nan": 
+                                        esil += 1 # found a silence
+                        else:
+                                opit +=1
+                                if abs(pitcht[i] - pitch[i]) < tol:
+                                        epit += 1
+                                        echr += 1
+                                elif abs(pitcht[i] - pitch[i]) % 12. < tol:
+                                        echr += 1
+                                #else:
+                                #       print timet[i], pitcht[i], time[i], pitch[i]
+                #print "origsilence", "foundsilence", "origpitch", "foundpitch", "orig pitchroma", "found pitchchroma"
+                #print 100.*esil/float(osil), 100.*epit/float(opit), 100.*echr/float(opit)
+                return osil, esil, opit, epit, echr
 
         def plot(self,pitch,wplot,oplots,outplot=None):
@@ -115 +137 @@
                 import Gnuplot
 
-                self.eval(pitch)
                 downtime = self.params.step*numarray.arange(len(pitch))
-                oplots.append(Gnuplot.Data(downtime,pitch,with='lines',
+                oplots.append(Gnuplot.Data(downtime,pitch,with='linespoints',
                         title=self.params.pitchmode))
 
                         
-        def plotplot(self,wplot,oplots,outplot=None,multiplot = 1):
+        def plotplot(self,wplot,oplots,outplot=None,multiplot = 0):
                 from aubio.gnuplot import gnuplot_init, audio_to_array, make_audio_plot
                 import re
@@ -132 +153 @@
                 timet,pitcht = self.gettruth()
                 if timet and pitcht:
+                        pitcht = [aubio_miditofreq(i) for i in pitcht]
                         oplots = [Gnuplot.Data(timet,pitcht,with='lines',
                                 title='ground truth')] + oplots