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

Commit79a62a7

Browse files
committed
py.test, updating axis ticks, and unitData as class, removed test_category from init, and updated tox
1 parent36f1353 commit79a62a7

File tree

8 files changed

+183
-229
lines changed

8 files changed

+183
-229
lines changed

‎.mailmap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Andrew Dawson <ajdawson@acm.org> <dawson@atm.ox.ac.uk>
33
anykraus <kraus@mpip-mainz.mpg.de> <anykraus@users.noreply.github.com>
44
Ariel Hernán Curiale <curiale@gmail.com>
55
Ben Cohen <bj.cohen19@gmail.com> <ben@cohen-family.org>
6-
Ben Root <ben.v.root@gmail.com>
6+
Ben Root <ben.v.root@gmail.com> Benjamin Root <ben.v.root@gmail.com>
77
Casper van der Wel <caspervdw@gmail.com>
8-
Christoph Gohlke <cgohlke@uci.edu> <cgohlke@uci.edu>
9-
Cimarron Mittelsteadt <cimarronm@gmail.com>
10-
Daniel Hyams <dhyams@gmail.com>
8+
Christoph Gohlke <cgohlke@uci.edu>cgohlke<cgohlke@uci.edu>
9+
Christoph Gohlke <cgohlke@uci.edu> C. Gohlke <cgohlke@uci.edu>
10+
Cimarron Mittelsteadt <cimarronm@gmail.com> Cimarron <cimarronm@gmail.com>
1111
Daniel Hyams <dhyams@gmail.com> Daniel Hyams <dhyams@gitdev.(none)>
1212
David Kua <david@kua.io> <david.kua@mail.utoronto.ca>
1313
endolith <endolith@gmail.com>

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ install:
110110
# Install nose from a build which has partial
111111
# support for python36 and suport for coverage output suppressing
112112
pip install git+https://github.com/jenshnielsen/nose.git@matplotlibnose
113-
113+
pip install pytest
114114
# We manually install humor sans using the package from Ubuntu 14.10. Unfortunatly humor sans is not
115115
# availible in the Ubuntu version used by Travis but we can manually install the deb from a later
116116
# version since is it basically just a .ttf file

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ install:
8282
# same things as the requirements in ci/conda_recipe/meta.yaml
8383
# if conda-forge gets a new pyqt, it might be nice to install it as well to have more backends
8484
# https://github.com/conda-forge/conda-forge.github.io/issues/157#issuecomment-223536381
85-
-cmd:conda create -q -n test-environment python=%PYTHON_VERSION% pip setuptools numpy python-dateutil freetype=2.6 msinttypes "tk=8.5" pyparsing pytz tornado "libpng>=1.6.21,<1.7" "zlib=1.2" "cycler>=0.10" nose mock
85+
-cmd:conda create -q -n test-environment python=%PYTHON_VERSION% pip setuptools numpy python-dateutil freetype=2.6 msinttypes "tk=8.5" pyparsing pytz tornado "libpng>=1.6.21,<1.7" "zlib=1.2" "cycler>=0.10" nose mock pytest
8686
-activate test-environment
8787
-cmd:echo %PYTHON_VERSION% %TARGET_ARCH%
8888
-cmd:IF %PYTHON_VERSION% == 2.7 conda install -q functools32

‎lib/matplotlib/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1499,7 +1499,6 @@ def _jupyter_nbextension_paths():
14991499
'matplotlib.tests.test_backend_svg',
15001500
'matplotlib.tests.test_basic',
15011501
'matplotlib.tests.test_bbox_tight',
1502-
'matplotlib.tests.test_category',
15031502
'matplotlib.tests.test_cbook',
15041503
'matplotlib.tests.test_coding_standards',
15051504
'matplotlib.tests.test_collections',

‎lib/matplotlib/axis.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -642,7 +642,7 @@ def __init__(self, axes, pickradius=15):
642642
self.offsetText=self._get_offset_text()
643643
self.majorTicks= []
644644
self.minorTicks= []
645-
self.unit_data=[]
645+
self.unit_data=None
646646
self.pickradius=pickradius
647647

648648
# Initialize here for testing; later add API
@@ -695,14 +695,14 @@ def limit_range_for_scale(self, vmin, vmax):
695695

696696
@property
697697
defunit_data(self):
698-
"""Holds data that a ConversionInterface subclassrelys on
698+
"""Holds data that a ConversionInterface subclassuses
699699
to convert between labels and indexes
700700
"""
701701
returnself._unit_data
702702

703703
@unit_data.setter
704-
defunit_data(self,data):
705-
self._unit_data=data
704+
defunit_data(self,unit_data):
705+
self._unit_data=unit_data
706706

707707
defget_children(self):
708708
children= [self.label,self.offsetText]

‎lib/matplotlib/category.py

Lines changed: 48 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
importnumpyasnp
1111

12+
importmatplotlib.cbookascbook
1213
importmatplotlib.unitsasunits
1314
importmatplotlib.tickerasticker
1415

@@ -22,10 +23,12 @@
2223
defto_array(data,maxlen=100):
2324
ifNP_NEW:
2425
returnnp.array(data,dtype=np.unicode)
26+
ifcbook.is_scalar_or_string(data):
27+
data= [data]
2528
try:
2629
vals=np.array(data,dtype=('|S',maxlen))
2730
exceptUnicodeEncodeError:
28-
#pure hack
31+
#this yields gibberish
2932
vals=np.array([convert_to_string(d)fordindata])
3033
returnvals
3134

@@ -36,49 +39,53 @@ def convert(value, unit, axis):
3639
"""Uses axis.unit_data map to encode
3740
data as floats
3841
"""
39-
vmap=dict(axis.unit_data)
42+
vmap=dict(zip(axis.unit_data.seq,axis.unit_data.locs))
4043

4144
ifisinstance(value,six.string_types):
4245
returnvmap[value]
4346

4447
vals=to_array(value)
45-
forlab,locinaxis.unit_data:
48+
forlab,locinvmap.items():
4649
vals[vals==lab]=loc
4750

4851
returnvals.astype('float')
4952

5053
@staticmethod
5154
defaxisinfo(unit,axis):
52-
seq,locs=zip(*axis.unit_data)
53-
majloc=StrCategoryLocator(locs)
54-
majfmt=StrCategoryFormatter(seq)
55+
majloc=StrCategoryLocator(axis.unit_data.locs)
56+
majfmt=StrCategoryFormatter(axis.unit_data.seq)
5557
returnunits.AxisInfo(majloc=majloc,majfmt=majfmt)
5658

5759
@staticmethod
5860
defdefault_units(data,axis):
5961
# the conversion call stack is:
6062
# default_units->axis_info->convert
61-
axis.unit_data=map_categories(data,axis.unit_data)
63+
ifaxis.unit_dataisNone:
64+
axis.unit_data=UnitData(data)
65+
else:
66+
axis.unit_data.update(data)
6267
returnNone
6368

6469

6570
classStrCategoryLocator(ticker.FixedLocator):
6671
def__init__(self,locs):
67-
super(StrCategoryLocator,self).__init__(locs,None)
72+
self.locs=locs
73+
self.nbins=None
6874

6975

7076
classStrCategoryFormatter(ticker.FixedFormatter):
7177
def__init__(self,seq):
72-
super(StrCategoryFormatter,self).__init__(seq)
78+
self.seq=seq
79+
self.offset_string=''
7380

7481

7582
defconvert_to_string(value):
7683
"""Helper function for numpy 1.6, can be replaced with
7784
np.array(...,dtype=unicode) for all later versions of numpy"""
7885

7986
ifisinstance(value,six.string_types):
80-
returnvalue
81-
ifnp.isfinite(value):
87+
pass
88+
elifnp.isfinite(value):
8289
value=np.asarray(value,dtype=str)[np.newaxis][0]
8390
elifnp.isnan(value):
8491
value='nan'
@@ -91,59 +98,38 @@ def convert_to_string(value):
9198
returnvalue
9299

93100

94-
defmap_categories(data,old_map=None):
95-
"""Create mapping between unique categorical
96-
values and numerical identifier.
97-
98-
Paramters
99-
---------
100-
data: iterable
101-
sequence of values
102-
old_map: list of tuple, optional
103-
if not `None`, than old_mapping will be updated with new values and
104-
previous mappings will remain unchanged)
105-
sort: bool, optional
106-
sort keys by ASCII value
107-
108-
Returns
109-
-------
110-
list of tuple
111-
[(label, ticklocation),...]
112-
113-
"""
114-
115-
# code typical missing data in the negative range because
116-
# everything else will always have positive encoding
117-
# question able if it even makes sense
101+
classUnitData(object):
102+
# debatable makes sense to special code missing values
118103
spdict= {'nan':-1.0,'inf':-2.0,'-inf':-3.0}
119104

120-
ifisinstance(data,six.string_types):
121-
data= [data]
122-
123-
# will update this post cbook/dict support
124-
strdata=to_array(data)
125-
uniq=np.unique(strdata)
126-
127-
ifold_map:
128-
olabs,okeys=zip(*old_map)
129-
svalue=max(okeys)+1
130-
else:
131-
old_map,olabs,okeys= [], [], []
132-
svalue=0
133-
134-
category_map=old_map[:]
135-
136-
new_labs= [uforuinuniqifunotinolabs]
137-
missing= [nlfornlinnew_labsifnlinspdict.keys()]
138-
139-
category_map.extend([(m,spdict[m])forminmissing])
140-
141-
new_labs= [nlfornlinnew_labsifnlnotinmissing]
142-
143-
new_locs=np.arange(svalue,svalue+len(new_labs),dtype='float')
144-
category_map.extend(list(zip(new_labs,new_locs)))
145-
returncategory_map
146-
105+
def__init__(self,data):
106+
"""Create mapping between unique categorical values
107+
and numerical identifier
108+
Paramters
109+
---------
110+
data: iterable
111+
sequence of values
112+
"""
113+
self.seq,self.locs= [], []
114+
self._set_seq_locs(data,0)
115+
116+
defupdate(self,new_data):
117+
# so as not to conflict with spdict
118+
value=max(max(self.locs)+1,0)
119+
self._set_seq_locs(new_data,value)
120+
121+
def_set_seq_locs(self,data,value):
122+
# magic to make it work under np1.6
123+
strdata=to_array(data)
124+
# np.unique makes dateframes work
125+
new_s= [dfordinnp.unique(strdata)ifdnotinself.seq]
126+
fornsinnew_s:
127+
self.seq.append(convert_to_string(ns))
128+
ifnsinUnitData.spdict.keys():
129+
self.locs.append(UnitData.spdict[ns])
130+
else:
131+
self.locs.append(value)
132+
value+=1
147133

148134
# Connects the convertor to matplotlib
149135
units.registry[str]=StrCategoryConverter()

0 commit comments

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