moved test for categorical, in rank, to top

Author: jeet63

pandas/core/algorithms.py

@@ -973,6 +973,10 @@ def _hashtable_algo(f, values, return_dtype=None):
 def _get_data_algo(values, func_map):
 
     f = None
+
+    if is_categorical_dtype(values):
+        values = values._values_for_rank()
+
     if is_float_dtype(values):
         f = func_map['float64']
         values = _ensure_float64(values)
@@ -988,12 +992,6 @@ def _get_data_algo(values, func_map):
     elif is_unsigned_integer_dtype(values):
         f = func_map['uint64']
         values = _ensure_uint64(values)
-    elif is_categorical_dtype(values):
-        values = values._values_for_rank()
-        if is_float_dtype(values):
-            f = func_map['float64']
-        else:
-            f = func_map['object']
     else:
         values = _ensure_object(values)
 

pandas/tests/series/test_analytics.py

@@ -1059,7 +1059,7 @@ def test_rank(self):
 
     def test_rank_categorical(self):
         # GH issue #15420 rank incorrectly orders ordered categories
-        
+
         # Test ascending/descending ranking for ordered categoricals
         exp = pd.Series([1., 2., 3., 4., 5., 6.])
         exp_desc = pd.Series([6., 5., 4., 3., 2., 1.])

pandas/tests/test_categorical.py

@@ -4549,6 +4549,7 @@ def test_concat_categorical(self):
                             'h': [None] * 6 + cat_values})
         tm.assert_frame_equal(res, exp)
 
+
 class TestCategoricalSubclassing(tm.TestCase):
 
     def test_constructor(self):