Skip to content

Fix incorrect stride calculations in LogLocator.tick_values() #25405

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
jklymak merged 7 commits into from
Mar 28, 2023
Merged

Fix incorrect stride calculations in LogLocator.tick_values() #25405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da5796c
feat: add 2 tests based on good/bad plot from upstream issue
haval0 Mar 1, 2023
1fc5591
fix: make "bad plot" test fail because fix isn't implemented yet
haval0 Mar 1, 2023
01eff90
Merge pull request #2 from haval0/test-good-bad-plot
haval0 Mar 7, 2023
6d03ed8
fix: revert simplification of stride calculation in LogLocator (#3)
II-Day-II Mar 7, 2023
503356e
fix: make tests slightly error tolerant (#4)
haval0 Mar 7, 2023
874e6ea
mnt: simplify stride calculation in LogLocator.tick_values
II-Day-II Mar 8, 2023
e1813b5
Merge pull request #5 from haval0/do-it-with-algebra
haval0 Mar 8, 2023
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
20 changes: 20 additions & 0 deletions lib/matplotlib/tests/test_ticker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,26 @@ def test_set_params(self):
assert loc._base == 4
assert list(loc._subs) == [2.0]

def test_tick_values_correct(self):
ll = mticker.LogLocator(subs=(1, 2, 5))
test_value = np.array([1.e-01, 2.e-01, 5.e-01, 1.e+00, 2.e+00, 5.e+00,
1.e+01, 2.e+01, 5.e+01, 1.e+02, 2.e+02, 5.e+02,
1.e+03, 2.e+03, 5.e+03, 1.e+04, 2.e+04, 5.e+04,
1.e+05, 2.e+05, 5.e+05, 1.e+06, 2.e+06, 5.e+06,
1.e+07, 2.e+07, 5.e+07, 1.e+08, 2.e+08, 5.e+08])
assert_almost_equal(ll.tick_values(1, 1e7), test_value)

def test_tick_values_not_empty(self):
mpl.rcParams['_internal.classic_mode'] = False
ll = mticker.LogLocator(subs=(1, 2, 5))
test_value = np.array([1.e-01, 2.e-01, 5.e-01, 1.e+00, 2.e+00, 5.e+00,
1.e+01, 2.e+01, 5.e+01, 1.e+02, 2.e+02, 5.e+02,
1.e+03, 2.e+03, 5.e+03, 1.e+04, 2.e+04, 5.e+04,
1.e+05, 2.e+05, 5.e+05, 1.e+06, 2.e+06, 5.e+06,
1.e+07, 2.e+07, 5.e+07, 1.e+08, 2.e+08, 5.e+08,
1.e+09, 2.e+09, 5.e+09])
assert_almost_equal(ll.tick_values(1, 1e8), test_value)


class TestNullLocator:
def test_set_params(self):
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/ticker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2386,7 +2386,7 @@ def tick_values(self, vmin, vmax):
# Get decades between major ticks.
stride = (max(math.ceil(numdec / (numticks - 1)), 1)
if mpl.rcParams['_internal.classic_mode'] else
(numdec + 1) // numticks + 1)
numdec // numticks + 1)

# if we have decided that the stride is as big or bigger than
# the range, clip the stride back to the available range - 1
Expand Down