ENH #15972 added margins_name parameter for crosstab #16489
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jreback
approved these changes
May 24, 2017
pandas/core/reshape/pivot.py
Outdated
| Name of the row / column that will contain the totals | ||
| when margins is True. | ||
|
|
||
| .. versionadded:: 0.20.0 |
pandas/tests/reshape/test_pivot.py
Outdated
| @@ -1071,6 +1071,42 @@ def test_crosstab_margins(self): | |||
| exp_rows = exp_rows.fillna(0).astype(np.int64) | |||
| tm.assert_series_equal(all_rows, exp_rows) | |||
|
|
|||
| def test_crosstab_margins_set_margin_name(self): | |||
| a = np.random.randint(0, 7, size=100) | |||
There was a problem hiding this comment.
add the issue number as a comment
|
|
||
| all_cols = result['TOTAL', ''] | ||
| exp_cols = df.groupby(['a']).size().astype('i8') | ||
| # to keep index.name |
jreback
reviewed
May 24, 2017
pandas/core/reshape/pivot.py
Outdated
| table = concat([table, column_margin], axis=1) | ||
| print('index margin') |
jreback
reviewed
May 24, 2017
doc/source/whatsnew/v0.20.0.txt
Outdated
| @@ -514,7 +514,7 @@ Other Enhancements | |||
| - ``parallel_coordinates()`` has gained a ``sort_labels`` keyword argument that sorts class labels and the colors assigned to them (:issue:`15908`) | |||
| - Options added to allow one to turn on/off using ``bottleneck`` and ``numexpr``, see :ref:`here <basics.accelerate>` (:issue:`16157`) | |||
| - ``DataFrame.style.bar()`` now accepts two more options to further customize the bar chart. Bar alignment is set with ``align='left'|'mid'|'zero'``, the default is "left", which is backward compatible; You can now pass a list of ``color=[color_negative, color_positive]``. (:issue:`14757`) | |||
|
|
|||
| - ``Crosstab`` has gained a ``margins_name`` parameter to define the name of the row / column that will contain the totals when margins is True(:issue:`15972`) | |||
|
ok |
|
I think you have a conflict on 0.21.0.txt (pls rebase again). |
doc/source/whatsnew/v0.21.0.txt
Outdated
| @@ -35,6 +35,7 @@ Other Enhancements | |||
| - ``RangeIndex.append`` now returns a ``RangeIndex`` object when possible (:issue:`16212`) | |||
| - :func:`to_pickle` has gained a protocol parameter (:issue:`16252`). By default, this parameter is set to `HIGHEST_PROTOCOL <https://docs.python.org/3/library/pickle.html#data-stream-format>`__ | |||
| - :func:`api.types.infer_dtype` now infers decimals. (:issue: `15690`) | |||
| - ``Crosstab`` has gained a ``margins_name`` parameter to define the name of the row / column that will contain the totals when margins is True(:issue:`15972`) | |||
There was a problem hiding this comment.
Could you add a space before the ( when you rebase.
TomAugspurger
approved these changes
May 25, 2017
cmohl2013
force-pushed
the
crosstable_margins_name
branch
from
30edb7f to
abe70e6
Compare
Codecov Report
@@ Coverage Diff @@
## master #16489 +/- ##
=======================================
Coverage 90.43% 90.43%
=======================================
Files 161 161
Lines 51045 51045
=======================================
Hits 46161 46161
Misses 4884 4884
Continue to review full report at Codecov.
|
jreback
approved these changes
May 25, 2017
doc/source/whatsnew/v0.21.0.txt
Outdated
| @@ -35,6 +35,7 @@ Other Enhancements | |||
| - ``RangeIndex.append`` now returns a ``RangeIndex`` object when possible (:issue:`16212`) | |||
| - :func:`to_pickle` has gained a protocol parameter (:issue:`16252`). By default, this parameter is set to `HIGHEST_PROTOCOL <https://docs.python.org/3/library/pickle.html#data-stream-format>`__ | |||
| - :func:`api.types.infer_dtype` now infers decimals. (:issue: `15690`) | |||
| - ``Crosstab`` has gained a ``margins_name`` parameter to define the name of the row / column that will contain the totals when margins is True. (:issue:`15972`) | |||
There was a problem hiding this comment.
:func:crosstab
when margins=True
cmohl2013
force-pushed
the
crosstable_margins_name
branch
from
42a089e to
d226549
Compare
|
Thank you for your checking and helpful comments. |
|
Thanks @cmohl2013 ! |
Kiv
pushed a commit
to Kiv/pandas
that referenced
this pull request
Jun 11, 2017
* ENH pandas-dev#15972 added margins_name parameter for crosstab * ENH 15972 minor changes as suggested by reviewers * ENH 15972 correction in whatsnew * ENH 15972 style changes in whatsnew
stangirala
pushed a commit
to stangirala/pandas
that referenced
this pull request
Jun 11, 2017
* ENH pandas-dev#15972 added margins_name parameter for crosstab * ENH 15972 minor changes as suggested by reviewers * ENH 15972 correction in whatsnew * ENH 15972 style changes in whatsnew
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
git diff upstream/master --name-only -- '*.py' | flake8 --diff