NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commite277333

committed

FIX: translate timedeltas in _to_ordinalf

FIX: translate timedelta64 in _dt64_to_ordinalf

1 parent63fe909 commite277333Copy full SHA for e277333

File tree

2 files changed

+72

-10

lines changed

lib/matplotlib
- dates.py
- tests
  - test_dates.py

2 files changed

+72

-10

lines changed

`‎lib/matplotlib/dates.py`

Lines changed: 39 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -222,6 +222,10 @@ def _to_ordinalf(dt):`
`222`	`222`	`dt=dt.astimezone(UTC)`
`223`	`223`	`tzi=UTC`
`224`	`224`
	`225`	`+ifisinstance(dt,datetime.timedelta):`
	`226`	`+base=dt/datetime.timedelta(days=1)`
	`227`	`+returnbase`
	`228`	`+`
`225`	`229`	`base=float(dt.toordinal())`
`226`	`230`
`227`	`231`	# If it's sufficiently datetime-like, it will have a `date()` method
`@@ -251,6 +255,11 @@ def _dt64_to_ordinalf(d):`
`251`	`255`	because we do times compared to ``0001-01-01T00:00:00`` (plus one day).
`252`	`256`	`"""`
`253`	`257`
	`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`	`+`
`254`	`263`	`# the "extra" ensures that we at least allow the dynamic range out to`
`255`	`264`	`# seconds. That should get out to +/-2e11 years.`
`256`	`265`	`# NOTE: First cast truncates; second cast back is for NumPy 1.10.`
`@@ -271,6 +280,12 @@ def _dt64_to_ordinalf(d):`
`271`	`280`	`returndt`
`272`	`281`
`273`	`282`
	`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`	`+returndnew`
	`288`	`+`
`274`	`289`	`def_from_ordinalf(x,tz=None):`
`275`	`290`	`"""`
`276`	`291`	`Convert Gregorian float of the date, preserving hours, minutes,`
`@@ -405,22 +420,36 @@ def date2num(d):`
`405`	`420`	`Gregorian calendar is assumed; this is not universal practice.`
`406`	`421`	`For details see the module docstring.`
`407`	`422`	`"""`
	`423`	`+`
`408`	`424`	`ifhasattr(d,"values"):`
`409`	`425`	`# this unpacks pandas series or dataframes...`
`410`	`426`	`d=d.values`
`411`		`-ifnotnp.iterable(d):`
`412`		`-if (isinstance(d,np.datetime64)or (isinstance(d,np.ndarray)and`
`413`		`-np.issubdtype(d.dtype,np.datetime64))):`
`414`		`-return_dt64_to_ordinalf(d)`
`415`		`-return_to_ordinalf(d)`
`416`	`427`
`417`		`-else:`
`418`		`-d=np.asarray(d)`
`419`		`-ifnp.issubdtype(d.dtype,np.datetime64):`
	`428`	`+ifnotnp.iterable(d)andnotisinstance(d,np.ndarray):`
	`429`	`+# single value logic...`
	`430`	`+if(isinstance(d,np.datetime64)orisinstance(d,np.timedelta64)):`
`420`	`431`	`return_dt64_to_ordinalf(d)`
`421`		`-ifnotd.size:`
`422`		`-returnd`
	`432`	`+else:`
	`433`	`+return_to_ordinalf(d)`
	`434`	`+`
	`435`	`+elif (isinstance(d,np.ndarray)and`
	`436`	`+ (np.issubdtype(d.dtype,np.datetime64)or`
	`437`	`+np.issubdtype(d.dtype,np.timedelta64))):`
	`438`	`+# array with all one type of datetime64 object.`
	`439`	`+return_dt64_to_ordinalf(d)`
	`440`	`+`
	`441`	`+eliflen(d):`
	`442`	`+# this is a list or tuple...`
	`443`	`+if (isinstance(d[0],np.datetime64)or`
	`444`	`+isinstance(d[0],np.timedelta64)):`
	`445`	`+return_dt64_to_ordinalf_iterable(d)`
`423`	`446`	`return_to_ordinalf_np_vectorized(d)`
	`447`	`+elifhasattr(d,'size')andnotd.size:`
	`448`	`+# this elif doesn't get tested, but leaving here in case anyone`
	`449`	`+# needs it.`
	`450`	`+returnd`
	`451`	`+else:`
	`452`	`+return []`
`424`	`453`
`425`	`454`
`426`	`455`	`defjulian2num(j):`

`‎lib/matplotlib/tests/test_dates.py`

Lines changed: 33 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -680,3 +680,36 @@ def test_datetime64_in_list():`
`680`	`680`	`dt= [np.datetime64('2000-01-01'),np.datetime64('2001-01-01')]`
`681`	`681`	`dn=mdates.date2num(dt)`
`682`	`682`	`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`	`+`
	`696`	`+dt= (np.datetime64('2000-01-01'),`
	`697`	`+np.timedelta64(26,'h'))`
	`698`	`+assertmdates.date2num(dt[1])==1+2/24`
	`699`	`+# check that mixed lists work....`
	`700`	`+assertmdates.date2num(dt)[0]==730120.0`
	`701`	`+assertmdates.date2num(dt)[1]==1+2/24`
	`702`	`+`
	`703`	`+dt= [datetime.timedelta(days=1,hours=1),`
	`704`	`+datetime.timedelta(days=1,hours=2)]`
	`705`	`+assertmdates.date2num(dt)[0]==1+1/24`
	`706`	`+assertmdates.date2num(dt)[1]==1+2/24`
	`707`	`+`
	`708`	`+dt= (np.timedelta64(25,'h'),`
	`709`	`+np.timedelta64(26,'h'))`
	`710`	`+assertmdates.date2num(dt)[0]==1+1/24`
	`711`	`+assertmdates.date2num(dt)[1]==1+2/24`
	`712`	`+`
	`713`	`+dt=np.array([25,26],dtype='timedelta64[h]')`
	`714`	`+assertmdates.date2num(dt)[0]==1+1/24`
	`715`	`+assertmdates.date2num(dt)[1]==1+2/24`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commite277333

File tree

2 files changed

2 files changed

`‎lib/matplotlib/dates.py`

`‎lib/matplotlib/tests/test_dates.py`

0 commit comments