Skip to content

Commit 12d9743

Browse files
committed
Run formatter
1 parent b36a46b commit 12d9743

19 files changed

+105
-104
lines changed

ext/NonlinearSolveFastLevenbergMarquardtExt.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ end
3232
(f::InplaceFunction{false})(fx, x, p) = (fx .= f.f(x, p))
3333

3434
function SciMLBase.__init(prob::NonlinearLeastSquaresProblem,
35-
alg::FastLevenbergMarquardtJL, args...; abstol = 1e-8, reltol = 1e-8,
36-
verbose = false, maxiters = 1000, kwargs...)
35+
alg::FastLevenbergMarquardtJL, args...; abstol = 1e-8, reltol = 1e-8,
36+
verbose = false, maxiters = 1000, kwargs...)
3737
iip = SciMLBase.isinplace(prob)
3838

3939
@assert prob.f.jac!==nothing "FastLevenbergMarquardt requires a Jacobian!"

ext/NonlinearSolveLeastSquaresOptimExt.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ end
3333
(f::FunctionWrapper{false})(du, u) = (du .= f.f(u, f.p))
3434

3535
function SciMLBase.__init(prob::NonlinearLeastSquaresProblem, alg::LeastSquaresOptimJL,
36-
args...; abstol = 1e-8, reltol = 1e-8, verbose = false, maxiters = 1000, kwargs...)
36+
args...; abstol = 1e-8, reltol = 1e-8, verbose = false, maxiters = 1000, kwargs...)
3737
iip = SciMLBase.isinplace(prob)
3838

3939
f! = FunctionWrapper{iip}(prob.f, prob.p)

src/NonlinearSolve.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ abstract type AbstractNonlinearSolveCache{iip} end
4444
isinplace(::AbstractNonlinearSolveCache{iip}) where {iip} = iip
4545

4646
function SciMLBase.__solve(prob::Union{NonlinearProblem, NonlinearLeastSquaresProblem},
47-
alg::AbstractNonlinearSolveAlgorithm, args...; kwargs...)
47+
alg::AbstractNonlinearSolveAlgorithm, args...; kwargs...)
4848
cache = init(prob, alg, args...; kwargs...)
4949
return solve!(cache)
5050
end

src/ad.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ function scalar_nlsolve_ad(prob, alg, args...; kwargs...)
2626
end
2727

2828
function SciMLBase.solve(prob::NonlinearProblem{<:Union{Number, SVector, <:AbstractArray},
29-
false, <:Dual{T, V, P}}, alg::AbstractNewtonAlgorithm, args...;
30-
kwargs...) where {T, V, P}
29+
false, <:Dual{T, V, P}}, alg::AbstractNewtonAlgorithm, args...;
30+
kwargs...) where {T, V, P}
3131
sol, partials = scalar_nlsolve_ad(prob, alg, args...; kwargs...)
3232
dual_soln = scalar_nlsolve_dual_soln(sol.u, partials, prob.p)
3333
return SciMLBase.build_solution(prob, alg, dual_soln, sol.resid; sol.retcode)
3434
end
3535

3636
function SciMLBase.solve(prob::NonlinearProblem{<:Union{Number, SVector, <:AbstractArray},
37-
false, <:AbstractArray{<:Dual{T, V, P}}}, alg::AbstractNewtonAlgorithm, args...;
38-
kwargs...) where {T, V, P}
37+
false, <:AbstractArray{<:Dual{T, V, P}}}, alg::AbstractNewtonAlgorithm, args...;
38+
kwargs...) where {T, V, P}
3939
sol, partials = scalar_nlsolve_ad(prob, alg, args...; kwargs...)
4040
dual_soln = scalar_nlsolve_dual_soln(sol.u, partials, prob.p)
4141
return SciMLBase.build_solution(prob, alg, dual_soln, sol.resid; sol.retcode)
@@ -53,11 +53,11 @@ function scalar_nlsolve_∂f_∂u(f, u, p)
5353
end
5454

5555
function scalar_nlsolve_dual_soln(u::Number, partials,
56-
::Union{<:AbstractArray{<:Dual{T, V, P}}, Dual{T, V, P}}) where {T, V, P}
56+
::Union{<:AbstractArray{<:Dual{T, V, P}}, Dual{T, V, P}}) where {T, V, P}
5757
return Dual{T, V, P}(u, partials)
5858
end
5959

6060
function scalar_nlsolve_dual_soln(u::AbstractArray, partials,
61-
::Union{<:AbstractArray{<:Dual{T, V, P}}, Dual{T, V, P}}) where {T, V, P}
61+
::Union{<:AbstractArray{<:Dual{T, V, P}}, Dual{T, V, P}}) where {T, V, P}
6262
return map(((uᵢ, pᵢ),) -> Dual{T, V, P}(uᵢ, pᵢ), zip(u, partials))
6363
end

src/broyden.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ An implementation of `Broyden` with reseting and line search.
2222
end
2323

2424
function GeneralBroyden(; max_resets = 3, linesearch = LineSearch(),
25-
reset_tolerance = nothing)
25+
reset_tolerance = nothing)
2626
linesearch = linesearch isa LineSearch ? linesearch : LineSearch(; method = linesearch)
2727
return GeneralBroyden(max_resets, reset_tolerance, linesearch)
2828
end
@@ -60,9 +60,9 @@ end
6060
get_fu(cache::GeneralBroydenCache) = cache.fu
6161

6262
function SciMLBase.__init(prob::NonlinearProblem{uType, iip}, alg::GeneralBroyden, args...;
63-
alias_u0 = false, maxiters = 1000, abstol = nothing, reltol = nothing,
64-
termination_condition = nothing, internalnorm::F = DEFAULT_NORM,
65-
kwargs...) where {uType, iip, F}
63+
alias_u0 = false, maxiters = 1000, abstol = nothing, reltol = nothing,
64+
termination_condition = nothing, internalnorm::F = DEFAULT_NORM,
65+
kwargs...) where {uType, iip, F}
6666
@unpack f, u0, p = prob
6767
u = alias_u0 ? u0 : deepcopy(u0)
6868
fu = evaluate_f(prob, u)
@@ -172,9 +172,9 @@ function perform_step!(cache::GeneralBroydenCache{false})
172172
end
173173

174174
function SciMLBase.reinit!(cache::GeneralBroydenCache{iip}, u0 = cache.u; p = cache.p,
175-
abstol = cache.abstol, reltol = cache.reltol,
176-
termination_condition = cache.termination_condition,
177-
maxiters = cache.maxiters) where {iip}
175+
abstol = cache.abstol, reltol = cache.reltol,
176+
termination_condition = cache.termination_condition,
177+
maxiters = cache.maxiters) where {iip}
178178
cache.p = p
179179
if iip
180180
recursivecopy!(cache.u, u0)

src/default.jl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ end
4242
const Robusters = RobustMultiNewton
4343

4444
function RobustMultiNewton(; concrete_jac = nothing, linsolve = nothing,
45-
precs = DEFAULT_PRECS, adkwargs...)
45+
precs = DEFAULT_PRECS, adkwargs...)
4646
return RobustMultiNewton{_unwrap_val(concrete_jac)}(adkwargs, linsolve, precs)
4747
end
4848

@@ -53,7 +53,7 @@ end
5353
end
5454

5555
function SciMLBase.__init(prob::NonlinearProblem{uType, iip}, alg::RobustMultiNewton,
56-
args...; kwargs...) where {uType, iip}
56+
args...; kwargs...) where {uType, iip}
5757
@unpack adkwargs, linsolve, precs = alg
5858

5959
algs = (TrustRegion(; linsolve, precs, adkwargs...),
@@ -105,7 +105,7 @@ for more performance and then tries more robust techniques if the faster ones fa
105105
end
106106

107107
function FastShortcutNonlinearPolyalg(; concrete_jac = nothing, linsolve = nothing,
108-
precs = DEFAULT_PRECS, adkwargs...)
108+
precs = DEFAULT_PRECS, adkwargs...)
109109
return FastShortcutNonlinearPolyalg{_unwrap_val(concrete_jac)}(adkwargs, linsolve,
110110
precs)
111111
end
@@ -118,13 +118,13 @@ end
118118
end
119119

120120
function FastShortcutNonlinearPolyalgCache(; concrete_jac = nothing, linsolve = nothing,
121-
precs = DEFAULT_PRECS, adkwargs...)
121+
precs = DEFAULT_PRECS, adkwargs...)
122122
return FastShortcutNonlinearPolyalgCache{_unwrap_val(concrete_jac)}(adkwargs, linsolve,
123123
precs)
124124
end
125125

126126
function SciMLBase.__init(prob::NonlinearProblem{uType, iip},
127-
alg::FastShortcutNonlinearPolyalg, args...; kwargs...) where {uType, iip}
127+
alg::FastShortcutNonlinearPolyalg, args...; kwargs...) where {uType, iip}
128128
@unpack adkwargs, linsolve, precs = alg
129129

130130
algs = (GeneralKlement(; linsolve, precs),
@@ -141,8 +141,8 @@ end
141141

142142
# This version doesn't allocate all the caches!
143143
@generated function SciMLBase.__solve(prob::NonlinearProblem{uType, iip},
144-
alg::Union{FastShortcutNonlinearPolyalg, RobustMultiNewton}, args...;
145-
kwargs...) where {uType, iip}
144+
alg::Union{FastShortcutNonlinearPolyalg, RobustMultiNewton}, args...;
145+
kwargs...) where {uType, iip}
146146
calls = [:(@unpack adkwargs, linsolve, precs = alg)]
147147

148148
algs = if parameterless_type(alg) == RobustMultiNewton
@@ -210,7 +210,7 @@ end
210210
## General shared polyalg functions
211211

212212
@generated function SciMLBase.solve!(cache::Union{RobustMultiNewtonCache{iip, N},
213-
FastShortcutNonlinearPolyalgCache{iip, N}}) where {iip, N}
213+
FastShortcutNonlinearPolyalgCache{iip, N}}) where {iip, N}
214214
calls = [
215215
quote
216216
1 cache.current length(cache.caches) ||
@@ -260,7 +260,7 @@ end
260260
end
261261

262262
function SciMLBase.reinit!(cache::Union{RobustMultiNewtonCache,
263-
FastShortcutNonlinearPolyalgCache}, args...; kwargs...)
263+
FastShortcutNonlinearPolyalgCache}, args...; kwargs...)
264264
for c in cache.caches
265265
SciMLBase.reinit!(c, args...; kwargs...)
266266
end
@@ -269,11 +269,11 @@ end
269269
## Defaults
270270

271271
function SciMLBase.__init(prob::NonlinearProblem{uType, iip}, alg::Nothing, args...;
272-
kwargs...) where {uType, iip}
272+
kwargs...) where {uType, iip}
273273
SciMLBase.__init(prob, FastShortcutNonlinearPolyalg(), args...; kwargs...)
274274
end
275275

276276
function SciMLBase.__solve(prob::NonlinearProblem{uType, iip}, alg::Nothing, args...;
277-
kwargs...) where {uType, iip}
277+
kwargs...) where {uType, iip}
278278
SciMLBase.__solve(prob, FastShortcutNonlinearPolyalg(), args...; kwargs...)
279279
end

src/dfsane.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ struct DFSane{T, F} <: AbstractNonlinearSolveAlgorithm
5757
end
5858

5959
function DFSane(; σ_min = 1e-10, σ_max = 1e+10, σ_1 = 1.0, M = 10, γ = 1e-4, τ_min = 0.1,
60-
τ_max = 0.5, n_exp = 2, η_strategy = (fn_1, n, x_n, f_n) -> fn_1 / n^2,
61-
max_inner_iterations = 1000)
60+
τ_max = 0.5, n_exp = 2, η_strategy = (fn_1, n, x_n, f_n) -> fn_1 / n^2,
61+
max_inner_iterations = 1000)
6262
return DFSane{typeof(σ_min), typeof(η_strategy)}(σ_min, σ_max, σ_1, M, γ, τ_min, τ_max,
6363
n_exp, η_strategy, max_inner_iterations)
6464
end
@@ -96,9 +96,9 @@ end
9696
end
9797

9898
function SciMLBase.__init(prob::NonlinearProblem{uType, iip}, alg::DFSane, args...;
99-
alias_u0 = false, maxiters = 1000, abstol = nothing, reltol = nothing,
100-
termination_condition = nothing, internalnorm::F = DEFAULT_NORM,
101-
kwargs...) where {uType, iip, F}
99+
alias_u0 = false, maxiters = 1000, abstol = nothing, reltol = nothing,
100+
termination_condition = nothing, internalnorm::F = DEFAULT_NORM,
101+
kwargs...) where {uType, iip, F}
102102
uₙ = alias_u0 ? prob.u0 : deepcopy(prob.u0)
103103

104104
p = prob.p
@@ -307,9 +307,9 @@ function SciMLBase.solve!(cache::DFSaneCache)
307307
end
308308

309309
function SciMLBase.reinit!(cache::DFSaneCache{iip}, u0 = cache.uₙ; p = cache.p,
310-
abstol = cache.abstol, reltol = cache.reltol,
311-
termination_condition = cache.termination_condition,
312-
maxiters = cache.maxiters) where {iip}
310+
abstol = cache.abstol, reltol = cache.reltol,
311+
termination_condition = cache.termination_condition,
312+
maxiters = cache.maxiters) where {iip}
313313
cache.p = p
314314
if iip
315315
recursivecopy!(cache.uₙ, u0)

src/extension_algs.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ Wrapper over [FastLevenbergMarquardt.jl](https://github.com/kamesy/FastLevenberg
6565
end
6666

6767
function FastLevenbergMarquardtJL(linsolve::Symbol = :cholesky; factor = 1e-6,
68-
factoraccept = 13.0, factorreject = 3.0, factorupdate = :marquardt,
69-
minscale = 1e-12, maxscale = 1e16, minfactor = 1e-28, maxfactor = 1e32)
68+
factoraccept = 13.0, factorreject = 3.0, factorupdate = :marquardt,
69+
minscale = 1e-12, maxscale = 1e16, minfactor = 1e-28, maxfactor = 1e32)
7070
@assert linsolve in (:qr, :cholesky)
7171
@assert factorupdate in (:marquardt, :nielson)
7272

src/gaussnewton.jl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function set_ad(alg::GaussNewton{CJ}, ad) where {CJ}
4747
end
4848

4949
function GaussNewton(; concrete_jac = nothing, linsolve = nothing,
50-
precs = DEFAULT_PRECS, adkwargs...)
50+
precs = DEFAULT_PRECS, adkwargs...)
5151
ad = default_adargs_to_adtype(; adkwargs...)
5252
return GaussNewton{_unwrap_val(concrete_jac)}(ad, linsolve, precs)
5353
end
@@ -81,9 +81,9 @@ end
8181
end
8282

8383
function SciMLBase.__init(prob::NonlinearLeastSquaresProblem{uType, iip}, alg_::GaussNewton,
84-
args...; alias_u0 = false, maxiters = 1000, abstol = nothing, reltol = nothing,
85-
termination_condition = nothing, internalnorm::F = DEFAULT_NORM,
86-
kwargs...) where {uType, iip, F}
84+
args...; alias_u0 = false, maxiters = 1000, abstol = nothing, reltol = nothing,
85+
termination_condition = nothing, internalnorm::F = DEFAULT_NORM,
86+
kwargs...) where {uType, iip, F}
8787
alg = get_concrete_algorithm(alg_, prob)
8888
@unpack f, u0, p = prob
8989

@@ -192,9 +192,9 @@ function perform_step!(cache::GaussNewtonCache{false})
192192
end
193193

194194
function SciMLBase.reinit!(cache::GaussNewtonCache{iip}, u0 = cache.u; p = cache.p,
195-
abstol = cache.abstol, reltol = cache.reltol,
196-
termination_condition = cache.termination_condition,
197-
maxiters = cache.maxiters) where {iip}
195+
abstol = cache.abstol, reltol = cache.reltol,
196+
termination_condition = cache.termination_condition,
197+
maxiters = cache.maxiters) where {iip}
198198
cache.p = p
199199
if iip
200200
recursivecopy!(cache.u, u0)

src/jacobian.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ jacobian!!(::Number, cache) = last(value_derivative(cache.uf, cache.u))
5050

5151
# Build Jacobian Caches
5252
function jacobian_caches(alg::AbstractNonlinearSolveAlgorithm, f::F, u, p, ::Val{iip};
53-
linsolve_kwargs = (;), lininit::Val{linsolve_init} = Val(true),
54-
linsolve_with_JᵀJ::Val{needsJᵀJ} = Val(false)) where {iip, needsJᵀJ, linsolve_init, F}
53+
linsolve_kwargs = (;), lininit::Val{linsolve_init} = Val(true),
54+
linsolve_with_JᵀJ::Val{needsJᵀJ} = Val(false)) where {iip, needsJᵀJ, linsolve_init, F}
5555
uf = JacobianWrapper{iip}(f, p)
5656

5757
haslinsolve = hasfield(typeof(alg), :linsolve)
@@ -136,8 +136,8 @@ __maybe_symmetric(x::SparseArrays.AbstractSparseMatrix) = x
136136

137137
## Special Handling for Scalars
138138
function jacobian_caches(alg::AbstractNonlinearSolveAlgorithm, f::F, u::Number, p,
139-
::Val{false}; linsolve_with_JᵀJ::Val{needsJᵀJ} = Val(false),
140-
kwargs...) where {needsJᵀJ, F}
139+
::Val{false}; linsolve_with_JᵀJ::Val{needsJᵀJ} = Val(false),
140+
kwargs...) where {needsJᵀJ, F}
141141
# NOTE: Scalar `u` assumes scalar output from `f`
142142
uf = JacobianWrapper{false}(f, p)
143143
needsJᵀJ && return uf, nothing, u, nothing, nothing, u, u, u

0 commit comments

Comments
 (0)