Changeset e116e19 for python

Timestamp:

Sep 14, 2017, 4:33:21 PM (7 years ago)

Author:

Paul Brossier <piem@piem.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

Children:

9a52962

Parents:

c4fc0f2

Message:

python/tests/test_filterbank*.py: clean-up, improve get_coeff tests

Location:

python/tests

Files:

• test_filterbank.py (modified) (3 diffs)
• test_filterbank_mel.py (modified) (3 diffs)

python/tests/test_filterbank.py

@@ -1 +1 @@
 #! /usr/bin/env python
 
-from unittest import main
-from numpy.testing import TestCase
-from numpy.testing import assert_equal, assert_almost_equal
 import numpy as np
+from numpy.testing import TestCase, assert_equal, assert_almost_equal
+
 from aubio import cvec, filterbank, float_type
 from .utils import array_from_text_file
@@ -63 +62 @@
         assert_almost_equal ( expected, f.get_coeffs() )
 
+    def test_mfcc_coeffs_get_coeffs(self):
+        f = filterbank(40, 512)
+        coeffs = f.get_coeffs()
+        self.assertIsInstance(coeffs, np.ndarray)
+        assert_equal (coeffs, 0)
+        assert_equal (np.shape(coeffs), (40, 512 / 2 + 1))
+
 class aubio_filterbank_wrong_values(TestCase):
 
@@ -82 +88 @@
 
 if __name__ == '__main__':
-    main()
+    import nose2
+    nose2.main()

python/tests/test_filterbank_mel.py

@@ -1 +1 @@
 #! /usr/bin/env python
 
-from unittest import main
-from numpy.testing import TestCase
-from numpy.testing import assert_equal, assert_almost_equal
-from numpy import array, shape
+import numpy as np
+from numpy.testing import TestCase, assert_equal, assert_almost_equal
+
 from aubio import cvec, filterbank, float_type
 
@@ -13 +12 @@
         f.set_mel_coeffs_slaney(16000)
         a = f.get_coeffs()
-        assert_equal(shape (a), (40, 512/2 + 1) )
+        assert_equal(np.shape (a), (40, 512/2 + 1) )
 
     def test_other_slaney(self):
         f = filterbank(40, 512*2)
         f.set_mel_coeffs_slaney(44100)
-        _ = f.get_coeffs()
+        self.assertIsInstance(f.get_coeffs(), np.ndarray)
         #print "sum is", sum(sum(a))
         for win_s in [256, 512, 1024, 2048, 4096]:
             f = filterbank(40, win_s)
             f.set_mel_coeffs_slaney(32000)
-            _ = f.get_coeffs()
             #print "sum is", sum(sum(a))
+            self.assertIsInstance(f.get_coeffs(), np.ndarray)
 
     def test_triangle_freqs_zeros(self):
         f = filterbank(9, 1024)
         freq_list = [40, 80, 200, 400, 800, 1600, 3200, 6400, 12800, 15000, 24000]
-        freqs = array(freq_list, dtype = float_type)
+        freqs = np.array(freq_list, dtype = float_type)
         f.set_triangle_bands(freqs, 48000)
-        _ = f.get_coeffs().T
         assert_equal ( f(cvec(1024)), 0)
+        self.assertIsInstance(f.get_coeffs(), np.ndarray)
 
     def test_triangle_freqs_ones(self):
         f = filterbank(9, 1024)
         freq_list = [40, 80, 200, 400, 800, 1600, 3200, 6400, 12800, 15000, 24000]
-        freqs = array(freq_list, dtype = float_type)
+        freqs = np.array(freq_list, dtype = float_type)
         f.set_triangle_bands(freqs, 48000)
-        _ = f.get_coeffs().T
+        self.assertIsInstance(f.get_coeffs(), np.ndarray)
         spec = cvec(1024)
         spec.norm[:] = 1
@@ -47 +46 @@
 
 if __name__ == '__main__':
-    main()
+    import nose2
+    nose2.main()