Commitb7a70c8

committed

Support masked dates

1 parentcc85fb6 commitb7a70c8Copy full SHA for b7a70c8

File tree

+16

-2

lines changed

+16

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -444,7 +444,9 @@ def date2num(d):`
`444`	`444`	`ifnotiterable:`
`445`	`445`	`d= [d]`
`446`	`446`
`447`		`-d=np.asarray(d)`
	`447`	`+masked=np.any(np.ma.getmask(d))`
	`448`	`+d=np.ma.asarray(d)ifmaskedelsenp.asarray(d)`
	`449`	`+`
`448`	`450`	`# convert to datetime64 arrays, if not already:`
`449`	`451`	`ifnotnp.issubdtype(d.dtype,np.datetime64):`
`450`	`452`	`# datetime arrays`
`@@ -455,7 +457,7 @@ def date2num(d):`
`455`	`457`	`iftziisnotNone:`
`456`	`458`	`# make datetime naive:`
`457`	`459`	`d= [dt.astimezone(UTC).replace(tzinfo=None)fordtind]`
`458`		`-d=np.asarray(d)`
	`460`	`+d=np.ma.asarray(d)ifmaskedelsenp.asarray(d)`
`459`	`461`	`d=d.astype('datetime64[us]')`
`460`	`462`
`461`	`463`	`d=_dt64_to_ordinalf(d)`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,18 @@ def test_date2num_NaT_scalar(units):`
`69`	`69`	`assertnp.isnan(tmpl)`
`70`	`70`
`71`	`71`
	`72`	`+deftest_date2num_masked():`
	`73`	`+base=datetime.datetime(2005,2,1)`
	`74`	`+dates=np.ma.array([base+datetime.timedelta(days=(2*i))`
	`75`	`+foriinrange(7)],mask=[0,1,1,0,0,0,1])`
	`76`	`+refmask=np.ma.getmask(dates)`
	`77`	`+npdates=mdates.date2num(dates)`
	`78`	`+np.testing.assert_array_equal(refmask,np.ma.getmask(npdates))`
	`79`	`+np.testing.assert_array_equal(np.ma.getmask(npdates),`
	`80`	`+ (False,True,True,False,False,False,`
	`81`	`+True))`
	`82`	`+`
	`83`	`+`
`72`	`84`	`deftest_date_empty():`
`73`	`85`	`# make sure we do the right thing when told to plot dates even`
`74`	`86`	`# if no date data has been presented, cf`

Comments

(0)