Skip to content

Commit 9664d81

Browse files
topper-123topper-123
committed
move NDFrame.groupby to (DataFrame|Series).groupby
1 parent 5a7b5c9 commit 9664d81

File tree

3 files changed

+169
-81
lines changed

3 files changed

+169
-81
lines changed

‎pandas/core/frame.py

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@
9292
)
9393
from pandas.core.dtypes.missing import isna, notna
9494

95-
from pandas.core import algorithms, common as com, nanops, ops
95+
from pandas._typing import Axes, Dtype, FilePathOrBuffer
96+
from pandas.core import algorithms, common as com, groupby, nanops, ops
9697
from pandas.core.accessor import CachedAccessor
9798
from pandas.core.arrays import Categorical, ExtensionArray
9899
from pandas.core.arrays.datetimelike import DatetimeLikeArrayMixin as DatetimeLikeArray
@@ -5523,6 +5524,82 @@ def update(
55235524

55245525
# ----------------------------------------------------------------------
55255526
# Data reshaping
5527+
@Appender(
5528+
"""
5529+
Examples
5530+
--------
5531+
>>> df = pd.DataFrame({'Animal': ['Falcon', 'Falcon',
5532+
... 'Parrot', 'Parrot'],
5533+
... 'Max Speed': [380., 370., 24., 26.]})
5534+
>>> df
5535+
Animal Max Speed
5536+
0 Falcon 380.0
5537+
1 Falcon 370.0
5538+
2 Parrot 24.0
5539+
3 Parrot 26.0
5540+
>>> df.groupby(['Animal']).mean()
5541+
Max Speed
5542+
Animal
5543+
Falcon 375.0
5544+
Parrot 25.0
5545+
5546+
**Hierarchical Indexes**
5547+
5548+
We can groupby different levels of a hierarchical index
5549+
using the `level` parameter:
5550+
5551+
>>> arrays = [['Falcon', 'Falcon', 'Parrot', 'Parrot'],
5552+
... ['Captive', 'Wild', 'Captive', 'Wild']]
5553+
>>> index = pd.MultiIndex.from_arrays(arrays, names=('Animal', 'Type'))
5554+
>>> df = pd.DataFrame({'Max Speed': [390., 350., 30., 20.]},
5555+
... index=index)
5556+
>>> df
5557+
Max Speed
5558+
Animal Type
5559+
Falcon Captive 390.0
5560+
Wild 350.0
5561+
Parrot Captive 30.0
5562+
Wild 20.0
5563+
>>> df.groupby(level=0).mean()
5564+
Max Speed
5565+
Animal
5566+
Falcon 370.0
5567+
Parrot 25.0
5568+
>>> df.groupby(level="Type").mean()
5569+
Max Speed
5570+
Type
5571+
Captive 210.0
5572+
Wild 185.0
5573+
"""
5574+
)
5575+
@Appender(_shared_docs["groupby"] % _shared_doc_kwargs)
5576+
def groupby(
5577+
self,
5578+
by=None,
5579+
axis=0,
5580+
level=None,
5581+
as_index: bool = True,
5582+
sort: bool = True,
5583+
group_keys: bool = True,
5584+
squeeze: bool = False,
5585+
observed: bool = False,
5586+
) -> "groupby.DataFrameGroupBy":
5587+
5588+
if level is None and by is None:
5589+
raise TypeError("You have to supply one of 'by' and 'level'")
5590+
axis = self._get_axis_number(axis)
5591+
5592+
return groupby.DataFrameGroupBy(
5593+
obj=self,
5594+
keys=by,
5595+
axis=axis,
5596+
level=level,
5597+
as_index=as_index,
5598+
sort=sort,
5599+
group_keys=group_keys,
5600+
squeeze=squeeze,
5601+
observed=observed,
5602+
)
55265603

55275604
_shared_docs[
55285605
"pivot"

‎pandas/core/generic.py

Lines changed: 7 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -7282,19 +7282,10 @@ def clip(
72827282

72837283
return result
72847284

7285-
def groupby(
7286-
self,
7287-
by=None,
7288-
axis=0,
7289-
level=None,
7290-
as_index: bool_t = True,
7291-
sort: bool_t = True,
7292-
group_keys: bool_t = True,
7293-
squeeze: bool_t = False,
7294-
observed: bool_t = False,
7295-
):
7296-
"""
7297-
Group DataFrame or Series using a mapper or by a Series of columns.
7285+
_shared_docs[
7286+
"groupby"
7287+
] = """
7288+
Group %(klass)s using a mapper or by a Series of columns.
72987289
72997290
A groupby operation involves some combination of splitting the
73007291
object, applying a function, and combining the results. This can be
@@ -7339,9 +7330,8 @@ def groupby(
73397330
73407331
Returns
73417332
-------
7342-
DataFrameGroupBy or SeriesGroupBy
7343-
Depends on the calling object and returns groupby object that
7344-
contains information about the groups.
7333+
%(klass)sGroupBy
7334+
Returns a groupby object that contains information about the groups.
73457335
73467336
See Also
73477337
--------
@@ -7352,69 +7342,7 @@ def groupby(
73527342
-----
73537343
See the `user guide
73547344
<http://pandas.pydata.org/pandas-docs/stable/groupby.html>`_ for more.
7355-
7356-
Examples
7357-
--------
7358-
>>> df = pd.DataFrame({'Animal': ['Falcon', 'Falcon',
7359-
... 'Parrot', 'Parrot'],
7360-
... 'Max Speed': [380., 370., 24., 26.]})
7361-
>>> df
7362-
Animal Max Speed
7363-
0 Falcon 380.0
7364-
1 Falcon 370.0
7365-
2 Parrot 24.0
7366-
3 Parrot 26.0
7367-
>>> df.groupby(['Animal']).mean()
7368-
Max Speed
7369-
Animal
7370-
Falcon 375.0
7371-
Parrot 25.0
7372-
7373-
**Hierarchical Indexes**
7374-
7375-
We can groupby different levels of a hierarchical index
7376-
using the `level` parameter:
7377-
7378-
>>> arrays = [['Falcon', 'Falcon', 'Parrot', 'Parrot'],
7379-
... ['Captive', 'Wild', 'Captive', 'Wild']]
7380-
>>> index = pd.MultiIndex.from_arrays(arrays, names=('Animal', 'Type'))
7381-
>>> df = pd.DataFrame({'Max Speed': [390., 350., 30., 20.]},
7382-
... index=index)
7383-
>>> df
7384-
Max Speed
7385-
Animal Type
7386-
Falcon Captive 390.0
7387-
Wild 350.0
7388-
Parrot Captive 30.0
7389-
Wild 20.0
7390-
>>> df.groupby(level=0).mean()
7391-
Max Speed
7392-
Animal
7393-
Falcon 370.0
7394-
Parrot 25.0
7395-
>>> df.groupby(level=1).mean()
7396-
Max Speed
7397-
Type
7398-
Captive 210.0
7399-
Wild 185.0
7400-
"""
7401-
from pandas.core.groupby.groupby import get_groupby
7402-
7403-
if level is None and by is None:
7404-
raise TypeError("You have to supply one of 'by' and 'level'")
7405-
axis = self._get_axis_number(axis)
7406-
7407-
return get_groupby(
7408-
self,
7409-
by=by,
7410-
axis=axis,
7411-
level=level,
7412-
as_index=as_index,
7413-
sort=sort,
7414-
group_keys=group_keys,
7415-
squeeze=squeeze,
7416-
observed=observed,
7417-
)
7345+
"""
74187346

74197347
def asfreq(
74207348
self,

‎pandas/core/series.py

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
)
4848

4949
import pandas as pd
50-
from pandas.core import algorithms, base, generic, nanops, ops
50+
from pandas.core import algorithms, base, generic, groupby, nanops, ops
5151
from pandas.core.accessor import CachedAccessor
5252
from pandas.core.arrays import ExtensionArray, try_cast_to_ea
5353
from pandas.core.arrays.categorical import Categorical, CategoricalAccessor
@@ -1565,6 +1565,89 @@ def _set_name(self, name, inplace=False):
15651565
ser.name = name
15661566
return ser
15671567

1568+
@Appender(
1569+
"""
1570+
Examples
1571+
--------
1572+
>>> ser = pd.Series([390., 350., 30., 20.],
1573+
... index=['Falcon', 'Falcon', 'Parrot', 'Parrot'], name="Max Speed")
1574+
>>> ser
1575+
Falcon 390.0
1576+
Falcon 350.0
1577+
Parrot 30.0
1578+
Parrot 20.0
1579+
Name: Max Speed, dtype: float64
1580+
>>> ser.groupby(["a", "b", "a", "b"]).mean()
1581+
a 210.0
1582+
b 185.0
1583+
Name: Max Speed, dtype: float64
1584+
>>> ser.groupby(level=0).mean()
1585+
Falcon 370.0
1586+
Parrot 25.0
1587+
Name: Max Speed, dtype: float64
1588+
>>> ser.groupby(ser > 100).mean()
1589+
Max Speed
1590+
False 25.0
1591+
True 370.0
1592+
Name: Max Speed, dtype: float64
1593+
1594+
**Grouping by Indexes**
1595+
1596+
We can groupby different levels of a hierarchical index
1597+
using the `level` parameter:
1598+
1599+
>>> arrays = [['Falcon', 'Falcon', 'Parrot', 'Parrot'],
1600+
... ['Captive', 'Wild', 'Captive', 'Wild']]
1601+
>>> index = pd.MultiIndex.from_arrays(arrays, names=('Animal', 'Type'))
1602+
>>> ser = pd.Series([390., 350., 30., 20.], index=index, name="Max Speed")
1603+
>>> ser
1604+
Animal Type
1605+
Falcon Captive 390.0
1606+
Wild 350.0
1607+
Parrot Captive 30.0
1608+
Wild 20.0
1609+
Name: Max Speed, dtype: float64
1610+
>>> ser.groupby(level=0).mean()
1611+
Animal
1612+
Falcon 370.0
1613+
Parrot 25.0
1614+
Name: Max Speed, dtype: float64
1615+
>>> ser.groupby(level="Type").mean()
1616+
Type
1617+
Captive 210.0
1618+
Wild 185.0
1619+
Name: Max Speed, dtype: float64
1620+
"""
1621+
)
1622+
@Appender(generic._shared_docs["groupby"] % _shared_doc_kwargs)
1623+
def groupby(
1624+
self,
1625+
by=None,
1626+
axis=0,
1627+
level=None,
1628+
as_index: bool = True,
1629+
sort: bool = True,
1630+
group_keys: bool = True,
1631+
squeeze: bool = False,
1632+
observed: bool = False,
1633+
) -> "groupby.SeriesGroupBy":
1634+
1635+
if level is None and by is None:
1636+
raise TypeError("You have to supply one of 'by' and 'level'")
1637+
axis = self._get_axis_number(axis)
1638+
1639+
return groupby.SeriesGroupBy(
1640+
obj=self,
1641+
keys=by,
1642+
axis=axis,
1643+
level=level,
1644+
as_index=as_index,
1645+
sort=sort,
1646+
group_keys=group_keys,
1647+
squeeze=squeeze,
1648+
observed=observed,
1649+
)
1650+
15681651
# ----------------------------------------------------------------------
15691652
# Statistics, overridden ndarray methods
15701653

0 commit comments

Comments
 (0)