Commit36dc4e7

committed

Convert NaT to nan in date2num

1 parent6bb5994 commit36dc4e7Copy full SHA for 36dc4e7

File tree

+27

-1

lines changed

+27

-1

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -291,6 +291,13 @@ def _dt64_to_ordinalf(d):`
`291`	`291`	`dt+=extra.astype(np.float64)/1.0e9`
`292`	`292`	`dt=dt/SEC_PER_DAY+1.0`
`293`	`293`
	`294`	`+NaT_int=np.datetime64('NaT').astype(np.int64)`
	`295`	`+d_int=d.astype(np.int64)`
	`296`	`+try:`
	`297`	`+dt[d_int==NaT_int]=np.nan`
	`298`	`+exceptTypeError:`
	`299`	`+ifd_int==NaT_int:`
	`300`	`+dt=np.nan`
`294`	`301`	`returndt`
`295`	`302`
`296`	`303`

Lines changed: 20 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,14 +51,33 @@ def test_date_numpyx():`
`51`	`51`	`datetime.datetime(2017,1,1,3,1,1)]]])`
`52`	`52`	`@pytest.mark.parametrize('dtype', ['datetime64[s]',`
`53`	`53`	`'datetime64[us]',`
`54`		`-'datetime64[ms]'])`
	`54`	`+'datetime64[ms]',`
	`55`	`+'datetime64[ns]'])`
`55`	`56`	`deftest_date_date2num_numpy(t0,dtype):`
`56`	`57`	`time=mdates.date2num(t0)`
`57`	`58`	`tnp=np.array(t0,dtype=dtype)`
`58`	`59`	`nptime=mdates.date2num(tnp)`
`59`	`60`	`assertnp.array_equal(time,nptime)`
`60`	`61`
`61`	`62`
	`63`	`+@pytest.mark.parametrize('dtype', ['datetime64[s]',`
	`64`	`+'datetime64[us]',`
	`65`	`+'datetime64[ms]',`
	`66`	`+'datetime64[ns]'])`
	`67`	`+deftest_date2num_NaT(dtype):`
	`68`	`+t0=datetime.datetime(2017,1,1,0,1,1)`
	`69`	`+tmpl= [mdates.date2num(t0),np.nan]`
	`70`	`+tnp=np.array([t0,'NaT'],dtype=dtype)`
	`71`	`+nptime=mdates.date2num(tnp)`
	`72`	`+np.testing.assert_array_equal(tmpl,nptime)`
	`73`	`+`
	`74`	`+`
	`75`	`+@pytest.mark.parametrize('units', ['s','ms','us','ns'])`
	`76`	`+deftest_date2num_NaT_scalar(units):`
	`77`	`+tmpl=mdates.date2num(np.datetime64('NaT',units))`
	`78`	`+assertnp.isnan(tmpl)`
	`79`	`+`
	`80`	`+`
`62`	`81`	`@image_comparison(baseline_images=['date_empty'],extensions=['png'])`
`63`	`82`	`deftest_date_empty():`
`64`	`83`	`# make sure mpl does the right thing when told to plot dates even`

Comments

(0)