Skip to content

Commit 814f704

Browse files
committed
Minor fixes after rebasing
1 parent 7d49259 commit 814f704

File tree

7 files changed

+17
-11
lines changed

7 files changed

+17
-11
lines changed

src/dfsane.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,8 @@ function SciMLBase.solve!(cache::DFSaneCache)
314314
end
315315

316316
function SciMLBase.reinit!(cache::DFSaneCache{iip}, u0 = cache.uₙ; p = cache.p,
317-
abstol = cache.abstol, termination_condition = cache.termination_condition,
317+
abstol = cache.abstol, reltol = cache.reltol,
318+
termination_condition = cache.termination_condition,
318319
maxiters = cache.maxiters) where {iip}
319320
cache.p = p
320321
if iip

src/gaussnewton.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ function perform_step!(cache::GaussNewtonCache{true})
131131
jacobian!!(J, cache)
132132

133133
termination_condition = cache.termination_condition(tc_storage)
134-
134+
135135
if JᵀJ !== nothing
136136
__matmul!(JᵀJ, J', J)
137137
__matmul!(Jᵀf, J', fu1)

src/levenberg.jl

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ function SciMLBase.__init(prob::Union{NonlinearProblem{uType, iip},
219219

220220
storage = mode DiffEqBase.SAFE_TERMINATION_MODES ? NLSolveSafeTerminationResult() :
221221
nothing
222-
222+
223223
if _unwrap_val(linsolve_with_JᵀJ)
224224
mat_tmp = zero(JᵀJ)
225225
rhs_tmp = nothing
@@ -232,19 +232,22 @@ function SciMLBase.__init(prob::Union{NonlinearProblem{uType, iip},
232232
linsolve = __setup_linsolve(mat_tmp, rhs_tmp, u, p, alg)
233233
end
234234

235-
return LevenbergMarquardtCache{iip, !_unwrap_val(linsolve_with_JᵀJ)}(f, alg, u, fu1,
235+
return LevenbergMarquardtCache{iip, !_unwrap_val(linsolve_with_JᵀJ)}(f, alg, u, copy(u),
236+
fu1,
236237
fu2, du, p, uf, linsolve, J,
237-
jac_cache, false, maxiters, internalnorm, ReturnCode.Default, abstol, reltol, prob, DᵀD,
238+
jac_cache, false, maxiters, internalnorm, ReturnCode.Default, abstol, reltol, prob,
239+
DᵀD,
238240
JᵀJ, λ, λ_factor, damping_increase_factor, damping_decrease_factor, h, α_geodesic,
239241
b_uphill, min_damping_D, v, a, tmp_vec, v_old, loss, δ, loss, make_new_J, fu_tmp,
240-
zero(u), zero(fu1), mat_tmp, rhs_tmp, J², NLStats(1, 0, 0, 0, 0), termination_condition, storage)
242+
zero(u), zero(fu1), mat_tmp, rhs_tmp, J², NLStats(1, 0, 0, 0, 0),
243+
termination_condition, storage)
241244
end
242245

243246
function perform_step!(cache::LevenbergMarquardtCache{true, fastls}) where {fastls}
244247
@unpack fu1, f, make_new_J, tc_storage = cache
245248

246249
termination_condition = cache.termination_condition(tc_storage)
247-
250+
248251
if iszero(fu1)
249252
cache.force_stop = true
250253
return nothing

src/raphson.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ function SciMLBase.__init(prob::NonlinearProblem{uType, iip}, alg_::NewtonRaphso
102102

103103
return NewtonRaphsonCache{iip}(f, alg, u, copy(u), fu1, fu2, du, p, uf, linsolve, J,
104104
jac_cache, false, maxiters, internalnorm, ReturnCode.Default, abstol, reltol, prob,
105-
NLStats(1, 0, 0, 0, 0), init_linesearch_cache(alg.linesearch, f, u, p, fu1, Val(iip)),
105+
NLStats(1, 0, 0, 0, 0),
106+
init_linesearch_cache(alg.linesearch, f, u, p, fu1, Val(iip)),
106107
termination_condition, storage)
107108
end
108109

src/trustRegion.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,8 @@ end
724724
get_fu(cache::TrustRegionCache) = cache.fu
725725

726726
function SciMLBase.reinit!(cache::TrustRegionCache{iip}, u0 = cache.u; p = cache.p,
727-
abstol = cache.abstol, termination_condition = cache.termination_condition,
727+
abstol = cache.abstol, reltol = cache.reltol,
728+
termination_condition = cache.termination_condition,
728729
maxiters = cache.maxiters) where {iip}
729730
cache.p = p
730731
if iip

src/utils.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,4 +324,4 @@ end
324324

325325
_needs_square_A(_, ::Number) = true
326326
_needs_square_A(_, ::StaticArray) = true
327-
_needs_square_A(alg, _) = LinearSolve.needs_square_A(alg.linsolve)
327+
_needs_square_A(alg, _) = LinearSolve.needs_square_A(alg.linsolve)

test/23_test_problems.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ end
7575
alg_ops = (DFSane(),)
7676

7777
broken_tests = Dict(alg => Int[] for alg in alg_ops)
78-
broken_tests[alg_ops[1]] = [1, 2, 3, 5, 6, 8, 12, 13, 14, 21]
78+
broken_tests[alg_ops[1]] = [1, 2, 3, 5, 6, 21]
7979

8080
test_on_library(problems, dicts, alg_ops, broken_tests)
8181
end

0 commit comments

Comments
 (0)