ticker.py: always use np.round

doronbehar · doronbehar · commit 86b1aaddcc09 · 2024-01-07T09:31:29.000+02:00
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -983,8 +983,8 @@ def __call__(self, x, pos=None):
         # only label the decades
         fx = math.log(x) / math.log(b)
         is_x_decade = _is_close_to_int(fx)
-        exponent = round(fx) if is_x_decade else np.floor(fx)
-        coeff = round(b ** (fx - exponent))
+        exponent = np.round(fx) if is_x_decade else np.floor(fx)
+        coeff = np.round(b ** (fx - exponent))
 
         if self.labelOnlyBase and not is_x_decade:
             return ''
@@ -1064,16 +1064,16 @@ def __call__(self, x, pos=None):
         # only label the decades
         fx = math.log(x) / math.log(b)
         is_x_decade = _is_close_to_int(fx)
-        exponent = round(fx) if is_x_decade else np.floor(fx)
-        coeff = round(b ** (fx - exponent))
+        exponent = np.round(fx) if is_x_decade else np.floor(fx)
+        coeff = np.round(b ** (fx - exponent))
 
         if self.labelOnlyBase and not is_x_decade:
             return ''
         if self._sublabels is not None and coeff not in self._sublabels:
             return ''
 
         if is_x_decade:
-            fx = round(fx)
+            fx = np.round(fx)
 
         # use string formatting of the base if it is not an integer
         if b % 1 == 0.0:
@@ -1101,7 +1101,7 @@ def _non_decade_format(self, sign_string, base, fx, usetex):
         exponent = math.floor(fx)
         coeff = b ** (fx - exponent)
         if _is_close_to_int(coeff):
-            coeff = round(coeff)
+            coeff = np.round(coeff)
         return r'$\mathdefault{%s%g\times%s^{%d}}$' \
             % (sign_string, coeff, base, exponent)
 
@@ -1276,13 +1276,13 @@ def __call__(self, x, pos=None):
             return ""
         if x <= 0 or x >= 1:
             return ""
-        if _is_close_to_int(2 * x) and round(2 * x) == 1:
+        if _is_close_to_int(2 * x) and np.round(2 * x) == 1:
             s = self._one_half
         elif x < 0.5 and _is_decade(x, rtol=1e-7):
-            exponent = round(math.log10(x))
+            exponent = np.round(math.log10(x))
             s = "10^{%d}" % exponent
         elif x > 0.5 and _is_decade(1 - x, rtol=1e-7):
-            exponent = round(math.log10(1 - x))
+            exponent = np.round(math.log10(1 - x))
             s = self._one_minus("10^{%d}" % exponent)
         elif x < 0.1:
             s = self._format_value(x, self.locs)
@@ -2239,7 +2239,7 @@ def _decade_greater(x, base):
 
 
 def _is_close_to_int(x):
-    return math.isclose(x, round(x))
+    return math.isclose(x, np.round(x))
 
 
 class LogLocator(Locator):
@@ -2904,8 +2904,8 @@ def __call__(self):
 
         vmin, vmax = sorted(self.axis.get_view_interval())
         t0 = majorlocs[0]
-        tmin = round((vmin - t0) / minorstep)
-        tmax = round((vmax - t0) / minorstep) + 1
+        tmin = np.round((vmin - t0) / minorstep)
+        tmax = np.round((vmax - t0) / minorstep) + 1
         locs = (np.arange(tmin, tmax) * minorstep) + t0
 
         return self.raise_if_exceeds(locs)
