Skip to content

Commit 0feb810

Browse files
committed
🤖 Format .jl files
1 parent b7646ce commit 0feb810

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
lines changed

src/RegularizedOptimization.jl

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ using Arpack, ProximalOperators
88

99
# dependencies from us
1010
using LinearOperators,
11-
ManualNLPModels, NLPModels, NLPModelsModifiers, RegularizedProblems, ShiftedProximalOperators, SolverCore
11+
ManualNLPModels,
12+
NLPModels,
13+
NLPModelsModifiers,
14+
RegularizedProblems,
15+
ShiftedProximalOperators,
16+
SolverCore
1217
using Percival: AugLagModel, update_y!, update_μ!
1318

1419
const callback_docstring = "

src/TRDH_alg.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ function TRDH(
190190
selected::AbstractVector{<:Integer} = 1:length(x0),
191191
kwargs...,
192192
) where {R <: Real, F, G, H, DQN <: AbstractDiagonalQuasiNewtonOperator, X}
193-
nlp = NLPModel(x0, f, grad=∇f!)
193+
nlp = NLPModel(x0, f, grad = ∇f!)
194194
reg_nlp = RegularizedNLPModel(nlp, h, selected)
195195
stats = TRDH(
196196
reg_nlp;

src/TR_alg.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ function TRSolver(
5959
shifted(reg_nlp.h, xk, l_bound_m_x, u_bound_m_x, reg_nlp.selected) :
6060
shifted(reg_nlp.h, xk, T(1), χ)
6161

62-
Bk = isa(reg_nlp.model, QuasiNewtonModel) ? hess_op(reg_nlp.model, xk) : hess_op!(reg_nlp.model, xk, similar(xk))
62+
Bk =
63+
isa(reg_nlp.model, QuasiNewtonModel) ? hess_op(reg_nlp.model, xk) :
64+
hess_op!(reg_nlp.model, xk, similar(xk))
6365
sub_nlp = R2NModel(Bk, ∇fk, zero(T), x0) #FIXME
6466
subpb = RegularizedNLPModel(sub_nlp, ψ)
6567
substats = RegularizedExecutionStats(subpb)
@@ -341,7 +343,7 @@ function SolverCore.solve!(
341343
set_radius!(solver.subsolver.ψ, ∆_effective)
342344
set_radius!(ψ, ∆_effective)
343345
end
344-
with_logger(subsolver_logger) do
346+
with_logger(subsolver_logger) do
345347
if isa(solver.subsolver, TRDHSolver) #FIXME
346348
solver.subsolver.D.d[1] = 1/ν₁
347349
solve!(

test/test_allocs.jl

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,26 @@ end
4242
# Test non allocating solve!
4343
@testset "allocs" begin
4444
for (h, h_name) ((NormL0(λ), "l0"),)
45-
for (solver, solver_name) ((:R2Solver, "R2"), (:R2DHSolver, "R2DH"), (:R2NSolver, "R2N"), (:TRDHSolver, "TRDH"), (:TRSolver, "TR"))
45+
for (solver, solver_name) (
46+
(:R2Solver, "R2"),
47+
(:R2DHSolver, "R2DH"),
48+
(:R2NSolver, "R2N"),
49+
(:TRDHSolver, "TRDH"),
50+
(:TRSolver, "TR"),
51+
)
4652
@testset "$(solver_name)" begin
4753
(solver_name == "R2N" || solver_name == "TR") && continue #FIXME
4854
reg_nlp = RegularizedNLPModel(LBFGSModel(bpdn), h)
4955
solver = eval(solver)(reg_nlp)
5056
stats = RegularizedExecutionStats(reg_nlp)
51-
solver_name == "R2" && @test @wrappedallocs(
52-
solve!(solver, reg_nlp, stats, ν = 1.0, atol = 1e-6, rtol = 1e-6)
53-
) == 0
57+
solver_name == "R2" &&
58+
@test @wrappedallocs(solve!(solver, reg_nlp, stats, ν = 1.0, atol = 1e-6, rtol = 1e-6)) ==
59+
0
5460
solver_name == "R2DH" && @test @wrappedallocs(
5561
solve!(solver, reg_nlp, stats, σk = 1.0, atol = 1e-6, rtol = 1e-6)
5662
) == 0
57-
solver_name == "TRDH" && @test @wrappedallocs(
58-
solve!(solver, reg_nlp, stats, atol = 1e-6, rtol = 1e-6)
59-
) == 0
63+
solver_name == "TRDH" &&
64+
@test @wrappedallocs(solve!(solver, reg_nlp, stats, atol = 1e-6, rtol = 1e-6)) == 0
6065
@test stats.status == :first_order
6166
end
6267
end

0 commit comments

Comments
 (0)