Showing the changes to python/tests/test_fvec.py (1 of 7 files). Show all
Unified · Split
| @@ -19,7 +19,7 @@ class aubio_fvec_test_case(TestCase): · 18 unmodified lines | |||
| 19 | a = fvec([0,1,2,3]) | 19 | a = fvec([0,1,2,3]) |
| 20 | assert a.dtype == 'float32' | 20 | assert a.dtype == 'float32' |
| 21 | assert a.shape == (4,) | 21 | assert a.shape == (4,) |
| 22 | assert_equal (range(4), a) | 22 | assert_equal (list(range(4)), a) |
| 23 | 23 | ||
| 24 | def test_vector_assign_element(self): | 24 | def test_vector_assign_element(self): |
| 25 | a = fvec(default_size) | 25 | a = fvec(default_size) |
| @@ -41,7 +41,7 @@ class aubio_fvec_test_case(TestCase): · 15 unmodified lines | |||
| 41 | a = fvec(1) | 41 | a = fvec(1) |
| 42 | a.T | 42 | a.T |
| 43 | array(a).T | 43 | array(a).T |
| 44 | a = range(len(a)) | 44 | a = list(range(len(a))) |
| 45 | 45 | ||
| 46 | def test_wrong_values(self): | 46 | def test_wrong_values(self): |
| 47 | self.assertRaises (ValueError, fvec, -10) | 47 | self.assertRaises (ValueError, fvec, -10) |
| @@ -52,11 +52,11 @@ class aubio_fvec_test_case(TestCase): · 4 unmodified lines | |||
| 52 | 52 | ||
| 53 | def test_alpha_norm_of_fvec(self): | 53 | def test_alpha_norm_of_fvec(self): |
| 54 | a = fvec(2) | 54 | a = fvec(2) |
| 55 | self.assertEquals (alpha_norm(a, 1), 0) | 55 | self.assertEqual (alpha_norm(a, 1), 0) |
| 56 | a[0] = 1 | 56 | a[0] = 1 |
| 57 | self.assertEquals (alpha_norm(a, 1), 0.5) | 57 | self.assertEqual (alpha_norm(a, 1), 0.5) |
| 58 | a[1] = 1 | 58 | a[1] = 1 |
| 59 | self.assertEquals (alpha_norm(a, 1), 1) | 59 | self.assertEqual (alpha_norm(a, 1), 1) |
| 60 | a = array([0, 1], dtype='float32') | 60 | a = array([0, 1], dtype='float32') |
| 61 | from math import sqrt | 61 | from math import sqrt |
| 62 | assert_almost_equal (alpha_norm(a, 2), sqrt(2)/2.) | 62 | assert_almost_equal (alpha_norm(a, 2), sqrt(2)/2.) |
| @@ -73,7 +73,7 @@ class aubio_fvec_test_case(TestCase): · 10 unmodified lines | |||
| 73 | self.assertRaises (ValueError, alpha_norm, a, 1) | 73 | self.assertRaises (ValueError, alpha_norm, a, 1) |
| 74 | # check 1d array | 74 | # check 1d array |
| 75 | a = array(range(10), dtype = 'float32') | 75 | a = array(range(10), dtype = 'float32') |
| 76 | self.assertEquals (alpha_norm(a, 1), 4.5) | 76 | self.assertEqual (alpha_norm(a, 1), 4.5) |
| 77 | 77 | ||
| 78 | def test_alpha_norm_of_array_of_int(self): | 78 | def test_alpha_norm_of_array_of_int(self): |
| 79 | a = array(1, dtype = 'int') | 79 | a = array(1, dtype = 'int') |
| @@ -91,11 +91,11 @@ class aubio_fvec_test_case(TestCase): · 11 unmodified lines | |||
| 91 | a = array([0,1,-1], dtype='float32') | 91 | a = array([0,1,-1], dtype='float32') |
| 92 | assert_almost_equal (zero_crossing_rate(a), 1./3. ) | 92 | assert_almost_equal (zero_crossing_rate(a), 1./3. ) |
| 93 | a = array([0.]*100, dtype='float32') | 93 | a = array([0.]*100, dtype='float32') |
| 94 | self.assertEquals (zero_crossing_rate(a), 0 ) | 94 | self.assertEqual (zero_crossing_rate(a), 0 ) |
| 95 | a = array([-1.]*100, dtype='float32') | 95 | a = array([-1.]*100, dtype='float32') |
| 96 | self.assertEquals (zero_crossing_rate(a), 0 ) | 96 | self.assertEqual (zero_crossing_rate(a), 0 ) |
| 97 | a = array([1.]*100, dtype='float32') | 97 | a = array([1.]*100, dtype='float32') |
| 98 | self.assertEquals (zero_crossing_rate(a), 0 ) | 98 | self.assertEqual (zero_crossing_rate(a), 0 ) |
| 99 | 99 | ||
| 100 | def test_alpha_norm_of_array_of_float64(self): | 100 | def test_alpha_norm_of_array_of_float64(self): |
| 101 | # check scalar fail | 101 | # check scalar fail |
| @@ -105,10 +105,10 @@ class aubio_fvec_test_case(TestCase): · 3 unmodified lines | |||
| 105 | a = array([[[1,2],[3,4]]], dtype = 'float64') | 105 | a = array([[[1,2],[3,4]]], dtype = 'float64') |
| 106 | self.assertRaises (ValueError, alpha_norm, a, 1) | 106 | self.assertRaises (ValueError, alpha_norm, a, 1) |
| 107 | # check float64 1d array fail | 107 | # check float64 1d array fail |
| 108 | a = array(range(10), dtype = 'float64') | 108 | a = array(list(range(10)), dtype = 'float64') |
| 109 | self.assertRaises (ValueError, alpha_norm, a, 1) | 109 | self.assertRaises (ValueError, alpha_norm, a, 1) |
| 110 | # check float64 2d array fail | 110 | # check float64 2d array fail |
| 111 | a = array([range(10), range(10)], dtype = 'float64') | 111 | a = array([list(range(10)), list(range(10))], dtype = 'float64') |
| 112 | self.assertRaises (ValueError, alpha_norm, a, 1) | 112 | self.assertRaises (ValueError, alpha_norm, a, 1) |
| 113 | 113 | ||
| 114 | def test_fvec_min_removal_of_array(self): | 114 | def test_fvec_min_removal_of_array(self): |