Changeset af445db

Timestamp:

Dec 22, 2005, 5:39:02 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:

1dae4eb

Parents:

27f2c08

Message:

add auto_learn2 method, which converges
add auto_learn2 method, which converges

File:

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

python/bench-onset

@@ -98 +98 @@
                                         lesst /= 2.
 
+        def auto_learn2(self,modes=['dual'],thresholds=[0.1,1.0]):
+                """ simple dichotomia like algorithm to optimise threshold """
+                self.modes = modes
+                self.pretty_print(self.titles)
+                for mode in self.modes:
+                        steps = 10 
+                        step = thresholds[1]
+                        curt = thresholds[0] 
+                        self.params.onsetmode = mode
+
+                        self.params.threshold = curt 
+                        self.dir_exec()
+                        self.dir_eval()
+                        self.pretty_print(self.values)
+                        curexp = self.expc
+
+                        for i in range(steps):
+                                if curexp < self.orig:
+                                        #print "we found at most less onsets than annotated"
+                                        self.params.threshold -= step 
+                                        step /= 2
+                                elif curexp > self.orig:
+                                        #print "we found more onsets than annotated"
+                                        self.params.threshold += step 
+                                        step /= 2
+                                self.dir_exec()
+                                self.dir_eval()
+                                curexp = self.expc
+                                self.pretty_print(self.values)
+                                if self.orig == 100.0 or self.orig == self.expc: 
+                                        print "assuming we converged, stopping" 
+                                        break
 
 if __name__ == "__main__":
@@ -123 +155 @@
 
         try:
-                benchonset.auto_learn(modes=modes)
+                benchonset.auto_learn2(modes=modes)
                 #benchonset.run_bench(modes=modes)
         except KeyboardInterrupt: