Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
39 changes: 22 additions & 17 deletions docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
using TunerTestSolver
using Documenter

DocMeta.setdocmeta!(TunerTestSolver, :DocTestSetup, :(using TunerTestSolver); recursive = true)
DocMeta.setdocmeta!(
TunerTestSolver,
:DocTestSetup,
:(using TunerTestSolver);
recursive = true,
)

makedocs(;
modules = [TunerTestSolver],
doctest = true,
linkcheck = false,
strict = false,
authors = "Tangi Migot and Monssaf Toukal",
repo = "https://github.com/ProofOfConceptForJuliSmoothOptimizers/TunerTestSolver.jl/blob/{commit}{path}#{line}",
sitename = "TunerTestSolver.jl",
format = Documenter.HTML(;
prettyurls = get(ENV, "CI", "false") == "true",
canonical = "https://ProofOfConceptForJuliSmoothOptimizers.github.io/TunerTestSolver.jl",
assets = ["assets/style.css"],
),
pages = ["Home" => "index.md", "Reference" => "reference.md"],
modules = [TunerTestSolver],
doctest = true,
linkcheck = false,
strict = false,
authors = "Tangi Migot and Monssaf Toukal",
repo = "https://github.com/ProofOfConceptForJuliSmoothOptimizers/TunerTestSolver.jl/blob/{commit}{path}#{line}",
sitename = "TunerTestSolver.jl",
format = Documenter.HTML(;
prettyurls = get(ENV, "CI", "false") == "true",
canonical = "https://ProofOfConceptForJuliSmoothOptimizers.github.io/TunerTestSolver.jl",
assets = ["assets/style.css"],
),
pages = ["Home" => "index.md", "Reference" => "reference.md"],
)

deploydocs(;
repo = "github.com/ProofOfConceptForJuliSmoothOptimizers/TunerTestSolver.jl",
push_preview = true,
devbranch = "main",
repo = "github.com/ProofOfConceptForJuliSmoothOptimizers/TunerTestSolver.jl",
push_preview = true,
devbranch = "main",
)
38 changes: 21 additions & 17 deletions src/TunerTestSolver.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,28 @@ using SolverParameters

include("parameters.jl")

struct LBFGSParameterSet{T <: Real} <: AbstractParameterSet
mem::Parameter{Int, IntegerRange{Int}}
τ₁::Parameter{T, RealInterval{T}}
bk_max::Parameter{Int, IntegerRange{Int}}
# add scaling

function LBFGSParameterSet{T}(;mem::Int = mem, τ₁::T = T(τ₁), bk_max::Int = bk_max) where {T}
p_set = new(
Parameter(mem, IntegerRange(Int(1), Int(20)), "mem"),
Parameter(τ₁, RealInterval(T(0), T(1)), "τ₁"),
Parameter(bk_max, IntegerRange(Int(10), Int(50)), "bk_max"),
)
return p_set
end
struct LBFGSParameterSet{T<:Real} <: AbstractParameterSet
mem::Parameter{Int,IntegerRange{Int}}
τ₁::Parameter{T,RealInterval{T}}
bk_max::Parameter{Int,IntegerRange{Int}}
# add scaling

function LBFGSParameterSet(;kwargs...)
return LBFGSParameterSet{Float64}(; kwargs...)
end
function LBFGSParameterSet{T}(;
mem::Int = mem,
τ₁::T = T(τ₁),
bk_max::Int = bk_max,
) where {T}
p_set = new(
Parameter(mem, IntegerRange(Int(1), Int(20)), "mem"),
Parameter(τ₁, RealInterval(T(0), T(1)), "τ₁"),
Parameter(bk_max, IntegerRange(Int(10), Int(50)), "bk_max"),
)
return p_set
end

function LBFGSParameterSet(; kwargs...)
return LBFGSParameterSet{Float64}(; kwargs...)
end
end

include("lbfgs.jl")
Expand Down
Loading