Tests for FuncNorm added, and bug corrected in FuncNorm

alvarosg · alvarosg · commit 13edeabea797 · 2016-10-23T23:52:12.000+01:00
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -964,7 +964,6 @@ def __init__(self, f, finv=None,
                  vmin=None, vmax=None, clip=False):
 
         f, finv = FuncNorm._fun_parser([f, finv])
-
         if finv is None:
             raise ValueError("Inverse function not provided")
 
@@ -985,6 +984,7 @@ def __call__(self, value, clip=None):
             clip = self.clip
 
         result, is_scalar = self.process_value(value)
+        self.autoscale_None(result)
 
         vmin = self.vmin
         vmax = self.vmax
@@ -996,7 +996,6 @@ def __call__(self, value, clip=None):
         resultnorm = (self._f(result) - self._f(vmin)) / \
             (self._f(vmax) - self._f(vmin))
 
-        self.autoscale_None(resultnorm)
         return np.ma.array(resultnorm)
 
     def inverse(self, value):
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -155,6 +155,24 @@ def test_LogNorm():
     ln = mcolors.LogNorm(clip=True, vmax=5)
     assert_array_equal(ln([1, 6]), [0, 1.0])
 
+def test_FuncNorm():
+    # Testing limits using a string
+    norm = mcolors.FuncNorm(f='log', vmin=0.01, vmax=2)
+    assert_array_equal(norm([0.01, 2]), [0, 1.0])
+
+    # Testing limits using a string
+    norm = mcolors.FuncNorm(f=lambda x: np.log10(x),
+                            finv=lambda x: 10.**(x), vmin=0.01, vmax=2)
+    assert_array_equal(norm([0.01, 2]), [0, 1.0])
+
+    # Testing limits without vmin, vmax
+    norm = mcolors.FuncNorm(f='log')
+    assert_array_equal(norm([0.01, 2]), [0, 1.0])
+
+    # Testing intermediate values
+    norm = mcolors.FuncNorm(f='log')
+    assert_array_almost_equal(norm([0.01, 0.5, 2]), [0, 0.73835195870437, 1.0])
+
 
 def test_PowerNorm():
     a = np.array([0, 0.5, 1, 1.5], dtype=float)
