Skip to content

CLN: timeseries in plotting clean up #28020

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 8 commits into from
Sep 11, 2019
Merged

CLN: timeseries in plotting clean up #28020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7e461a1
remove \n from docstring
charlesdong1991 Dec 3, 2018
1314059
fix conflicts
charlesdong1991 Jan 19, 2019
8bcb313
Merge remote-tracking branch 'upstream/master'
charlesdong1991 Jul 30, 2019
ed2d0a6
Clean timedelta format and add test
charlesdong1991 Aug 19, 2019
9d3f95a
Merge remote-tracking branch 'upstream/master' into cln_format_timede…
charlesdong1991 Aug 19, 2019
7ffd563
Rename function
charlesdong1991 Aug 19, 2019
f2026b4
fix test
charlesdong1991 Aug 20, 2019
9883f4f
Merge remote-tracking branch 'upstream/master' into cln_format_timede…
charlesdong1991 Sep 9, 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
17 changes: 0 additions & 17 deletions pandas/plotting/_matplotlib/timeseries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,23 +304,6 @@ def _maybe_convert_index(ax, data):
# Do we need the rest for convenience?


def format_timedelta_ticks(x, pos, n_decimals):
"""
Convert seconds to 'D days HH:MM:SS.F'
"""
s, ns = divmod(x, 1e9)
m, s = divmod(s, 60)
h, m = divmod(m, 60)
d, h = divmod(h, 24)
decimals = int(ns * 10 ** (n_decimals - 9))
s = r"{:02d}:{:02d}:{:02d}".format(int(h), int(m), int(s))
if n_decimals > 0:
s += ".{{:0{:0d}d}}".format(n_decimals).format(decimals)
if d != 0:
s = "{:d} days ".format(int(d)) + s
return s


def _format_coord(freq, t, y):
return "t = {0} y = {1:8f}".format(Period(ordinal=int(t), freq=freq), y)

Expand Down
18 changes: 18 additions & 0 deletions pandas/tests/plotting/test_converter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,3 +388,21 @@ def test_convert_nested(self):
r1 = self.pc.convert([data, data], None, self.axis)
r2 = [self.pc.convert(data, None, self.axis) for _ in range(2)]
assert r1 == r2


class TestTimeDeltaConverter:
"""Test timedelta converter"""

@pytest.mark.parametrize(
"x, decimal, format_expected",
[
(0.0, 0, "00:00:00"),
(3972320000000, 1, "01:06:12.3"),
(713233432000000, 2, "8 days 06:07:13.43"),
(32423432000000, 4, "09:00:23.4320"),
],
)
def test_format_timedelta_ticks(self, x, decimal, format_expected):
tdc = converter.TimeSeries_TimedeltaFormatter
result = tdc.format_timedelta_ticks(x, pos=None, n_decimals=decimal)
Copy link
Member

Choose a reason for hiding this comment

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

would it be worthwhile to parametrize over pos values here? or would that obscure the logic we actually care about testing?

Copy link
Member Author

@charlesdong1991 charlesdong1991 Aug 20, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

pos is not being used in format_timdelta_ticks function, honestly i am not sure why/how this is used. So i just keep as is for now. @jbrockmendel

Copy link
Member

Choose a reason for hiding this comment

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

Leaving it as is sounds fine, thanks for looking into it.

assert result == format_expected