Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit b2a11c7

Browse files
QuLogicQuLogic
authored
Merge pull request #17727 from jklymak/fix-proper-day-of-month
FIX: properly handle dates when intmult is true
2 parents 3f4d4c7 + c8c9254 commit b2a11c7

3 files changed

Lines changed: 44 additions & 25 deletions

File tree

‎doc/api/next_api_changes/behavior/17727-JMK.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
2+
Date locator for DAILY interval now returns middle of month
3+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
4+
5+
The `matplotlib.dates.AutoDateLocator` has a default of
6+
``interval_multiples=True`` that attempts to align ticks with the start of
7+
meaningful intervals like the start of the month, or start of the day, etc.
8+
That lead to approximately 140-day intervals being mapped to the first and 22nd
9+
of the month. This has now been changed so that it chooses the first and
10+
15th of the month, which is probably what most people want.

‎lib/matplotlib/dates.py‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@ def __init__(self, tz=None, minticks=5, maxticks=None,
13081308
# Swap "3" for "4" in the DAILY list; If we use 3 we get bad
13091309
# tick loc for months w/ 31 days: 1, 4, ..., 28, 31, 1
13101310
# If we use 4 then we get: 1, 5, ... 25, 29, 1
1311-
self.intervald[DAILY] = [1, 2, 4, 7, 14, 21]
1311+
self.intervald[DAILY] = [1, 2, 4, 7, 14]
13121312

13131313
self._byranges = [None, range(1, 13), range(1, 32),
13141314
range(0, 24), range(0, 60), range(0, 60), None]
@@ -1357,7 +1357,6 @@ def get_locator(self, dmin, dmax):
13571357
if dmin > dmax:
13581358
delta = -delta
13591359
tdelta = -tdelta
1360-
13611360
# The following uses a mix of calls to relativedelta and timedelta
13621361
# methods because there is incomplete overlap in the functionality of
13631362
# these similar functions, and it's best to avoid doing our own math
@@ -1400,13 +1399,12 @@ def get_locator(self, dmin, dmax):
14001399
if num <= interval * (self.maxticks[freq] - 1):
14011400
break
14021401
else:
1403-
# We went through the whole loop without breaking, default to
1404-
# the last interval in the list and raise a warning
1405-
cbook._warn_external(
1406-
f"AutoDateLocator was unable to pick an appropriate "
1407-
f"interval for this date range. It may be necessary to "
1408-
f"add an interval value to the AutoDateLocator's "
1409-
f"intervald dictionary. Defaulting to {interval}.")
1402+
if not (self.interval_multiples and freq == DAILY):
1403+
cbook._warn_external(
1404+
f"AutoDateLocator was unable to pick an appropriate "
1405+
f"interval for this date range. It may be necessary "
1406+
f"to add an interval value to the AutoDateLocator's "
1407+
f"intervald dictionary. Defaulting to {interval}.")
14101408

14111409
# Set some parameters as appropriate
14121410
self._freq = freq

‎lib/matplotlib/tests/test_dates.py‎

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -398,11 +398,11 @@ def _create_auto_date_locator(date1, date2):
398398
'1997-11-01 00:00:00+00:00', '1997-12-01 00:00:00+00:00']
399399
],
400400
[datetime.timedelta(days=141),
401-
['1997-01-01 00:00:00+00:00', '1997-01-22 00:00:00+00:00',
402-
'1997-02-01 00:00:00+00:00', '1997-02-22 00:00:00+00:00',
403-
'1997-03-01 00:00:00+00:00', '1997-03-22 00:00:00+00:00',
404-
'1997-04-01 00:00:00+00:00', '1997-04-22 00:00:00+00:00',
405-
'1997-05-01 00:00:00+00:00', '1997-05-22 00:00:00+00:00']
401+
['1997-01-01 00:00:00+00:00', '1997-01-15 00:00:00+00:00',
402+
'1997-02-01 00:00:00+00:00', '1997-02-15 00:00:00+00:00',
403+
'1997-03-01 00:00:00+00:00', '1997-03-15 00:00:00+00:00',
404+
'1997-04-01 00:00:00+00:00', '1997-04-15 00:00:00+00:00',
405+
'1997-05-01 00:00:00+00:00', '1997-05-15 00:00:00+00:00']
406406
],
407407
[datetime.timedelta(days=40),
408408
['1997-01-01 00:00:00+00:00', '1997-01-05 00:00:00+00:00',
@@ -471,8 +471,8 @@ def _create_auto_date_locator(date1, date2):
471471
'Sep', 'Oct', 'Nov', 'Dec']
472472
],
473473
[datetime.timedelta(days=141),
474-
['Jan', '22', 'Feb', '22', 'Mar', '22', 'Apr', '22',
475-
'May', '22']
474+
['Jan', '15', 'Feb', '15', 'Mar', '15', 'Apr', '15',
475+
'May', '15']
476476
],
477477
[datetime.timedelta(days=40),
478478
['Jan', '05', '09', '13', '17', '21', '25', '29', 'Feb',
@@ -523,8 +523,8 @@ def _create_auto_date_locator(date1, date2):
523523
'07/1997', '08/1997', '09/1997', '10/1997', '11/1997', '12/1997',
524524
]],
525525
[datetime.timedelta(days=141), [
526-
'01/1997', 'day: 22', '02/1997', 'day: 22', '03/1997', 'day: 22',
527-
'04/1997', 'day: 22', '05/1997', 'day: 22',
526+
'01/1997', 'day: 15', '02/1997', 'day: 15', '03/1997', 'day: 15',
527+
'04/1997', 'day: 15', '05/1997', 'day: 15',
528528
]],
529529
[datetime.timedelta(days=40), [
530530
'01/1997', 'day: 05', 'day: 09', 'day: 13', 'day: 17', 'day: 21',
@@ -578,8 +578,8 @@ def _create_auto_date_locator(date1, date2):
578578
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
579579
],
580580
[datetime.timedelta(days=141),
581-
['January', '22', 'February', '22', 'March',
582-
'22', 'April', '22', 'May', '22']
581+
['January', '15', 'February', '15', 'March',
582+
'15', 'April', '15', 'May', '15']
583583
],
584584
[datetime.timedelta(days=40),
585585
['January', '05', '09', '13', '17', '21',
@@ -671,11 +671,11 @@ def _create_auto_date_locator(date1, date2, tz):
671671
'1997-11-01 00:00:00-08:00', '1997-12-01 00:00:00-08:00']
672672
],
673673
[datetime.timedelta(days=141),
674-
['1997-01-01 00:00:00-08:00', '1997-01-22 00:00:00-08:00',
675-
'1997-02-01 00:00:00-08:00', '1997-02-22 00:00:00-08:00',
676-
'1997-03-01 00:00:00-08:00', '1997-03-22 00:00:00-08:00',
677-
'1997-04-01 00:00:00-08:00', '1997-04-22 00:00:00-07:00',
678-
'1997-05-01 00:00:00-07:00', '1997-05-22 00:00:00-07:00']
674+
['1997-01-01 00:00:00-08:00', '1997-01-15 00:00:00-08:00',
675+
'1997-02-01 00:00:00-08:00', '1997-02-15 00:00:00-08:00',
676+
'1997-03-01 00:00:00-08:00', '1997-03-15 00:00:00-08:00',
677+
'1997-04-01 00:00:00-08:00', '1997-04-15 00:00:00-07:00',
678+
'1997-05-01 00:00:00-07:00', '1997-05-15 00:00:00-07:00']
679679
],
680680
[datetime.timedelta(days=40),
681681
['1997-01-01 00:00:00-08:00', '1997-01-05 00:00:00-08:00',
@@ -947,3 +947,14 @@ def test_change_epoch():
947947
np.testing.assert_allclose(
948948
mdates.date2num(np.datetime64('1970-01-01T12:00:00')),
949949
0.5)
950+
951+
952+
def test_warn_notintervals():
953+
dates = np.arange('2001-01-10', '2001-03-04', dtype='datetime64[D]')
954+
locator = mdates.AutoDateLocator(interval_multiples=False)
955+
locator.intervald[3] = [2]
956+
locator.create_dummy_axis()
957+
locator.set_view_interval(mdates.date2num(dates[0]),
958+
mdates.date2num(dates[-1]))
959+
with pytest.warns(UserWarning, match="AutoDateLocator was unable") as rec:
960+
locs = locator()

0 commit comments

Comments
 (0)