MNT: add tolerance to colorbar locator methods

jklymak · jklymak · commit 17de52087d5d · 2018-10-15T12:20:18.000-07:00
diff --git a/lib/matplotlib/colorbar.py b/lib/matplotlib/colorbar.py
@@ -239,8 +239,9 @@ def __init__(self, colorbar):
     def tick_values(self, vmin, vmax):
         vmin = max(vmin, self._colorbar.norm.vmin)
         vmax = min(vmax, self._colorbar.norm.vmax)
-        ticks = super().tick_values(vmin, vmax)
-        return ticks[(ticks >= vmin) & (ticks <= vmax)]
+        ticks = super().tick_values(self, vmin, vmax)
+        rtol = (vmax - vmin) * 1e-10
+        return ticks[(ticks >= vmin - rtol) & (ticks <= vmax + rtol)]
 
 
 class _ColorbarAutoMinorLocator(ticker.AutoMinorLocator):
@@ -295,8 +296,16 @@ def __init__(self, colorbar, *args, **kwargs):
     def tick_values(self, vmin, vmax):
         vmin = self._colorbar.norm.vmin
         vmax = self._colorbar.norm.vmax
+<<<<<<< HEAD
         ticks = super().tick_values(vmin, vmax)
         return ticks[(ticks >= vmin) & (ticks <= vmax)]
+=======
+        ticks = ticker.LogLocator.tick_values(self, vmin, vmax)
+        rtol = (np.log10(vmax) - np.log10(vmin)) * 1e-10
+        ticks = ticks[(np.log10(ticks) >= np.log10(vmin) - rtol)  &
+              (np.log10(ticks) <= np.log10(vmax) + rtol)]
+        return ticks
+>>>>>>> MNT: add tolerance to colorbar locator methods
 
 
 class ColorbarBase(cm.ScalarMappable):
