interfaces/python: start updating tests for mono

diff --git a/interfaces/python/test_aubio.py b/interfaces/python/test_aubio.py
index 6cb17120aca0e59ee80841447fe439e98b3da6ab..0af59566e4c83383a6f9706658c9b5bd9965bb89 100644 (file)
--- a/interfaces/python/test_aubio.py
+++ b/interfaces/python/test_aubio.py
@@ -3,126 +3,11 @@ from numpy.testing import assert_equal
 from _aubio import *
 from numpy import array
 
-AUBIO_DO_CASTING = 0
-
 class aubiomodule_test_case(TestCase):
 
   def setUp(self):
     """ try importing aubio """
 
-  def test_vector(self):
-    a = fvec()
-    a.length, a.channels
-    a[0]
-    array(a)
-    a = fvec(10)
-    a = fvec(1, 2)
-    array(a).T
-    a[0] = range(a.length)
-    a[1][0] = 2
-
-  def test_wrong_values(self):
-    self.assertRaises (ValueError, fvec, -10)
-    self.assertRaises (ValueError, fvec, 1, -1)
-  
-    a = fvec(2, 3)
-    self.assertRaises (IndexError, a.__getitem__, 3)
-    self.assertRaises (IndexError, a[0].__getitem__, 2)
-
-  def test_alpha_norm_of_fvec(self):
-    a = fvec(2, 2)
-    self.assertEquals (alpha_norm(a, 1), 0)
-    a[0] = [1, 2] 
-    self.assertEquals (alpha_norm(a, 1), 1.5)
-    a[1] = [1, 2] 
-    self.assertEquals (alpha_norm(a, 1), 3)
-    a[0] = [0, 1]; a[1] = [1, 0]
-    self.assertEquals (alpha_norm(a, 2), 1)
-
-  def test_alpha_norm_of_array_of_float32(self):
-    # check scalar fails
-    a = array(1, dtype = 'float32')
-    self.assertRaises (ValueError, alpha_norm, a, 1)
-    # check 3d array fails
-    a = array([[[1,2],[3,4]]], dtype = 'float32')
-    self.assertRaises (ValueError, alpha_norm, a, 1)
-    # check 1d array
-    a = array(range(10), dtype = 'float32')
-    self.assertEquals (alpha_norm(a, 1), 4.5)
-    # check 2d array
-    a = array([range(10), range(10)], dtype = 'float32')
-    self.assertEquals (alpha_norm(a, 1), 9)
-
-  def test_alpha_norm_of_array_of_int(self):
-    a = array(1, dtype = 'int')
-    self.assertRaises (ValueError, alpha_norm, a, 1)
-    a = array([[[1,2],[3,4]]], dtype = 'int')
-    self.assertRaises (ValueError, alpha_norm, a, 1)
-    a = array(range(10), dtype = 'int')
-    self.assertRaises (ValueError, alpha_norm, a, 1)
-
-  def test_alpha_norm_of_array_of_string (self):
-    a = "hello"
-    self.assertRaises (ValueError, alpha_norm, a, 1)
-
-  def test_zero_crossing_rate(self):
-    a = array([0,1,-1], dtype='float32')
-    self.assertEquals (zero_crossing_rate(a), 1./3 )
-    a = array([0.]*100, dtype='float32')
-    self.assertEquals (zero_crossing_rate(a), 0 )
-    a = array([-1.]*100, dtype='float32')
-    self.assertEquals (zero_crossing_rate(a), 0 )
-    a = array([1.]*100, dtype='float32')
-    self.assertEquals (zero_crossing_rate(a), 0 )
-
-  def test_alpha_norm_of_array_of_float64(self):
-    # check scalar fail
-    a = array(1, dtype = 'float64')
-    self.assertRaises (ValueError, alpha_norm, a, 1)
-    # check 3d array fail
-    a = array([[[1,2],[3,4]]], dtype = 'float64')
-    self.assertRaises (ValueError, alpha_norm, a, 1)
-    if AUBIO_DO_CASTING:
-      # check float64 1d array fail
-      a = array(range(10), dtype = 'float64')
-      self.assertEquals (alpha_norm(a, 1), 4.5)
-      # check float64 2d array fail
-      a = array([range(10), range(10)], dtype = 'float64')
-      self.assertEquals (alpha_norm(a, 1), 9)
-    else:
-      # check float64 1d array fail
-      a = array(range(10), dtype = 'float64')
-      self.assertRaises (ValueError, alpha_norm, a, 1)
-      # check float64 2d array fail
-      a = array([range(10), range(10)], dtype = 'float64')
-      self.assertRaises (ValueError, alpha_norm, a, 1)
-
-  def test_fvec_min_removal_of_array(self):
-    a = array([20,1,19], dtype='float32')
-    b = min_removal(a)
-    assert_equal (array(b), [19, 0, 18])
-    assert_equal (b, [19, 0, 18])
-    assert_equal (a, b)
-    a[0] = 0
-    assert_equal (a, b)
-
-  def test_fvec_min_removal_of_array_float64(self):
-    a = array([20,1,19], dtype='float64')
-    if AUBIO_DO_CASTING:
-      b = min_removal(a)
-      assert_equal (array(b), [19, 0, 18])
-      assert_equal (b, [19, 0, 18])
-      #assert_equal (a, b)
-    else:
-      self.assertRaises (ValueError, min_removal, a)
-      
-  def test_fvec_min_removal_of_fvec(self):
-    a = fvec(3, 1)
-    a[0] = [20, 1, 19]
-    b = min_removal(a)
-    assert_equal (array(b), [19, 0, 18])
-    assert_equal (b, [19, 0, 18])
-    assert_equal (a, b)
 
 if __name__ == '__main__':
   from unittest import main

diff --git a/interfaces/python/test_fvec.py b/interfaces/python/test_fvec.py
new file mode 100644 (file)
index 0000000..ba124e9
--- /dev/null
+++ b/interfaces/python/test_fvec.py
@@ -0,0 +1,122 @@
+from numpy.testing import TestCase, run_module_suite
+from numpy.testing import assert_equal, assert_almost_equal
+from _aubio import *
+from numpy import array
+
+class aubio_fvec_test_case(TestCase):
+
+
+    def test_vector_created_with_zeroes(self):
+        a = fvec()
+        assert_equal(array(a), 0.)
+
+    def test_vector_assign_element(self):
+        a = fvec()
+        a[0] = 1
+        assert_equal(a[0], 1)
+
+    def test_vector_assign_element_end(self):
+        a = fvec()
+        a[-1] = 1
+        assert_equal(a[-1], 1)
+        assert_equal(a[a.length-1], 1)
+
+    def test_vector(self):
+        a = fvec()
+        a, a.length
+        a[0]
+        array(a)
+        a = fvec(10)
+        a = fvec(1)
+        array(a).T
+        a[0] = range(a.length)
+
+    def test_wrong_values(self):
+        self.assertRaises (ValueError, fvec, -10)
+  
+        a = fvec(2)
+        self.assertRaises (IndexError, a.__getitem__, 3)
+        self.assertRaises (IndexError, a.__getitem__, 2)
+
+    def test_alpha_norm_of_fvec(self):
+        a = fvec(2)
+        self.assertEquals (alpha_norm(a, 1), 0)
+        a[0] = 1
+        self.assertEquals (alpha_norm(a, 1), 0.5)
+        a[1] = 1
+        self.assertEquals (alpha_norm(a, 1), 1)
+        a = array([0, 1], dtype='float32')
+        from math import sqrt
+        assert_almost_equal (alpha_norm(a, 2), sqrt(2)/2.)
+
+    def test_alpha_norm_of_array_of_float32(self):
+        # check scalar fails
+        a = array(1, dtype = 'float32')
+        self.assertRaises (ValueError, alpha_norm, a, 1)
+        # check 2d array fails
+        a = array([[2],[4]], dtype = 'float32')
+        self.assertRaises (ValueError, alpha_norm, a, 1)
+        # check 1d array
+        a = array(range(10), dtype = 'float32')
+        self.assertEquals (alpha_norm(a, 1), 4.5)
+
+    def test_alpha_norm_of_array_of_int(self):
+        a = array(1, dtype = 'int')
+        self.assertRaises (ValueError, alpha_norm, a, 1)
+        a = array([[[1,2],[3,4]]], dtype = 'int')
+        self.assertRaises (ValueError, alpha_norm, a, 1)
+        a = array(range(10), dtype = 'int')
+        self.assertRaises (ValueError, alpha_norm, a, 1)
+
+    def test_alpha_norm_of_array_of_string (self):
+        a = "hello"
+        self.assertRaises (ValueError, alpha_norm, a, 1)
+
+    def test_zero_crossing_rate(self):
+        a = array([0,1,-1], dtype='float32')
+        self.assertEquals (zero_crossing_rate(a), 1./3 )
+        a = array([0.]*100, dtype='float32')
+        self.assertEquals (zero_crossing_rate(a), 0 )
+        a = array([-1.]*100, dtype='float32')
+        self.assertEquals (zero_crossing_rate(a), 0 )
+        a = array([1.]*100, dtype='float32')
+        self.assertEquals (zero_crossing_rate(a), 0 )
+
+    def test_alpha_norm_of_array_of_float64(self):
+        # check scalar fail
+        a = array(1, dtype = 'float64')
+        self.assertRaises (ValueError, alpha_norm, a, 1)
+        # check 3d array fail
+        a = array([[[1,2],[3,4]]], dtype = 'float64')
+        self.assertRaises (ValueError, alpha_norm, a, 1)
+        # check float64 1d array fail
+        a = array(range(10), dtype = 'float64')
+        self.assertRaises (ValueError, alpha_norm, a, 1)
+        # check float64 2d array fail
+        a = array([range(10), range(10)], dtype = 'float64')
+        self.assertRaises (ValueError, alpha_norm, a, 1)
+
+    def test_fvec_min_removal_of_array(self):
+        a = array([20,1,19], dtype='float32')
+        b = min_removal(a)
+        assert_equal (array(b), [19, 0, 18])
+        assert_equal (b, [19, 0, 18])
+        assert_equal (a, b)
+        a[0] = 0
+        assert_equal (a, b)
+
+    def test_fvec_min_removal_of_array_float64(self):
+        a = array([20,1,19], dtype='float64')
+        self.assertRaises (ValueError, min_removal, a)
+
+    def test_fvec_min_removal_of_fvec(self):
+        a = fvec(3)
+        a = array([20, 1, 19], dtype = 'float32')
+        b = min_removal(a)
+        assert_equal (array(b), [19, 0, 18])
+        assert_equal (b, [19, 0, 18])
+        assert_equal (a, b)
+
+if __name__ == '__main__':
+    from unittest import main
+    main()