Skip to content
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

Jump to bottom

Let some kwargs vary with k_ideal in WilkinsonTicks #2892

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Let some kwargs vary with k_ideal in WilkinsonTicks #2892

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a76cc58
Let some kwargs vary with k_ideal in WilkinsonTicks
asinghvi17 Apr 23, 2023
d99896a
Apply suggestion from review
asinghvi17 Apr 23, 2023
6920acf
Merge branch 'master' into as/wilkinson
SimonDanisch Jul 17, 2023
88d1417
Merge branch 'master' into as/wilkinson
SimonDanisch Jul 18, 2023
add58ec
Merge branch 'master' into as/wilkinson
asinghvi17 Feb 7, 2024
2b47065
Merge branch 'master' into as/wilkinson
asinghvi17 Feb 23, 2024
84ea8a6
Merge branch 'master' into as/wilkinson
asinghvi17 Mar 7, 2024
bc28b1d
Merge branch 'master' into as/wilkinson
asinghvi17 Mar 21, 2024
de74201
Merge branch 'master' into as/wilkinson
asinghvi17 Apr 16, 2024
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
4 changes: 2 additions & 2 deletions src/makielayout/ticklocators/wilkinson.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function WilkinsonTicks(k_ideal::Int; k_min = 2, k_max = 10,
function WilkinsonTicks(k_ideal::Int = 6; k_min::Int = max(2, round(Int, k_ideal * 0.7)), k_max::Int = max(2, round(Int, k_ideal * 1.3)),
Q = [(1.0,1.0), (5.0, 0.9), (2.0, 0.7), (2.5, 0.5), (3.0, 0.2)],
granularity_weight = 1/4,
simplicity_weight = 1/6,
Expand All @@ -7,7 +7,7 @@ function WilkinsonTicks(k_ideal::Int; k_min = 2, k_max = 10,
min_px_dist = 50.0)

if !(0 < k_min <= k_ideal <= k_max)
error("Invalid tick number specifications k_ideal $k_ideal, k_min $k_min, k_max $k_max")
error("Invalid tick number specifications `k_ideal` $k_ideal, `k_min` $k_min, `k_max` $k_max. `k_ideal` must be between `k_min` and `k_max`!")
end

WilkinsonTicks(k_ideal, k_min, k_max, Q, granularity_weight, simplicity_weight,
Expand Down
Loading