Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit25cae8e

Browse files
committed
Simplify units.Registry.get_converter.
The caching of the converter was disabled 10 years ago(be73ef4) and is unlikely to ever workas the correct converter for ndarrays depends on the type of thecontents, not on the container, so just drop the cache-related code.When a masked array is passed, it's OK to just get the first underlyingdata, even if it is masked (as it should have the same type as theunmasked entries), for the purpose of getting the converter.
1 parentcd0de0b commit25cae8e

File tree

1 file changed

+30
-70
lines changed

1 file changed

+30
-70
lines changed

‎lib/matplotlib/units.py‎

Lines changed: 30 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,10 @@ class ConversionError(TypeError):
5555

5656
classAxisInfo(object):
5757
"""
58-
Information to support default axis labeling, tick labeling, and
59-
default limits. An instance of this class must be returned by
60-
:meth:`ConversionInterface.axisinfo`.
58+
Information to support default axis labeling, tick labeling, and limits.
59+
60+
An instance of this class must be returned by
61+
`ConversionInterface.axisinfo`.
6162
"""
6263
def__init__(self,majloc=None,minloc=None,
6364
majfmt=None,minfmt=None,label=None,
@@ -96,8 +97,7 @@ class ConversionInterface(object):
9697
@staticmethod
9798
defaxisinfo(unit,axis):
9899
"""
99-
Return an `~units.AxisInfo` instance for the axis with the
100-
specified units.
100+
Return an `~units.AxisInfo` for the axis with the specified units.
101101
"""
102102
returnNone
103103

@@ -112,19 +112,19 @@ def default_units(x, axis):
112112
defconvert(obj,unit,axis):
113113
"""
114114
Convert *obj* using *unit* for the specified *axis*.
115-
If *obj* is a sequence, return the converted sequence.
116-
The output must bea sequence of scalars that can be used by the numpy
117-
array layer.
115+
116+
If *obj* isa sequence, return the converted sequence. The output must
117+
be a sequence of scalars that can be used by the numpyarray layer.
118118
"""
119119
returnobj
120120

121121
@staticmethod
122122
defis_numlike(x):
123123
"""
124-
The Matplotlib datalim, autoscaling, locators etc work with
125-
scalarswhich are the units converted to floats given the
126-
current unit. Theconverter may be passed these floats, or
127-
arrays of them, even whenunits are set.
124+
The Matplotlib datalim, autoscaling, locators etc work with scalars
125+
which are the units converted to floats given the current unit. The
126+
converter may be passed these floats, or arrays of them, even when
127+
units are set.
128128
"""
129129
ifnp.iterable(x):
130130
forthisxinx:
@@ -134,73 +134,33 @@ def is_numlike(x):
134134

135135

136136
classRegistry(dict):
137-
"""
138-
A register that maps types to conversion interfaces.
139-
"""
140-
def__init__(self):
141-
dict.__init__(self)
142-
self._cached= {}
137+
"""Register types with conversion interface."""
143138

144139
defget_converter(self,x):
145-
"""
146-
Get the converter for data that has the same type as *x*. If no
147-
converters are registered for *x*, returns ``None``.
148-
"""
149-
150-
ifnotlen(self):
151-
returnNone# nothing registered
152-
# DISABLED idx = id(x)
153-
# DISABLED cached = self._cached.get(idx)
154-
# DISABLED if cached is not None: return cached
155-
156-
converter=None
157-
classx=getattr(x,'__class__',None)
158-
159-
ifclassxisnotNone:
160-
converter=self.get(classx)
161-
162-
ifconverterisNoneandhasattr(x,"values"):
163-
# this unpacks pandas series or dataframes...
164-
x=x.values
165-
166-
# If x is an array, look inside the array for data with units
140+
"""Get the converter interface instance for *x*, or None."""
141+
ifhasattr(x,"values"):
142+
x=x.values# Unpack pandas Series and DataFrames.
167143
ifisinstance(x,np.ndarray):
144+
# In case x in a masked array, access the underlying data (only its
145+
# type matters). If x is a regular ndarray, getdata() just returns
146+
# the array itself.
147+
x=np.ma.getdata(x).ravel()
168148
# If there are no elements in x, infer the units from its dtype
169149
ifnotx.size:
170150
returnself.get_converter(np.array([0],dtype=x.dtype))
171-
xravel=x.ravel()
172-
try:
173-
# pass the first value of x that is not masked back to
174-
# get_converter
175-
ifnotnp.all(xravel.mask):
176-
# Get first non-masked item
177-
converter=self.get_converter(
178-
xravel[np.argmin(xravel.mask)])
179-
returnconverter
180-
exceptAttributeError:
181-
# not a masked_array
182-
# Make sure we don't recurse forever -- it's possible for
183-
# ndarray subclasses to continue to return subclasses and
184-
# not ever return a non-subclass for a single element.
185-
next_item=xravel[0]
186-
if (notisinstance(next_item,np.ndarray)or
187-
next_item.shape!=x.shape):
188-
converter=self.get_converter(next_item)
189-
returnconverter
190-
191-
# If we haven't found a converter yet, try to get the first element
192-
ifconverterisNone:
193-
try:
194-
thisx=cbook.safe_first_element(x)
151+
try:# Look up in the cache.
152+
returnself[type(x)]
153+
exceptKeyError:
154+
try:# If cache lookup fails, look up based on first element...
155+
first=cbook.safe_first_element(x)
195156
except (TypeError,StopIteration):
196157
pass
197158
else:
198-
ifclassxandclassx!=getattr(thisx,'__class__',None):
199-
converter=self.get_converter(thisx)
200-
returnconverter
201-
202-
# DISABLED self._cached[idx] = converter
203-
returnconverter
159+
# ... and avoid infinite recursion for pathological iterables
160+
# where indexing returns instances of the same iterable class.
161+
iftype(first)isnottype(x):
162+
returnself.get_converter(first)
163+
returnNone
204164

205165

206166
registry=Registry()

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp