Skip to content

Commit d02cd14

Browse files
🤖 Format .jl files (#113)
Co-authored-by: tmigot <[email protected]>
1 parent eb9b89e commit d02cd14

File tree

4 files changed

+20
-10
lines changed

4 files changed

+20
-10
lines changed

src/JSOSuite.jl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,6 @@ include("solve.jl")
424424
function minimize(::Val{:CaNNOLeS}, nlp; kwargs...)
425425
return CaNNOLeS.cannoles(nlp; linsolve = :ldlfactorizations, kwargs...)
426426
end
427-
428427
end
429428
end
430429

@@ -457,7 +456,8 @@ end
457456
@require NLPModelsKnitro = "bec4dd0d-7755-52d5-9a02-22f0ffc7efcb" begin
458457
@init begin
459458
@require NLPModelsKnitro = "bec4dd0d-7755-52d5-9a02-22f0ffc7efcb" begin
460-
JSOSuite.optimizers[JSOSuite.optimizers.name .== "KNITRO", :is_available] .= KNITRO.has_knitro()
459+
JSOSuite.optimizers[JSOSuite.optimizers.name .== "KNITRO", :is_available] .=
460+
KNITRO.has_knitro()
461461
end
462462
end
463463
include("solvers/knitro_solve.jl")
@@ -561,7 +561,6 @@ function bmark_solvers end
561561

562562
@init begin
563563
@require SolverBenchmark = "581a75fa-a23a-52d0-a590-d6201de2218a" begin
564-
565564
function SolverBenchmark.bmark_solvers(
566565
problems,
567566
solver_names::Vector{String},
@@ -588,7 +587,6 @@ function bmark_solvers end
588587
end
589588
return SolverBenchmark.bmark_solvers(solvers, problems; kwargs...)
590589
end
591-
592590
end
593591
end
594592

src/selection.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,6 @@ end
160160
function generic end
161161

162162
generic(::AbstractNLSModel, optimizers::DataFrame) = optimizers
163-
generic(::Union{QuadraticModel, LLSModel}, optimizers::DataFrame) = optimizers[optimizers.can_solve_nlp, :]
163+
generic(::Union{QuadraticModel, LLSModel}, optimizers::DataFrame) =
164+
optimizers[optimizers.can_solve_nlp, :]
164165
generic(::AbstractNLPModel, optimizers::DataFrame) = optimizers[optimizers.can_solve_nlp, :]

src/solve_model.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ function minimize(solver_name::String, model::JuMP.Model, args...; kwargs...)
3535
return minimize(solver_name, nlp, args...; kwargs...)
3636
end
3737

38-
function minimize(solver::Val{solver_name}, model::JuMP.Model, args...; kwargs...) where {solver_name}
38+
function minimize(
39+
solver::Val{solver_name},
40+
model::JuMP.Model,
41+
args...;
42+
kwargs...,
43+
) where {solver_name}
3944
nlp = MathOptNLPModel(model)
4045
return minimize(solver, nlp, args...; kwargs...)
4146
end

test/runtests.jl

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,12 @@ end
6363
@testset "Test $solver_name" for solver_name in JSOSuite.optimizers[!, :name_solver]
6464
solver_name == :DCIWorkspace && continue
6565
solver_name == :RipQPSolver && continue
66-
is_available = JSOSuite.optimizers[JSOSuite.optimizers.name_solver .== solver_name, :is_available]
67-
can_solve_nlp = JSOSuite.optimizers[JSOSuite.optimizers.name_solver .== solver_name, :can_solve_nlp]
68-
spec_nls = JSOSuite.optimizers[JSOSuite.optimizers.name_solver .== solver_name, :specialized_nls]
66+
is_available =
67+
JSOSuite.optimizers[JSOSuite.optimizers.name_solver .== solver_name, :is_available]
68+
can_solve_nlp =
69+
JSOSuite.optimizers[JSOSuite.optimizers.name_solver .== solver_name, :can_solve_nlp]
70+
spec_nls =
71+
JSOSuite.optimizers[JSOSuite.optimizers.name_solver .== solver_name, :specialized_nls]
6972
if is_available[1] && can_solve_nlp[1]
7073
test_in_place_solve(nlp, solver_name)
7174
test_in_place_solve(model, solver_name)
@@ -111,7 +114,10 @@ end
111114
OptimizationProblems.ADNLPProblems.eval(Meta.parse(problem))() for
112115
problem meta[(5 .<= meta.nvar .<= 10) .& (meta.ncon .== 0) .& (.!meta.has_bounds), :name]
113116
]
114-
select = JSOSuite.optimizers[JSOSuite.optimizers.can_solve_nlp .& JSOSuite.optimizers.is_available, :name]
117+
select = JSOSuite.optimizers[
118+
JSOSuite.optimizers.can_solve_nlp .& JSOSuite.optimizers.is_available,
119+
:name,
120+
]
115121
stats = bmark_solvers(ad_problems, select, atol = 1e-3, max_time = 10.0, verbose = 0)
116122
@test true # just test that it runs
117123
end

0 commit comments

Comments
 (0)