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

Commitbec6488

Browse files
committed
FIX: translate timedelta64 in _dt64_to_ordinalf
1 parent3a5683b commitbec6488

File tree

2 files changed

+66
-10
lines changed

2 files changed

+66
-10
lines changed

‎lib/matplotlib/dates.py

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,11 @@ def _dt64_to_ordinalf(d):
255255
because we do times compared to ``0001-01-01T00:00:00`` (plus one day).
256256
"""
257257

258+
if (isinstance(d,np.timedelta64)or
259+
(isinstance(d,np.ndarray)and
260+
np.issubdtype(d.dtype,np.timedelta64))):
261+
returnd/np.timedelta64(1,'D')
262+
258263
# the "extra" ensures that we at least allow the dynamic range out to
259264
# seconds. That should get out to +/-2e11 years.
260265
# NOTE: First cast truncates; second cast back is for NumPy 1.10.
@@ -275,6 +280,13 @@ def _dt64_to_ordinalf(d):
275280
returndt
276281

277282

283+
def_dt64_to_ordinalf_iterable(d):
284+
dnew=np.zeros(len(d))
285+
fornn,ddinenumerate(d):
286+
dnew[nn]=_dt64_to_ordinalf(dd)
287+
return(dnew)
288+
289+
278290
def_from_ordinalf(x,tz=None):
279291
"""
280292
Convert Gregorian float of the date, preserving hours, minutes,
@@ -413,19 +425,31 @@ def date2num(d):
413425
ifhasattr(d,"values"):
414426
# this unpacks pandas series or dataframes...
415427
d=d.values
416-
ifnotnp.iterable(d):
417-
if (isinstance(d,np.datetime64)or (isinstance(d,np.ndarray)and
418-
np.issubdtype(d.dtype,np.datetime64))):
419-
return_dt64_to_ordinalf(d)
420-
return_to_ordinalf(d)
421428

422-
else:
423-
d=np.asarray(d)
424-
ifnp.issubdtype(d.dtype,np.datetime64):
429+
ifnotnp.iterable(d)andnotisinstance(d,np.ndarray):
430+
# single value logic...
431+
if(isinstance(d,np.datetime64)orisinstance(d,np.timedelta64)):
425432
return_dt64_to_ordinalf(d)
426-
ifnotd.size:
427-
returnd
433+
else:
434+
return_to_ordinalf(d)
435+
436+
elif (isinstance(d,np.ndarray)and
437+
(np.issubdtype(d.dtype,np.datetime64)or
438+
np.issubdtype(d.dtype,np.timedelta64))):
439+
# array with all one type of datetime64 object.
440+
return_dt64_to_ordinalf(d)
441+
442+
eliflen(d):
443+
# this is a list or tuple...
444+
if (isinstance(d[0],np.datetime64)or
445+
isinstance(d[0],np.timedelta64)):
446+
return_dt64_to_ordinalf_iterable(d)
428447
return_to_ordinalf_np_vectorized(d)
448+
elifhasattr(d,'size')andnotd.size:
449+
# this is an empty
450+
returnd
451+
else:
452+
return []
429453

430454

431455
defjulian2num(j):

‎lib/matplotlib/tests/test_dates.py

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -680,3 +680,35 @@ def test_datetime64_in_list():
680680
dt= [np.datetime64('2000-01-01'),np.datetime64('2001-01-01')]
681681
dn=mdates.date2num(dt)
682682
assertnp.array_equal(dn, [730120.,730486.])
683+
684+
685+
deftest_timedelta():
686+
"""
687+
test that timedelta objects are properly translated into days
688+
"""
689+
dt= [datetime.datetime(2000,1,1,0,0,0),
690+
datetime.timedelta(days=1,hours=2)]
691+
assertmdates.date2num(dt[1])==1+2/24
692+
# check that mixed lists work....
693+
assertmdates.date2num(dt)[0]==730120.0
694+
assertmdates.date2num(dt)[1]==1+2/24
695+
dt= (np.datetime64('2000-01-01'),
696+
np.timedelta64(26,'h'))
697+
assertmdates.date2num(dt[1])==1+2/24
698+
# check that mixed lists work....
699+
assertmdates.date2num(dt)[0]==730120.0
700+
assertmdates.date2num(dt)[1]==1+2/24
701+
702+
dt= [datetime.timedelta(days=1,hours=1),
703+
datetime.timedelta(days=1,hours=2)]
704+
assertmdates.date2num(dt)[0]==1+1/24
705+
assertmdates.date2num(dt)[1]==1+2/24
706+
707+
dt= (np.timedelta64(25,'h'),
708+
np.timedelta64(26,'h'))
709+
assertmdates.date2num(dt)[0]==1+1/24
710+
assertmdates.date2num(dt)[1]==1+2/24
711+
712+
dt=np.array([25,26],dtype='timedelta64[h]')
713+
assertmdates.date2num(dt)[0]==1+1/24
714+
assertmdates.date2num(dt)[1]==1+2/24

0 commit comments

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