From 202449825f3cd930b65d1596983944be9f875232 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Wed, 8 Dec 2021 15:49:09 -0500 Subject: [PATCH 1/2] FIX: be more careful about coercing unit-full containers to ndarray closes #21669 --- lib/matplotlib/axes/_axes.py | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index fab2aefd70ad..ce9fd1b3c7f9 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3282,10 +3282,34 @@ def errorbar(self, x, y, yerr=None, xerr=None, x = np.asarray(x, dtype=object) if not isinstance(y, np.ndarray): y = np.asarray(y, dtype=object) + + def _upcast_err(err): + """ + Safely handle tuple of containers that carry units. + + If the units are carried on the values then casting to object + arrays preserves the units, but if the units are on the containers + this will not work. + + This function covers the case where the input to the xerr/yerr is a + length 2 tuple of equal length ndarray-subclasses that carry the + unit information in the container. + + We defer coercing the units to be consistent to the underlying unit + library (and implicitly the broadcasting). + + If we do not have a tuple of nested numpy array (subclasses), + fallback to casting to an object array. + + """ + if np.iterable(err) and isinstance(err[0], np.ndarray): + return type(err[0])(err) + return np.asarray(err, dtype=object) + if xerr is not None and not isinstance(xerr, np.ndarray): - xerr = np.asarray(xerr, dtype=object) + xerr = _upcast_err(xerr) if yerr is not None and not isinstance(yerr, np.ndarray): - yerr = np.asarray(yerr, dtype=object) + yerr = _upcast_err(yerr) x, y = np.atleast_1d(x, y) # Make sure all the args are iterable. if len(x) != len(y): raise ValueError("'x' and 'y' must have the same size") From d52c2e87b44a6ce0c14f87c13be1b19e49b5c3b9 Mon Sep 17 00:00:00 2001 From: Thomas A Caswell Date: Thu, 9 Dec 2021 17:55:51 -0500 Subject: [PATCH 2/2] FIX: be even more careful about handling yerr/yerr input --- lib/matplotlib/axes/_axes.py | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/matplotlib/axes/_axes.py b/lib/matplotlib/axes/_axes.py index ce9fd1b3c7f9..485616a153e9 100644 --- a/lib/matplotlib/axes/_axes.py +++ b/lib/matplotlib/axes/_axes.py @@ -3302,8 +3302,30 @@ def _upcast_err(err): fallback to casting to an object array. """ - if np.iterable(err) and isinstance(err[0], np.ndarray): - return type(err[0])(err) + + # we are here because we the container is not a numpy array, but it + # _is_ iterable (likely a list or a tuple but maybe something more + # exotic) + + if ( + # make sure it is not a scalar + np.iterable(err) and + # and it is not empty + len(err) > 0 and + # and the first element is an array sub-class use + # safe_first_element because getitem is index-first not + # location first on pandas objects so err[0] almost always + # fails. + isinstance(cbook.safe_first_element(err), np.ndarray) + ): + # grab the type of the first element, we will try to promote + # the outer container to match the inner container + atype = type(cbook.safe_first_element(err)) + # you can not directly pass data to the init of `np.ndarray` + if atype is np.ndarray: + return np.asarray(err, dtype=object) + # but you can for unyt and astropy uints + return atype(err) return np.asarray(err, dtype=object) if xerr is not None and not isinstance(xerr, np.ndarray): pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy