Skip to content

API/ENH: union Categorical #13361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions asv_bench/benchmarks/categoricals.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
from .pandas_vb_common import *
try:
from pandas.types.concat import union_categoricals
except ImportError:
pass
import string


Expand All @@ -12,6 +16,17 @@ def time_concat_categorical(self):
concat([self.s, self.s])


class union_categorical(object):
goal_time = 0.2

def setup(self):
self.a = pd.Categorical((list('aabbcd') * 1000000))
self.b = pd.Categorical((list('bbcdjk') * 1000000))

def time_union_categorical(self):
union_categoricals([self.a, self.b])


class categorical_value_counts(object):
goal_time = 1

Expand Down
23 changes: 23 additions & 0 deletions doc/source/categorical.rst
Original file line number Diff line number Diff line change
Expand Up @@ -648,6 +648,29 @@ In this case the categories are not the same and so an error is raised:

The same applies to ``df.append(df_different)``.

.. _categorical.union:

Unioning
~~~~~~~~

If you want to combine categoricals that do not necessarily have
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

versionadded tag here

the same categories, the `union_categorical` function will
combine a list-like of categoricals. The new categories
will be the union of the categories being combined.

.. ipython:: python

from pandas.types.concat import union_categoricals
a = pd.Categorical(["b", "c"])
b = pd.Categorical(["a", "b"])
union_categoricals([a, b])

.. note::

`union_categoricals` only works with unordered categoricals
and will raise if any are orderd.


Getting Data In/Out
-------------------

Expand Down
2 changes: 1 addition & 1 deletion doc/source/whatsnew/v0.18.2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Other enhancements

- The ``DataFrame`` constructor will now respect key ordering if a list of ``OrderedDict`` objects are passed in (:issue:`13304`)
- ``pd.read_html()`` has gained support for the ``decimal`` option (:issue:`12907`)

- A ``union_categorical`` function has been added for combining categoricals, see :ref:`Unioning Categoricals<categorical.union>` (:issue:`13361`)
- ``eval``'s upcasting rules for ``float32`` types have been updated to be more consistent with NumPy's rules. New behavior will not upcast to ``float64`` if you multiply a pandas ``float32`` object by a scalar float64. (:issue:`12388`)
- ``Series`` has gained the properties ``.is_monotonic``, ``.is_monotonic_increasing``, ``.is_monotonic_decreasing``, similar to ``Index`` (:issue:`13336`)

Expand Down
34 changes: 33 additions & 1 deletion pandas/tools/tests/test_concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
from pandas import (DataFrame, concat,
read_csv, isnull, Series, date_range,
Index, Panel, MultiIndex, Timestamp,
DatetimeIndex)
DatetimeIndex, Categorical)
from pandas.types.concat import union_categoricals
from pandas.util import testing as tm
from pandas.util.testing import (assert_frame_equal,
makeCustomDataframe as mkdf,
Expand Down Expand Up @@ -919,6 +920,37 @@ def test_concat_keys_with_none(self):
keys=['b', 'c', 'd', 'e'])
tm.assert_frame_equal(result, expected)

def test_union_categorical(self):
# GH 13361
s = Categorical(list('abc'))
Copy link
Contributor

@jreback jreback Jun 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a test that makes sure that the returned categories are in order of appearance in the union (you might have an existing one which checks this accidently, but make an explict one, and mark it)

s2 = Categorical(list('abd'))
result = union_categoricals([s, s2])
expected = Categorical(list('abcabd'))
tm.assert_categorical_equal(result, expected, ignore_order=True)

s = Categorical([0, 1, 2])
s2 = Categorical([2, 3, 4])
result = union_categoricals([s, s2])
expected = Categorical([0, 1, 2, 2, 3, 4])
tm.assert_categorical_equal(result, expected, ignore_order=True)

s = Categorical([0, 1.2, 2])
s2 = Categorical([2, 3.4, 4])
result = union_categoricals([s, s2])
expected = Categorical([0, 1.2, 2, 2, 3.4, 4])
tm.assert_categorical_equal(result, expected, ignore_order=True)

# can't be ordered
s = Categorical([0, 1.2, 2], ordered=True)
with tm.assertRaises(TypeError):
union_categoricals([s, s2])

# must exactly match types
s = Categorical([0, 1.2, 2])
s2 = Categorical([2, 3, 4])
with tm.assertRaises(TypeError):
union_categoricals([s, s2])

def test_concat_bug_1719(self):
ts1 = tm.makeTimeSeries()
ts2 = tm.makeTimeSeries()[::2]
Expand Down
37 changes: 37 additions & 0 deletions pandas/types/concat.py
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,43 @@ def convert_categorical(x):
return Categorical(concatted, rawcats)


def union_categoricals(to_union):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a ignore_order=False kwarg? That would prevent changed/copied orig categoricals if you ever need this... Would only disable the order check

if not ignore_order and any(c.ordered for c in to_union):
        raise TypeError("Can only combine unordered Categoricals")

It would still return a unordered cat, of course.

"""
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a versionadded tag

Combine list-like of Categoricals, unioning categories. All
must have the same dtype, and none can be ordered.

Parameters
----------
to_union : list like of Categorical

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add Raises (and list when that happens)

Returns
-------
Categorical
A single array, categories will be ordered as they
appear in the list
"""
from pandas import Index, Categorical, unique

if any(c.ordered for c in to_union):
raise TypeError("Can only combine unordered Categoricals")

first = to_union[0]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should graceful catch the condition that the list of categoricals is empty.

if not all(com.is_dtype_equal(c.categories, first.categories)
for c in to_union):
raise TypeError("dtype of categories must be the same")

unique_cats = unique(np.concatenate([c.categories for c in to_union]))
Copy link
Member

@shoyer shoyer Jun 7, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this really safe if categories is an index with a pandas-specific dtype? e.g., datetime64 with timezone or period.

That's why I thought we needed to use the Index.append() method.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh good point - I'll change that and add some tests.

categories = Index(unique_cats)

new_codes = []
for c in to_union:
indexer = categories.get_indexer(c.categories)
new_codes.append(indexer.take(c.codes))
codes = np.concatenate(new_codes)
return Categorical(codes, categories=categories, ordered=False,
fastpath=True)


def _concat_datetime(to_concat, axis=0, typs=None):
"""
provide concatenation of an datetimelike array of arrays each of which is a
Expand Down
11 changes: 8 additions & 3 deletions pandas/util/testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -963,12 +963,17 @@ def assertNotIsInstance(obj, cls, msg=''):


def assert_categorical_equal(left, right, check_dtype=True,
obj='Categorical'):
obj='Categorical', ignore_order=False):
assertIsInstance(left, pd.Categorical, '[Categorical] ')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a doc-string

assertIsInstance(right, pd.Categorical, '[Categorical] ')

assert_index_equal(left.categories, right.categories,
obj='{0}.categories'.format(obj))
if ignore_order:
assert_index_equal(left.categories.sort_values(),
right.categories.sort_values(),
obj='{0}.categories'.format(obj))
else:
assert_index_equal(left.categories, right.categories,
obj='{0}.categories'.format(obj))
assert_numpy_array_equal(left.codes, right.codes, check_dtype=check_dtype,
obj='{0}.codes'.format(obj))

Expand Down