@@ -4561,42 +4561,50 @@ def test_asfreq_datetimeindex(self):
45614561 ts = df ['A' ].asfreq ('B' )
45624562 self .assert_ (isinstance (ts .index , DatetimeIndex ))
45634563
4564- def test_attime_betweentime_datetimeindex (self ):
4564+ def test_at_time_between_time_datetimeindex (self ):
45654565 index = pan .date_range ("2012-01-01" , "2012-01-05" , freq = '30min' )
45664566 df = DataFrame (randn (len (index ), 5 ), index = index )
4567+ akey = time (12 , 0 , 0 )
4568+ bkey = slice (time (13 , 0 , 0 ), time (14 , 0 , 0 ))
4569+ ainds = [24 , 72 , 120 , 168 ]
4570+ binds = [26 , 27 , 28 , 74 , 75 , 76 , 122 , 123 , 124 , 170 , 171 , 172 ]
45674571
4568- result = df .at_time (time (12 , 0 , 0 ))
4569- expected = df .ix [time (12 , 0 , 0 )]
4572+ result = df .at_time (akey )
4573+ expected = df .ix [akey ]
4574+ expected2 = df .ix [ainds ]
45704575 assert_frame_equal (result , expected )
4576+ assert_frame_equal (result , expected2 )
45714577 self .assert_ (len (result ) == 4 )
45724578
4573- result = df .between_time (time (13 , 0 , 0 ), time (14 , 0 , 0 ))
4574- expected = df .ix [time (13 , 0 , 0 ):time (14 , 0 , 0 )]
4579+ result = df .between_time (bkey .start , bkey .stop )
4580+ expected = df .ix [bkey ]
4581+ expected2 = df .ix [binds ]
45754582 assert_frame_equal (result , expected )
4583+ assert_frame_equal (result , expected2 )
45764584 self .assert_ (len (result ) == 12 )
45774585
45784586 result = df .copy ()
4579- result .ix [time ( 12 , 0 , 0 ) ] = 0
4580- result = result .ix [time ( 12 , 0 , 0 ) ]
4581- expected = df .ix [time ( 12 , 0 , 0 ) ].copy ()
4587+ result .ix [akey ] = 0
4588+ result = result .ix [akey ]
4589+ expected = df .ix [akey ].copy ()
45824590 expected .ix [:] = 0
45834591 assert_frame_equal (result , expected )
45844592
45854593 result = df .copy ()
4586- result .ix [time ( 12 , 0 , 0 ) ] = 0
4587- result .ix [time ( 12 , 0 , 0 ) ] = df # also checks reindexing
4594+ result .ix [akey ] = 0
4595+ result .ix [akey ] = df . ix [ ainds ]
45884596 assert_frame_equal (result , df )
45894597
45904598 result = df .copy ()
4591- result .ix [time ( 13 , 0 , 0 ): time ( 14 , 0 , 0 ) ] = 0
4592- result = result .ix [time ( 13 , 0 , 0 ): time ( 14 , 0 , 0 ) ]
4593- expected = df .ix [time ( 13 , 0 , 0 ): time ( 14 , 0 , 0 ) ].copy ()
4599+ result .ix [bkey ] = 0
4600+ result = result .ix [bkey ]
4601+ expected = df .ix [bkey ].copy ()
45944602 expected .ix [:] = 0
45954603 assert_frame_equal (result , expected )
45964604
45974605 result = df .copy ()
4598- result .ix [time ( 13 , 0 , 0 ): time ( 14 , 0 , 0 ) ] = 0
4599- result .ix [time ( 13 , 0 , 0 ): time ( 14 , 0 , 0 ) ] = df # also checks reindexing
4606+ result .ix [bkey ] = 0
4607+ result .ix [bkey ] = df . ix [ binds ]
46004608 assert_frame_equal (result , df )
46014609
46024610 def test_as_matrix (self ):
0 commit comments