8000 BUG: pivot_table not returning correct type when margin=True and aggfunc='mean' by mabelvj · Pull Request #28248 · pandas-dev/pandas · GitHub
[go: up one dir, main page]
Skip to content

BUG: pivot_table not returning correct type when margin=True and aggfunc='mean' #28248

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.

Sign up for GitHub

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

Merged
merged 15 commits into from
Nov 23, 2019
Merged

BUG: pivot_table not returning correct type when margin=True and aggfunc='mean' #28248

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f9bb63b
Fixes #24893: use maybe_downcast_to_dtype in margins
mabelvj Sep 1, 2019
7f2c8df
Fixes #24893: use .apply for maybe_downcast_to_dtype in margins
mabelvj Sep 1, 2019
b81149b
Fixes #24893: flake8
mabelvj Sep 1, 2019
2d39e86
Fixes #24893: added test and run black
mabelvj Sep 3, 2019
537354c
Fixes #24893: re-added line
mabelvj Sep 3, 2019
578c5e0
Fixes #24893: updated tests
mabelvj Sep 4, 2019
0352930
Fixes #24893: added comment in pivot
mabelvj Sep 5, 2019
8460d14
Fixes #24893: updated issue notice
mabelvj Sep 5, 2019
d0a04f8
Fixes #24893: re-added lines
mabelvj Sep 5, 2019
45ffc77
Fixes #24893: re-added test
mabelvj Sep 5, 2019
b4d00f7
Merge remote-tracking branch 'upstream/master' into 24893-pivot_table
TomAugspurger Sep 11, 2019
414fb3a
fixup
TomAugspurger Sep 11, 2019
8003d10
Merge branch 'master' into 24893-pivot_table
mabelvj Nov 9, 2019
456efd2
Merge branch '24893-pivot_table' of github.com:mabelvj/pandas into 24…
mabelvj Nov 9, 2019
c957d01
Merge branch 'master' into 24893-pivot_table
mabelvj Nov 23, 2019
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
Prev Previous commit
Next Next commit
Fixes #24893: re-added lines
  • Loading branch information
@mabelvj
mabelvj committed Sep 5, 2019
commit d0a04f88864dda1a90ec97c26124e01d75baa240
30 changes: 5 additions & 25 deletions pandas/tests/reshape/test_pivot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1601,53 +1601,33 @@ def test_pivot_table_margins_name_with_aggfunc_list(self):
expected = pd.DataFrame(table.values, index=ix, columns=cols)
tm.assert_frame_equal(table, expected)


@pytest.mark.xfail(reason="GH#17035 (np.mean of ints is casted back to ints)")
def test_categorical_margins(self, observed):
# GH 10989
df = pd.DataFrame(
{"x": np.arange(8), "y": np.arange(8) // 4, "z": np.arange(8) % 2}
)

expected = pd.DataFrame([[1, 2, 1.5], [5, 6, 5.5], [3, 4, 3.5]])
expected = pd.DataFrame([[1.0, 2.0, 1.5], [5, 6, 5.5], [3, 4, 3.5]])
expected.index = Index([0, 1, "All"], name="y")
expected.columns = Index([0, 1, "All"], name="z")

table = df.pivot_table("x", "y", "z", dropna=observed, margins=True)
tm.assert_frame_equal(table, expected)


def test_margins_casted_to_float(self, observed):
# GH #24893
df = pd.DataFrame(
{
"A": [2, 4, 6, 8],
"B": [1, 4, 5, 8],
"C": [1, 3, 4, 6],
"D": ["X", "X", "Y", "Y"],
}
)

result = pd.pivot_table(df, index="D", margins=True)
expected = pd.DataFrame(
{"A": [3, 7, 5], "B": [2.5, 6.5, 4.5], "C": [2, 5, 3.5]},
index=pd.Index(["X", "Y", "All"], name="D"),
)
table = result
tm.assert_frame_equal(result, expected)

@pytest.mark.xfail(reason="GH#17035 (np.mean of ints is casted back to ints)")
def test_categorical_margins_category(self, observed):
df = pd.DataFrame(
{"x": np.arange(8), "y": np.arange(8) // 4, "z": np.arange(8) % 2}
)

expected = pd.DataFrame([[1, 2, 1.5], [5, 6, 5.5], [3, 4, 3.5]])
expected = pd.DataFrame([[1.0, 2.0, 1.5], [5, 6, 5.5], [3, 4, 3.5]])
expected.index = Index([0, 1, "All"], name="y")
expected.columns = Index([0, 1, "All"], name="z")

df.y = df.y.astype("category")
df.z = df.z.astype("category")
table = df.pivot_table("x", "y", "z", dropna=observed, margins=True)

tm.assert_frame_equal(table, expected)

def test_categorical_aggfunc(self, observed):
Expand Down Expand Up @@ -2547,4 +2527,4 @@ def test_margin_normalize(self):
codes=[[1, 1, 2, 2, 0], [1, 2, 1, 2, 0]],
names=["A", "B"],
)
tm.assert_frame_equal(result, expected)
tm.assert_frame_equal(result, expected)
0