implementations of the evaluate tests

grdlok · solvents · commit 39c66a987225 · 2014-05-24T16:47:59.000-04:00
Conflicts:
	lib/matplotlib/tests/test_mlab.py
diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py
@@ -2889,39 +2889,60 @@ def test_wrong_bw_method(self):
 
 
 class evaluate_tests(object):
+
+    @knownfailureif(True)
     def test_evaluate_diff_dim(self):
         """Test the evaluate method when the dim's of dataset and points are
-        different dimensions"""
-        pass
-
+        different dimensions"""	
+        x1 = np.arange(3, 10, 2)
+	kde = mlab.GaussianKDE(x1)
+	x2 = np.arange(3, 12, 2)
+	y_expected = [0, 0, 0, 0, 0]
+	y = kde.evaluate(x2)
+
+	assert_array_almost_equal(y, y_expected, 7)
+	
     def test_evaluate_inv_dim(self):
-        """ Invert the dimensions. I.e Give the dataset a dimension of 1
-        [3,2,4], and the points will have a dimension of 3 [[3],[2],[4]]"""
-        pass
-
+        """ Invert the dimensions. I.e Give the dataset a dimension of 1 [3,2,4],
+        and the points will have a dimension of 3 [[3],[2],[4]]. ValueError 
+        should be raised"""
+        x1 = np.arange(3, 10, 2)
+	kde = mlab.GaussianKDE(x1)
+	x2 = np.array([[3],[5],[7],[9]])
+	
+        assert_raises(ValueError, kde.evaluate, x2)
+		
+    @knownfailureif(True)
+    def test_evaluate_dim_and_num(self):
+	""" Tests if evaluated against a one by one array"""
+	x1 = np.arange(3, 10, 2)
+        x2 = np.array([3])
+	kde = mlab.GaussianKDE(x1)
+	y_expected = [0]
+	y = kde.evaluate(x2)
+	
+	assert_array_almost_equal(y, y_expected, 7)
+   
+ 
     def test_evaluate_point_dim_not_one(self):
         """Test"""
-        pass
-
-    def test_evaluate_numm_equal_dataset_dim(self):
-        pass
-
+        x1 = np.arange(3, 10, 2)
+	x2 = [np.arange(3, 10, 2), np.arange(3, 10, 2)]
+	kde = mlab.GaussianKDE(x1)
+	
+        assert_raises(ValueError, kde.evaluate, x2)
+    
+    @knownfailureif(True)
     def test_evaluate_equal_dim_and_numm_lt(self):
         """Test when line 3810 fails"""
-        pass
-
-    def test_evaluate_equal_dim_and_numm_gte(self):
-        """Test when line 3810 passes"""
-        pass
-
-    def test_evaluate_nequal_dim_and_numm_lt(self):
-        """Test when line 3810 fails"""
-        pass
-
-    def test_evaluate_nequal_dim_and_numm_gte(self):
-        """Test when line 3810 passes"""
-        pass
-
+        x1 = np.arange(3, 10, 2)
+	x2 = np.arange(3, 8, 2)
+	kde = mlab.GaussianKDE(x1)
+        y_expected = [0, 0, 0]
+	y = kde.evaluate(x2)
+
+	assert_array_almost_equal(y, y_expected, 7)
+    
 
 
 #*****************************************************************
