Skip to content

Log scale #97

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 2 commits into from
Nov 27, 2025
Merged

Log scale #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d035b68
log scale
ocots Nov 18, 2025
316ee6e
Merge branch 'main' into 96-dev-log-plots
ocots Nov 19, 2025
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
24 changes: 15 additions & 9 deletions docs/src/assets/toml/Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ version = "0.16.2"
deps = ["BenchmarkTools", "CTBase", "CUDA", "DataFrames", "Dates", "DocStringExtensions", "InteractiveUtils", "Ipopt", "JSON", "JuMP", "MadNLPGPU", "MadNLPMumps", "NLPModelsIpopt", "OptimalControl", "OptimalControlProblems", "Pkg", "Plots", "Printf", "Sockets", "Tables"]
path = "/Users/ocots/Research/logiciels/dev/control-toolbox/CTBenchmarks.jl"
uuid = "db1dffaa-5ed3-4583-9a66-b5881c82ef11"
version = "0.3.0"
version = "0.3.1"

[[deps.CTDirect]]
deps = ["CTBase", "CTModels", "DocStringExtensions", "HSL", "MKL", "NLPModels", "SolverCore", "SparseArrays"]
Expand Down Expand Up @@ -249,9 +249,9 @@ version = "0.19.2+0"

[[deps.CUDSS]]
deps = ["CEnum", "CUDA", "CUDSS_jll", "GPUToolbox", "LinearAlgebra", "SparseArrays"]
git-tree-sha1 = "6356218f3c9a7509d1d830b7ec14e870faf65020"
git-tree-sha1 = "bff863cd922a9fad87b1173962a0d42068d55afb"
uuid = "45b445bb-4962-46a0-9369-b4df9d0f772e"
version = "0.6.1"
version = "0.6.2"

[[deps.CUDSS_jll]]
deps = ["Artifacts", "CUDA_Runtime_jll", "CompilerSupportLibraries_jll", "JLLWrappers", "LazyArtifacts", "Libdl", "TOML"]
Expand Down Expand Up @@ -611,15 +611,21 @@ version = "1.0.0"

[[deps.GR]]
deps = ["Artifacts", "Base64", "DelimitedFiles", "Downloads", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Preferences", "Printf", "Qt6Wayland_jll", "Random", "Serialization", "Sockets", "TOML", "Tar", "Test", "p7zip_jll"]
git-tree-sha1 = "f52c27dd921390146624f3aab95f4e8614ad6531"
git-tree-sha1 = "f305bdb91e1f3fcc687944c97f2ede40585b1bd5"
uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
version = "0.73.18"
version = "0.73.19"

[deps.GR.extensions]
GRIJuliaExt = "IJulia"

[deps.GR.weakdeps]
IJulia = "7073ff75-c697-5162-941a-fcdaad2a7d2a"

[[deps.GR_jll]]
deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "FreeType2_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Qt6Base_jll", "Zlib_jll", "libpng_jll"]
git-tree-sha1 = "4b0406b866ea9fdbaf1148bc9c0b887e59f9af68"
git-tree-sha1 = "a22d675409308f1bb4f3fb583599fcd28a0a7e4f"
uuid = "d2c73de3-f751-5644-a686-071e5b155ba9"
version = "0.73.18+0"
version = "0.73.19+0"

[[deps.GettextRuntime_jll]]
deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll"]
Expand Down Expand Up @@ -1411,9 +1417,9 @@ version = "1.5.0"

[[deps.PrettyTables]]
deps = ["Crayons", "LaTeXStrings", "Markdown", "PrecompileTools", "Printf", "REPL", "Reexport", "StringManipulation", "Tables"]
git-tree-sha1 = "6b8e2f0bae3f678811678065c09571c1619da219"
git-tree-sha1 = "2542fd0b9476562d80b65d00968c9c5286d5917b"
uuid = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
version = "3.1.0"
version = "3.1.1"

[[deps.Printf]]
deps = ["Unicode"]
Expand Down
27 changes: 14 additions & 13 deletions docs/src/docutils/modules/PlotIterationsVsCpuTime.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,20 @@ function _plot_iterations_vs_cpu_time(

title_font, label_font = _plot_font_settings()

plt = plot(;
xlabel="Iterations",
ylabel="CPU time (s)",
title="\nIterations vs CPU time — $problem",
legend=:topleft,
grid=true,
size=(900, 600),
left_margin=5mm,
bottom_margin=5mm,
top_margin=5mm,
titlefont=title_font,
xguidefont=label_font,
yguidefont=label_font,
plt = plot(
xlabel = "Iterations",
ylabel = "CPU time (s)",
title = "\nIterations vs CPU time — $problem",
legend = :best,
grid = true,
size = (900, 600),
left_margin = 5mm,
bottom_margin = 5mm,
top_margin = 5mm,
titlefont = title_font,
xguidefont = label_font,
yguidefont = label_font,
yscale = :log10,
)

for (idx, c) in enumerate(combos)
Expand Down
50 changes: 31 additions & 19 deletions docs/src/docutils/modules/PlotTimeVsGridSize.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,38 @@ function _plot_time_vs_grid_size(

min_N = minimum(df_successful.grid_size)
max_N = maximum(df_successful.grid_size)
span_N = max_N - min_N
padding = span_N > 0 ? 0.05 * span_N : 1
x_min = max(0, min_N - padding)
x_max = max_N + padding
if min_N > 0 && max_N > min_N
log_min = log10(min_N)
log_max = log10(max_N)
span_log = log_max - log_min
padding_log = 0.05 * span_log
x_min = 10^(log_min - padding_log)
x_max = 10^(log_max + padding_log)
else
span_N = max_N - min_N
padding = span_N > 0 ? 0.05 * span_N : 1
x_min = max(0, min_N - padding)
x_max = max_N + padding
end
Ns = sort(unique(df_successful.grid_size))

plt = plot(;
xlabel="Grid size N",
ylabel="Solve time (s)",
title="\nSolve time vs grid size — $problem",
legend=:bottomright,
grid=true,
size=(900, 600),
xticks=sort(unique(df_successful.grid_size)),
xlims=(x_min, x_max),
left_margin=5mm,
bottom_margin=5mm,
top_margin=5mm,
titlefont=title_font,
xguidefont=label_font,
yguidefont=label_font,
plt = plot(
xlabel = "Grid size N",
ylabel = "Solve time (s)",
title = "\nSolve time vs grid size — $problem",
legend = :bottomright,
grid = true,
size = (900, 600),
xticks = (Ns, string.(Ns)),
xlims = (x_min, x_max),
left_margin = 5mm,
bottom_margin = 5mm,
top_margin = 5mm,
titlefont = title_font,
xguidefont = label_font,
yguidefont = label_font,
xscale = :log10,
yscale = :log10,
)

for (idx, c) in enumerate(combos)
Expand Down