Skip to content

[AUTO] JuliaFormatter.jl run #123

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

Closed
wants to merge 1 commit into from
Closed

[AUTO] JuliaFormatter.jl run #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 1 deletion src/TRDH_alg.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,9 @@ function TRDH(
#! format: on
@info "TRDH: terminating with √(ξ1/ν) = $(sqrt_ξ_νInv)"
else
@info @sprintf "%6d %8.1e %8.1e %7.1e %8s %7.1e %7.1e %7.1e %7.1e" k fk hk sqrt_ξ_νInv "" Δk χ(xk) χ(s) norm(Dk.d)
@info @sprintf "%6d %8.1e %8.1e %7.1e %8s %7.1e %7.1e %7.1e %7.1e" k fk hk sqrt_ξ_νInv "" Δk χ(
xk,
) χ(s) norm(Dk.d)
Copy link
Member

@dpo dpo Oct 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Preventing this in #125.

@info "TRDH: terminating with √(ξ/ν) = $(sqrt_ξ_νInv)"
end
end
Expand Down
6 changes: 4 additions & 2 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ for (h, h_name) ∈ ((NormL0(λ), "l0"), (NormL1(λ), "l1"), (IndBallL0(10 * com
@test length(out.solver_specific[:Fhist]) == length(out.solver_specific[:Hhist])
@test length(out.solver_specific[:Fhist]) == length(out.solver_specific[:SubsolverCounter])
@test length(out.solver_specific[:Fhist]) == length(out.solver_specific[:NLSGradHist])
@test out.solver_specific[:NLSGradHist][end] == bpdn_nls.counters.neval_jprod_residual + bpdn_nls.counters.neval_jtprod_residual - 1
@test out.solver_specific[:NLSGradHist][end] ==
bpdn_nls.counters.neval_jprod_residual + bpdn_nls.counters.neval_jtprod_residual - 1
@test obj(bpdn_nls, out.solution) == out.solver_specific[:Fhist][end]
@test h(out.solution) == out.solver_specific[:Hhist][end]
@test out.status == :first_order
Expand All @@ -109,7 +110,8 @@ for (h, h_name) ∈ ((NormL1(λ), "l1"),)
@test length(LMTR_out.solver_specific[:Fhist]) ==
length(LMTR_out.solver_specific[:SubsolverCounter])
@test length(LMTR_out.solver_specific[:Fhist]) == length(LMTR_out.solver_specific[:NLSGradHist])
@test LMTR_out.solver_specific[:NLSGradHist][end] == bpdn_nls.counters.neval_jprod_residual + bpdn_nls.counters.neval_jtprod_residual - 1
@test LMTR_out.solver_specific[:NLSGradHist][end] ==
bpdn_nls.counters.neval_jprod_residual + bpdn_nls.counters.neval_jtprod_residual - 1
@test obj(bpdn_nls, LMTR_out.solution) == LMTR_out.solver_specific[:Fhist][end]
@test h(LMTR_out.solution) == LMTR_out.solver_specific[:Hhist][end]
@test LMTR_out.status == :first_order
Expand Down