Skip to content

Commit 37d9bac

Browse files
remove alpha and beta params from keyword arguments
1 parent c4f9b68 commit 37d9bac

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

src/TRDH_alg.jl

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,6 @@ For advanced usage, first define a solver "TRDHSolver" to preallocate the memory
134134
- `η1::T = √√eps(T)`: successful iteration threshold;
135135
- `η2::T = T(0.9)`: very successful iteration threshold;
136136
- `γ::T = T(3)`: trust-region radius parameter multiplier. Must satisfy `γ > 1`. The trust-region radius is updated as Δ := Δ*γ when the iteration is very successful and Δ := Δ/γ when the iteration is unsuccessful;
137-
- `α::T = 1/eps(T)`: TODO
138-
- `β::T = 1/eps(T)`: TODO
139137
- `reduce_TR::Bool = True`: TODO
140138
- `χ::F = NormLinf(1)`: norm used to define the trust-region;`
141139
- `D::L = nothing`: diagonal quasi-Newton approximation used for the model φ. If nothing is provided and `reg_nlp.model` is not a diagonal quasi-Newton approximation, a spectral gradient approximation is used.`
@@ -175,8 +173,6 @@ function TRDH(
175173
η1 = options.η1,
176174
η2 = options.η2,
177175
γ = options.γ,
178-
α = options.α,
179-
β = options.β,
180176
kwargs_dict...,
181177
)
182178
return stats
@@ -211,8 +207,6 @@ function TRDH(
211207
η1 = options.η1,
212208
η2 = options.η2,
213209
γ = options.γ,
214-
α = options.α,
215-
β = options.β,
216210
kwargs...,
217211
)
218212
return stats.solution, stats.iter, stats
@@ -246,8 +240,6 @@ function SolverCore.solve!(
246240
η1::T = √√eps(T),
247241
η2::T = T(0.9),
248242
γ::T = T(3),
249-
α::T = 1 / eps(T),
250-
β::T = 1 / eps(T),
251243
) where {T, G, V}
252244
reset!(stats)
253245

@@ -320,6 +312,9 @@ function SolverCore.solve!(
320312
local ξ1::T
321313
local ρk::T = zero(T)
322314

315+
α = 1 / eps(T)
316+
β = 1 / eps(T)
317+
323318
fk = obj(nlp, xk)
324319
grad!(nlp, xk, ∇fk)
325320
∇fk⁻ .= ∇fk

src/TR_alg.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,6 @@ For advanced usage, first define a solver "TRSolver" to preallocate the memory u
127127
- `η1::T = √√eps(T)`: successful iteration threshold;
128128
- `η2::T = T(0.9)`: very successful iteration threshold;
129129
- `γ::T = T(3)`: trust-region radius parameter multiplier. Must satisfy `γ > 1`. The trust-region radius is updated as Δ := Δ*γ when the iteration is very successful and Δ := Δ/γ when the iteration is unsuccessful;
130-
- `α::T = 1/eps(T)`: TODO
131-
- `β::T = 1/eps(T)`: TODO
132130
- `χ::F = NormLinf(1)`: norm used to define the trust-region;`
133131
- `subsolver::S = R2Solver`: subsolver used to solve the subproblem that appears at each iteration.
134132
@@ -165,8 +163,6 @@ function TR(
165163
η1 = options.η1,
166164
η2 = options.η2,
167165
γ = options.γ,
168-
α = options.α,
169-
β = options.β,
170166
kwargs...,
171167
)
172168
return stats
@@ -201,8 +197,6 @@ function SolverCore.solve!(
201197
η1::T = √√eps(T),
202198
η2::T = T(0.9),
203199
γ::T = T(3),
204-
α::T = 1 / eps(T),
205-
β::T = 1 / eps(T),
206200
) where {T, G, V}
207201
reset!(stats)
208202

@@ -269,6 +263,9 @@ function SolverCore.solve!(
269263
local ξ1::T
270264
local ρk = zero(T)
271265

266+
α = 1 / eps(T)
267+
β = 1 / eps(T)
268+
272269
fk = obj(nlp, xk)
273270
grad!(nlp, xk, ∇fk)
274271
∇fk⁻ .= ∇fk

0 commit comments

Comments
 (0)