utils.testing: add assert_greater_equal and assert_less_equal

Author: ndawe

sklearn/tree/tests/test_tree.py

@@ -17,6 +17,7 @@
 from sklearn.utils.testing import assert_in
 from sklearn.utils.testing import assert_raises
 from sklearn.utils.testing import assert_greater
+from sklearn.utils.testing import assert_greater_equal
 from sklearn.utils.testing import assert_less
 from sklearn.utils.testing import assert_true
 from sklearn.utils.testing import raises
@@ -481,11 +482,12 @@ def test_min_weight_fraction_leaf():
                 node_weights = np.bincount(out, weights=weights)
                 # drop inner nodes
                 leaf_weights = node_weights[node_weights != 0]
-                assert_true(np.min(leaf_weights) >=
-                            total_weight * est.min_weight_fraction_leaf,
-                            "Failed with {0} "
-                            "min_weight_fraction_leaf={1}".format(
-                                name, est.min_weight_fraction_leaf))
+                assert_greater_equal(
+                    np.min(leaf_weights),
+                    total_weight * est.min_weight_fraction_leaf,
+                    "Failed with {0} "
+                    "min_weight_fraction_leaf={1}".format(
+                        name, est.min_weight_fraction_leaf))
 
 
 def test_pickle():

sklearn/utils/testing.py

@@ -52,7 +52,9 @@
 __all__ = ["assert_equal", "assert_not_equal", "assert_raises",
            "assert_raises_regexp", "raises", "with_setup", "assert_true",
            "assert_false", "assert_almost_equal", "assert_array_equal",
-           "assert_array_almost_equal", "assert_array_less"]
+           "assert_array_almost_equal", "assert_array_less",
+           "assert_less", "assert_less_equal",
+           "assert_greater", "assert_greater_equal"]
 
 
 try:
@@ -103,6 +105,20 @@ def _assert_greater(a, b, msg=None):
     assert a > b, message
 
 
+def assert_less_equal(a, b, msg=None):
+    message = "%r is not lower than or equal to %r" % (a, b)
+    if msg is not None:
+        message += ": " + msg
+    assert a <= b, message
+
+
+def assert_greater_equal(a, b, msg=None):
+    message = "%r is not greater than or equal to %r" % (a, b)
+    if msg is not None:
+        message += ": " + msg
+    assert a >= b, message
+
+
 # To remove when we support numpy 1.7
 def assert_warns(warning_class, func, *args, **kw):
     """Test that a certain warning occurs.