@@ -314,27 +314,27 @@ def verify_order(df):
314314
315315
316316def test_decons ():
317- def testit (label_list , shape ):
318- group_index = get_group_index (label_list , shape , sort = True , xnull = True )
319- label_list2 = decons_group_index (group_index , shape )
317+ def testit (codes_list , shape ):
318+ group_index = get_group_index (codes_list , shape , sort = True , xnull = True )
319+ codes_list2 = decons_group_index (group_index , shape )
320320
321- for a , b in zip (label_list , label_list2 ):
321+ for a , b in zip (codes_list , codes_list2 ):
322322 tm .assert_numpy_array_equal (a , b )
323323
324324 shape = (4 , 5 , 6 )
325- label_list = [
325+ codes_list = [
326326 np .tile ([0 , 1 , 2 , 3 , 0 , 1 , 2 , 3 ], 100 ).astype (np .int64 ),
327327 np .tile ([0 , 2 , 4 , 3 , 0 , 1 , 2 , 3 ], 100 ).astype (np .int64 ),
328328 np .tile ([5 , 1 , 0 , 2 , 3 , 0 , 5 , 4 ], 100 ).astype (np .int64 ),
329329 ]
330- testit (label_list , shape )
330+ testit (codes_list , shape )
331331
332332 shape = (10000 , 10000 )
333- label_list = [
333+ codes_list = [
334334 np .tile (np .arange (10000 , dtype = np .int64 ), 5 ),
335335 np .tile (np .arange (10000 , dtype = np .int64 ), 5 ),
336336 ]
337- testit (label_list , shape )
337+ testit (codes_list , shape )
338338
339339
340340class TestSafeSort :
@@ -355,42 +355,42 @@ def test_basic_sort(self):
355355 tm .assert_numpy_array_equal (result , expected )
356356
357357 @pytest .mark .parametrize ("verify" , [True , False ])
358- def test_labels (self , verify ):
358+ def test_codes (self , verify ):
359359 values = [3 , 1 , 2 , 0 , 4 ]
360360 expected = np .array ([0 , 1 , 2 , 3 , 4 ])
361361
362- labels = [0 , 1 , 1 , 2 , 3 , 0 , - 1 , 4 ]
363- result , result_labels = safe_sort (values , labels , verify = verify )
364- expected_labels = np .array ([3 , 1 , 1 , 2 , 0 , 3 , - 1 , 4 ], dtype = np .intp )
362+ codes = [0 , 1 , 1 , 2 , 3 , 0 , - 1 , 4 ]
363+ result , result_codes = safe_sort (values , codes , verify = verify )
364+ expected_codes = np .array ([3 , 1 , 1 , 2 , 0 , 3 , - 1 , 4 ], dtype = np .intp )
365365 tm .assert_numpy_array_equal (result , expected )
366- tm .assert_numpy_array_equal (result_labels , expected_labels )
366+ tm .assert_numpy_array_equal (result_codes , expected_codes )
367367
368368 # na_sentinel
369- labels = [0 , 1 , 1 , 2 , 3 , 0 , 99 , 4 ]
370- result , result_labels = safe_sort (values , labels , na_sentinel = 99 , verify = verify )
371- expected_labels = np .array ([3 , 1 , 1 , 2 , 0 , 3 , 99 , 4 ], dtype = np .intp )
369+ codes = [0 , 1 , 1 , 2 , 3 , 0 , 99 , 4 ]
370+ result , result_codes = safe_sort (values , codes , na_sentinel = 99 , verify = verify )
371+ expected_codes = np .array ([3 , 1 , 1 , 2 , 0 , 3 , 99 , 4 ], dtype = np .intp )
372372 tm .assert_numpy_array_equal (result , expected )
373- tm .assert_numpy_array_equal (result_labels , expected_labels )
373+ tm .assert_numpy_array_equal (result_codes , expected_codes )
374374
375- labels = []
376- result , result_labels = safe_sort (values , labels , verify = verify )
377- expected_labels = np .array ([], dtype = np .intp )
375+ codes = []
376+ result , result_codes = safe_sort (values , codes , verify = verify )
377+ expected_codes = np .array ([], dtype = np .intp )
378378 tm .assert_numpy_array_equal (result , expected )
379- tm .assert_numpy_array_equal (result_labels , expected_labels )
379+ tm .assert_numpy_array_equal (result_codes , expected_codes )
380380
381381 @pytest .mark .parametrize ("na_sentinel" , [- 1 , 99 ])
382- def test_labels_out_of_bound (self , na_sentinel ):
382+ def test_codes_out_of_bound (self , na_sentinel ):
383383 values = [3 , 1 , 2 , 0 , 4 ]
384384 expected = np .array ([0 , 1 , 2 , 3 , 4 ])
385385
386386 # out of bound indices
387- labels = [0 , 101 , 102 , 2 , 3 , 0 , 99 , 4 ]
388- result , result_labels = safe_sort (values , labels , na_sentinel = na_sentinel )
389- expected_labels = np .array (
387+ codes = [0 , 101 , 102 , 2 , 3 , 0 , 99 , 4 ]
388+ result , result_codes = safe_sort (values , codes , na_sentinel = na_sentinel )
389+ expected_codes = np .array (
390390 [3 , na_sentinel , na_sentinel , 2 , 0 , 3 , na_sentinel , 4 ], dtype = np .intp
391391 )
392392 tm .assert_numpy_array_equal (result , expected )
393- tm .assert_numpy_array_equal (result_labels , expected_labels )
393+ tm .assert_numpy_array_equal (result_codes , expected_codes )
394394
395395 def test_mixed_integer (self ):
396396 values = np .array (["b" , 1 , 0 , "a" , 0 , "b" ], dtype = object )
@@ -399,12 +399,12 @@ def test_mixed_integer(self):
399399 tm .assert_numpy_array_equal (result , expected )
400400
401401 values = np .array (["b" , 1 , 0 , "a" ], dtype = object )
402- labels = [0 , 1 , 2 , 3 , 0 , - 1 , 1 ]
403- result , result_labels = safe_sort (values , labels )
402+ codes = [0 , 1 , 2 , 3 , 0 , - 1 , 1 ]
403+ result , result_codes = safe_sort (values , codes )
404404 expected = np .array ([0 , 1 , "a" , "b" ], dtype = object )
405- expected_labels = np .array ([3 , 1 , 0 , 2 , 3 , - 1 , 1 ], dtype = np .intp )
405+ expected_codes = np .array ([3 , 1 , 0 , 2 , 3 , - 1 , 1 ], dtype = np .intp )
406406 tm .assert_numpy_array_equal (result , expected )
407- tm .assert_numpy_array_equal (result_labels , expected_labels )
407+ tm .assert_numpy_array_equal (result_codes , expected_codes )
408408
409409 def test_mixed_integer_from_list (self ):
410410 values = ["b" , 1 , 0 , "a" , 0 , "b" ]
@@ -428,10 +428,10 @@ def test_exceptions(self):
428428 safe_sort (values = 1 )
429429
430430 with pytest .raises (TypeError , match = "Only list-like objects or None" ):
431- safe_sort (values = [0 , 1 , 2 ], labels = 1 )
431+ safe_sort (values = [0 , 1 , 2 ], codes = 1 )
432432
433433 with pytest .raises (ValueError , match = "values should be unique" ):
434- safe_sort (values = [0 , 1 , 2 , 1 ], labels = [0 , 1 ])
434+ safe_sort (values = [0 , 1 , 2 , 1 ], codes = [0 , 1 ])
435435
436436 def test_extension_array (self ):
437437 # a = array([1, 3, np.nan, 2], dtype='Int64')
@@ -443,12 +443,12 @@ def test_extension_array(self):
443443
444444 @pytest .mark .parametrize ("verify" , [True , False ])
445445 @pytest .mark .parametrize ("na_sentinel" , [- 1 , 99 ])
446- def test_extension_array_labels (self , verify , na_sentinel ):
446+ def test_extension_array_codes (self , verify , na_sentinel ):
447447 a = array ([1 , 3 , 2 ], dtype = "Int64" )
448- result , labels = safe_sort (
448+ result , codes = safe_sort (
449449 a , [0 , 1 , na_sentinel , 2 ], na_sentinel = na_sentinel , verify = verify
450450 )
451451 expected_values = array ([1 , 2 , 3 ], dtype = "Int64" )
452- expected_labels = np .array ([0 , 2 , na_sentinel , 1 ], dtype = np .intp )
452+ expected_codes = np .array ([0 , 2 , na_sentinel , 1 ], dtype = np .intp )
453453 tm .assert_extension_array_equal (result , expected_values )
454- tm .assert_numpy_array_equal (labels , expected_labels )
454+ tm .assert_numpy_array_equal (codes , expected_codes )
0 commit comments