-
Notifications
You must be signed in to change notification settings - Fork 10
fix computation of ν in TRDH and LMTR #295
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.
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
base: master
Are you sure you want to change the base?
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change | ||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -25,6 +25,7 @@ end | |||||||||||||||
| for (mod, mod_name) ∈ ((SpectralGradientModel, "spg"),) | ||||||||||||||||
| # ((DiagonalPSBModel, "psb"),(DiagonalAndreiModel, "andrei")) work but do not always terminate | ||||||||||||||||
| for (h, h_name) ∈ ((NormL0(λ), "l0"), (NormL1(λ), "l1")) | ||||||||||||||||
| continue # FIXME | ||||||||||||||||
|
||||||||||||||||
| Alternatively, if `reduce_TR = true`, then ξₖ₁ := f(xₖ) + h(xₖ) - φ(sₖ₁; xₖ) - ψ(sₖ₁; xₖ) is used instead of ξₖ, where sₖ₁ is the Cauchy point. |
where the phi is defined as
RegularizedOptimization.jl/src/TRDH_alg.jl
Line 115 in 8b7a6b7
| where φ(s ; xₖ) = f(xₖ) + ∇f(xₖ)ᵀs + ½ sᵀ Dₖ s is a quadratic approximation of f about xₖ, |
but then we compute xi as
RegularizedOptimization.jl/src/TRDH_alg.jl
Lines 369 to 373 in 8b7a6b7
| if reduce_TR | |
| prox!(s, ψ, mν∇fk, ν) | |
| mks = mk1(s) | |
| ξ1 = hk - mks + max(1, abs(hk)) * 10 * eps() |
i.e with a first order model and not the quadratic model.
I am confused. This whole reduce_TR thing is a bit odd in my opinion too, shouldn't we decide which is best and just keep one like in R2DH ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree, thank you. In addition,
DNormcan be computed asnorm(max.(D.d, 0), Inf)(although that allocates). That was a late update to the convergence theory; it looks like it didn't make it into the paper.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can be or should be ?