@@ -56,7 +56,8 @@ def setUp(self):
56
56
index = MultiIndex (levels = [['foo' , 'bar' , 'baz' , 'qux' ],
57
57
['one' , 'two' , 'three' ]],
58
58
labels = [[0 , 0 , 0 , 1 , 1 , 2 , 2 , 3 , 3 , 3 ],
59
- [0 , 1 , 2 , 0 , 1 , 1 , 2 , 0 , 1 , 2 ]])
59
+ [0 , 1 , 2 , 0 , 1 , 1 , 2 , 0 , 1 , 2 ]],
60
+ names = ['first' , 'second' ])
60
61
self .mframe = DataFrame (np .random .randn (10 , 3 ), index = index ,
61
62
columns = ['A' , 'B' , 'C' ])
62
63
@@ -655,7 +656,7 @@ def _testit(op):
655
656
656
657
def test_grouping_attrs (self ):
657
658
deleveled = self .mframe .delevel ()
658
- grouped = deleveled .groupby (['level_0 ' , 'level_1 ' ])
659
+ grouped = deleveled .groupby (['first ' , 'second ' ])
659
660
660
661
for i , ping in enumerate (grouped .groupings ):
661
662
the_counts = self .mframe .groupby (level = i ).count ()['A' ]
@@ -668,12 +669,20 @@ def test_groupby_level(self):
668
669
result0 = frame .groupby (level = 0 ).sum ()
669
670
result1 = frame .groupby (level = 1 ).sum ()
670
671
671
- expected0 = frame .groupby (deleveled ['level_0 ' ]).sum ()
672
- expected1 = frame .groupby (deleveled ['level_1 ' ]).sum ()
672
+ expected0 = frame .groupby (deleveled ['first ' ]).sum ()
673
+ expected1 = frame .groupby (deleveled ['second ' ]).sum ()
673
674
674
675
assert_frame_equal (result0 , expected0 )
675
676
assert_frame_equal (result1 , expected1 )
676
677
678
+ # groupby level name
679
+ result0 = frame .groupby (level = 'first' ).sum ()
680
+ result1 = frame .groupby (level = 'second' ).sum ()
681
+ assert_frame_equal (result0 , expected0 )
682
+ assert_frame_equal (result1 , expected1 )
683
+
684
+ # axis=1
685
+
677
686
result0 = frame .T .groupby (level = 0 , axis = 1 ).sum ()
678
687
result1 = frame .T .groupby (level = 1 , axis = 1 ).sum ()
679
688
assert_frame_equal (result0 , expected0 .T )
@@ -693,8 +702,8 @@ def test_groupby_level_mapper(self):
693
702
result0 = frame .groupby (mapper0 , level = 0 ).sum ()
694
703
result1 = frame .groupby (mapper1 , level = 1 ).sum ()
695
704
696
- mapped_level0 = np .array ([mapper0 .get (x ) for x in deleveled ['level_0 ' ]])
697
- mapped_level1 = np .array ([mapper1 .get (x ) for x in deleveled ['level_1 ' ]])
705
+ mapped_level0 = np .array ([mapper0 .get (x ) for x in deleveled ['first ' ]])
706
+ mapped_level1 = np .array ([mapper1 .get (x ) for x in deleveled ['second ' ]])
698
707
expected0 = frame .groupby (mapped_level0 ).sum ()
699
708
expected1 = frame .groupby (mapped_level1 ).sum ()
700
709
0 commit comments