Merge pull request #5943 from jreback/match

BUG: pd.match not returning passed sentinel

Author: jreback

doc/source/release.rst

@@ -103,6 +103,7 @@ Bug Fixes
   - Bug in propogating metadata on ``resample`` (:issue:`5862`)
   - Fixed string-representation of ``NaT`` to be "NaT" (:issue:`5708`)
   - Fixed string-representation for Timestamp to show nanoseconds if present (:issue:`5912`)
+  - ``pd.match`` not returning passed sentinel
 
 pandas 0.13.0
 -------------

pandas/core/algorithms.py

@@ -11,7 +11,6 @@
 import pandas.hashtable as htable
 import pandas.compat as compat
 
-
 def match(to_match, values, na_sentinel=-1):
     """
     Compute locations of to_match into values
@@ -37,7 +36,16 @@ def match(to_match, values, na_sentinel=-1):
         values = np.array(values, dtype='O')
 
     f = lambda htype, caster: _match_generic(to_match, values, htype, caster)
-    return _hashtable_algo(f, values.dtype)
+    result = _hashtable_algo(f, values.dtype)
+
+    if na_sentinel != -1:
+
+        # replace but return a numpy array
+        # use a Series because it handles dtype conversions properly
+        from pandas.core.series import Series
+        result = Series(result.ravel()).replace(-1,na_sentinel).values.reshape(result.shape)
+
+    return result
 
 
 def unique(values):

pandas/tests/test_algos.py

@@ -8,7 +8,6 @@
 import pandas.core.algorithms as algos
 import pandas.util.testing as tm
 
-
 class TestMatch(tm.TestCase):
     _multiprocess_can_split_ = True
 
@@ -20,6 +19,19 @@ def test_ints(self):
         expected = np.array([0, 2, 1, 1, 0, 2, -1, 0])
         self.assert_(np.array_equal(result, expected))
 
+        result = Series(algos.match(to_match, values, np.nan))
+        expected = Series(np.array([0, 2, 1, 1, 0, 2, np.nan, 0]))
+        tm.assert_series_equal(result,expected)
+
+        s = pd.Series(np.arange(5),dtype=np.float32)
+        result = algos.match(s, [2,4])
+        expected = np.array([-1, -1, 0, -1, 1])
+        self.assert_(np.array_equal(result, expected))
+
+        result = Series(algos.match(s, [2,4], np.nan))
+        expected = Series(np.array([np.nan, np.nan, 0, np.nan, 1]))
+        tm.assert_series_equal(result,expected)
+
     def test_strings(self):
         values = ['foo', 'bar', 'baz']
         to_match = ['bar', 'foo', 'qux', 'foo', 'bar', 'baz', 'qux']
@@ -28,6 +40,9 @@ def test_strings(self):
         expected = np.array([1, 0, -1, 0, 1, 2, -1])
         self.assert_(np.array_equal(result, expected))
 
+        result = Series(algos.match(to_match, values, np.nan))
+        expected = Series(np.array([1, 0, np.nan, 0, 1, 2, np.nan]))
+        tm.assert_series_equal(result,expected)
 
 class TestUnique(tm.TestCase):
     _multiprocess_can_split_ = True