@@ -500,7 +500,7 @@ def test_dataframe_dummies_with_categorical(self, df, sparse, dtype):
500
500
expected .sort_index (axis = 1 )
501
501
assert_frame_equal (result , expected )
502
502
503
- def test_basic_drop_first (self , sparse , dtype ):
503
+ def test_basic_drop_first (self , sparse ):
504
504
# GH12402 Add a new parameter `drop_first` to avoid collinearity
505
505
# Basic case
506
506
s_list = list ('abc' )
@@ -509,101 +509,93 @@ def test_basic_drop_first(self, sparse, dtype):
509
509
510
510
expected = DataFrame ({'b' : [0 , 1 , 0 ],
511
511
'c' : [0 , 0 , 1 ]},
512
- dtype = self . effective_dtype ( dtype ) )
512
+ dtype = np . uint8 )
513
513
514
- result = get_dummies (s_list , drop_first = True ,
515
- sparse = sparse , dtype = dtype )
514
+ result = get_dummies (s_list , drop_first = True , sparse = sparse )
516
515
assert_frame_equal (result , expected )
517
516
518
- result = get_dummies (s_series , drop_first = True ,
519
- sparse = sparse , dtype = dtype )
517
+ result = get_dummies (s_series , drop_first = True , sparse = sparse )
520
518
assert_frame_equal (result , expected )
521
519
522
520
expected .index = list ('ABC' )
523
- result = get_dummies (s_series_index , drop_first = True ,
524
- sparse = sparse , dtype = dtype )
521
+ result = get_dummies (s_series_index , drop_first = True , sparse = sparse )
525
522
assert_frame_equal (result , expected )
526
523
527
- def test_basic_drop_first_one_level (self , sparse , dtype ):
524
+ def test_basic_drop_first_one_level (self , sparse ):
528
525
# Test the case that categorical variable only has one level.
529
526
s_list = list ('aaa' )
530
527
s_series = Series (s_list )
531
528
s_series_index = Series (s_list , list ('ABC' ))
532
529
533
530
expected = DataFrame (index = np .arange (3 ))
534
531
535
- result = get_dummies (s_list , drop_first = True ,
536
- sparse = sparse , dtype = dtype )
532
+ result = get_dummies (s_list , drop_first = True , sparse = sparse )
537
533
assert_frame_equal (result , expected )
538
534
539
- result = get_dummies (s_series , drop_first = True ,
540
- sparse = sparse , dtype = dtype )
535
+ result = get_dummies (s_series , drop_first = True , sparse = sparse )
541
536
assert_frame_equal (result , expected )
542
537
543
538
expected = DataFrame (index = list ('ABC' ))
544
- result = get_dummies (s_series_index , drop_first = True ,
545
- sparse = sparse , dtype = dtype )
539
+ result = get_dummies (s_series_index , drop_first = True , sparse = sparse )
546
540
assert_frame_equal (result , expected )
547
541
548
- def test_basic_drop_first_NA (self , sparse , dtype ):
542
+ def test_basic_drop_first_NA (self , sparse ):
549
543
# Test NA hadling together with drop_first
550
544
s_NA = ['a' , 'b' , np .nan ]
551
- res = get_dummies (s_NA , drop_first = True , sparse = sparse , dtype = dtype )
552
- exp = DataFrame ({'b' : [0 , 1 , 0 ]}, dtype = self . effective_dtype ( dtype ) )
545
+ res = get_dummies (s_NA , drop_first = True , sparse = sparse )
546
+ exp = DataFrame ({'b' : [0 , 1 , 0 ]}, dtype = np . uint8 )
553
547
assert_frame_equal (res , exp )
554
548
555
549
res_na = get_dummies (s_NA , dummy_na = True , drop_first = True ,
556
- sparse = sparse , dtype = dtype )
550
+ sparse = sparse )
557
551
exp_na = DataFrame (
558
552
{'b' : [0 , 1 , 0 ],
559
553
nan : [0 , 0 , 1 ]},
560
- dtype = self . effective_dtype ( dtype ) ).reindex (['b' , nan ], axis = 1 )
554
+ dtype = np . uint8 ).reindex (['b' , nan ], axis = 1 )
561
555
assert_frame_equal (res_na , exp_na )
562
556
563
- res_just_na = get_dummies ([nan ],
564
- dummy_na = True ,
565
- drop_first = True ,
566
- sparse = sparse , dtype = dtype )
557
+ res_just_na = get_dummies ([nan ], dummy_na = True , drop_first = True ,
558
+ sparse = sparse )
567
559
exp_just_na = DataFrame (index = np .arange (1 ))
568
560
assert_frame_equal (res_just_na , exp_just_na )
569
561
570
- def test_dataframe_dummies_drop_first (self , df , sparse , dtype ):
562
+ def test_dataframe_dummies_drop_first (self , df , sparse ):
571
563
df = df [['A' , 'B' ]]
572
- result = get_dummies (df , drop_first = True , sparse = sparse , dtype = dtype )
564
+ result = get_dummies (df , drop_first = True , sparse = sparse )
573
565
expected = DataFrame ({'A_b' : [0 , 1 , 0 ],
574
566
'B_c' : [0 , 0 , 1 ]},
575
- dtype = self . effective_dtype ( dtype ) )
567
+ dtype = np . uint8 )
576
568
assert_frame_equal (result , expected )
577
569
578
570
def test_dataframe_dummies_drop_first_with_categorical (
579
571
self , df , sparse , dtype ):
580
572
df ['cat' ] = pd .Categorical (['x' , 'y' , 'y' ])
581
- result = get_dummies (df , drop_first = True , sparse = sparse , dtype = dtype )
573
+ result = get_dummies (df , drop_first = True , sparse = sparse )
582
574
expected = DataFrame ({'C' : [1 , 2 , 3 ],
583
575
'A_b' : [0 , 1 , 0 ],
584
576
'B_c' : [0 , 0 , 1 ],
585
577
'cat_y' : [0 , 1 , 1 ]})
586
578
cols = ['A_b' , 'B_c' , 'cat_y' ]
587
- expected [cols ] = expected [cols ].astype (self . effective_dtype ( dtype ) )
579
+ expected [cols ] = expected [cols ].astype (np . uint8 )
588
580
expected = expected [['C' , 'A_b' , 'B_c' , 'cat_y' ]]
589
581
assert_frame_equal (result , expected )
590
582
591
- def test_dataframe_dummies_drop_first_with_na (self , df , sparse , dtype ):
583
+ def test_dataframe_dummies_drop_first_with_na (self , df , sparse ):
592
584
df .loc [3 , :] = [np .nan , np .nan , np .nan ]
593
585
result = get_dummies (df , dummy_na = True , drop_first = True ,
594
- sparse = sparse , dtype = dtype ).sort_index (axis = 1 )
586
+ sparse = sparse ).sort_index (axis = 1 )
595
587
expected = DataFrame ({'C' : [1 , 2 , 3 , np .nan ],
596
588
'A_b' : [0 , 1 , 0 , 0 ],
597
589
'A_nan' : [0 , 0 , 0 , 1 ],
598
590
'B_c' : [0 , 0 , 1 , 0 ],
599
591
'B_nan' : [0 , 0 , 0 , 1 ]})
600
592
cols = ['A_b' , 'A_nan' , 'B_c' , 'B_nan' ]
601
- expected [cols ] = expected [cols ].astype (self . effective_dtype ( dtype ) )
593
+ expected [cols ] = expected [cols ].astype (np . uint8 )
602
594
expected = expected .sort_index (axis = 1 )
603
595
assert_frame_equal (result , expected )
604
596
605
597
result = get_dummies (df , dummy_na = False , drop_first = True ,
606
- sparse = sparse , dtype = dtype )
598
+ sparse = sparse )
607
599
expected = expected [['C' , 'A_b' , 'B_c' ]]
608
600
assert_frame_equal (result , expected )
609
601
0 commit comments