more knn; stanford_mir.get_features

d50b58ce · Steve Tjoa · 476892c0 · d50b58ce · d50b58ce · d50b58ce
Commit d50b58ce authored Aug 17, 2016 by Steve Tjoa
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 12881 additions and 614 deletions

knn.html knn.html +12548 -586

knn.ipynb knn.ipynb +328 -25

core.py stanford_mir/core.py +5 -3

No files found.
--- a/knn.html
+++ b/knn.html
--- a/knn.ipynb
+++ b/knn.ipynb
--- a/stanford_mir/core.py
+++ b/stanford_mir/core.py
@@ -17,9 +17,11 @@ def extract_features(signal, features):

 def get_features(collection='drum_samples_train',
                 features=('zero_crossing_rate', 'spectral_centroid'),
-                 scaler=None):
+                 scaler=None,
+                 download=True):
+
    if collection == 'drum_samples_train':
-        kick_filepaths, snare_filepaths = download_samples('drum_samples_train')
+        kick_filepaths, snare_filepaths = download_samples('drum_samples_train', download=download)
        kick_signals = [
            librosa.load(p)[0] for p in kick_filepaths
        ]
@@ -42,7 +44,7 @@ def get_features(collection='drum_samples_train',
        return training_features, training_labels, scaler

    elif collection == 'drum_samples_test':
-        kick_filepaths, snare_filepaths = download_samples('drum_samples_test')
+        kick_filepaths, snare_filepaths = download_samples('drum_samples_test', download=download)
        kick_signals = [
            librosa.load(p)[0] for p in kick_filepaths
        ]