Skip to content

Commit 3dfa6a2

Browse files
Merge pull request #128 from SciML/auto-juliaformatter-pr
Automatic JuliaFormatter.jl run
2 parents c860b4b + 4d1c761 commit 3dfa6a2

File tree

10 files changed

+39
-23
lines changed

10 files changed

+39
-23
lines changed

lib/SimpleNonlinearSolve/src/SimpleNonlinearSolve.jl

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ import PrecompileTools: @compile_workload, @setup_workload, @recompile_invalidat
44

55
@recompile_invalidations begin
66
using ADTypes, ArrayInterface, ConcreteStructs, DiffEqBase, FastClosures, FiniteDiff,
7-
ForwardDiff, Reexport, LinearAlgebra, SciMLBase
7+
ForwardDiff, Reexport, LinearAlgebra, SciMLBase
88

99
import DiffEqBase: AbstractNonlinearTerminationMode,
10-
AbstractSafeNonlinearTerminationMode, AbstractSafeBestNonlinearTerminationMode,
11-
NonlinearSafeTerminationReturnCode, get_termination_mode,
12-
NONLINEARSOLVE_DEFAULT_NORM
10+
AbstractSafeNonlinearTerminationMode,
11+
AbstractSafeBestNonlinearTerminationMode,
12+
NonlinearSafeTerminationReturnCode, get_termination_mode,
13+
NONLINEARSOLVE_DEFAULT_NORM
1314
import ForwardDiff: Dual
1415
import MaybeInplace: @bb, setindex_trait, CanSetindex, CannotSetindex
1516
import SciMLBase: AbstractNonlinearAlgorithm, build_solution, isinplace, _unwrap_val
@@ -56,14 +57,16 @@ function SciMLBase.solve(prob::IntervalNonlinearProblem, alg::Nothing, args...;
5657
end
5758

5859
# By Pass the highlevel checks for NonlinearProblem for Simple Algorithms
59-
function SciMLBase.solve(prob::NonlinearProblem, alg::AbstractSimpleNonlinearSolveAlgorithm,
60+
function SciMLBase.solve(
61+
prob::NonlinearProblem, alg::AbstractSimpleNonlinearSolveAlgorithm,
6062
args...; sensealg = nothing, u0 = nothing, p = nothing, kwargs...)
6163
if sensealg === nothing && haskey(prob.kwargs, :sensealg)
6264
sensealg = prob.kwargs[:sensealg]
6365
end
6466
new_u0 = u0 !== nothing ? u0 : prob.u0
6567
new_p = p !== nothing ? p : prob.p
66-
return __internal_solve_up(prob, sensealg, new_u0, u0 === nothing, new_p, p === nothing,
68+
return __internal_solve_up(
69+
prob, sensealg, new_u0, u0 === nothing, new_p, p === nothing,
6770
alg, args...; kwargs...)
6871
end
6972

@@ -111,7 +114,7 @@ end
111114
end
112115

113116
export SimpleBroyden, SimpleDFSane, SimpleGaussNewton, SimpleHalley, SimpleKlement,
114-
SimpleLimitedMemoryBroyden, SimpleNewtonRaphson, SimpleTrustRegion
117+
SimpleLimitedMemoryBroyden, SimpleNewtonRaphson, SimpleTrustRegion
115118
export Alefeld, Bisection, Brent, Falsi, ITP, Ridder
116119

117120
end # module

lib/SimpleNonlinearSolve/src/ad.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
function SciMLBase.solve(prob::NonlinearProblem{<:Union{Number, <:AbstractArray},
1+
function SciMLBase.solve(
2+
prob::NonlinearProblem{<:Union{Number, <:AbstractArray},
23
iip, <:Union{<:Dual{T, V, P}, <:AbstractArray{<:Dual{T, V, P}}}},
34
alg::AbstractSimpleNonlinearSolveAlgorithm, args...; kwargs...) where {T, V, P, iip}
45
sol, partials = __nlsolve_ad(prob, alg, args...; kwargs...)
56
dual_soln = __nlsolve_dual_soln(sol.u, partials, prob.p)
6-
return SciMLBase.build_solution(prob, alg, dual_soln, sol.resid; sol.retcode, sol.stats,
7+
return SciMLBase.build_solution(
8+
prob, alg, dual_soln, sol.resid; sol.retcode, sol.stats,
79
sol.original)
810
end
911

1012
for algType in (Bisection, Brent, Alefeld, Falsi, ITP, Ridder)
1113
@eval begin
12-
function SciMLBase.solve(prob::IntervalNonlinearProblem{uType, iip,
14+
function SciMLBase.solve(
15+
prob::IntervalNonlinearProblem{uType, iip,
1316
<:Union{<:Dual{T, V, P}, <:AbstractArray{<:Dual{T, V, P}}}},
1417
alg::$(algType), args...; kwargs...) where {uType, T, V, P, iip}
1518
sol, partials = __nlsolve_ad(prob, alg, args...; kwargs...)

lib/SimpleNonlinearSolve/src/bracketing/alefeld.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ function SciMLBase.solve(prob::IntervalNonlinearProblem, alg::Alefeld, args...;
3838
end
3939
ē, fc = d, f(c)
4040
(a == c || b == c) &&
41-
return build_solution(prob, alg, c, fc; retcode = ReturnCode.FloatingPointLimit,
41+
return build_solution(
42+
prob, alg, c, fc; retcode = ReturnCode.FloatingPointLimit,
4243
left = a, right = b)
4344
iszero(fc) &&
4445
return build_solution(prob, alg, c, fc; retcode = ReturnCode.Success,
@@ -57,7 +58,8 @@ function SciMLBase.solve(prob::IntervalNonlinearProblem, alg::Alefeld, args...;
5758
end
5859
fc = f(c)
5960
(ā == c ||== c) &&
60-
return build_solution(prob, alg, c, fc; retcode = ReturnCode.FloatingPointLimit,
61+
return build_solution(
62+
prob, alg, c, fc; retcode = ReturnCode.FloatingPointLimit,
6163
left = ā, right = b̄)
6264
iszero(fc) &&
6365
return build_solution(prob, alg, c, fc; retcode = ReturnCode.Success,
@@ -76,7 +78,8 @@ function SciMLBase.solve(prob::IntervalNonlinearProblem, alg::Alefeld, args...;
7678
end
7779
fc = f(c)
7880
(ā == c ||== c) &&
79-
return build_solution(prob, alg, c, fc; retcode = ReturnCode.FloatingPointLimit,
81+
return build_solution(
82+
prob, alg, c, fc; retcode = ReturnCode.FloatingPointLimit,
8083
left = ā, right = b̄)
8184
iszero(fc) &&
8285
return build_solution(prob, alg, c, fc; retcode = ReturnCode.Success,

lib/SimpleNonlinearSolve/src/bracketing/bisection.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ function SciMLBase.solve(prob::IntervalNonlinearProblem, alg::Bisection, args...
3535
end
3636

3737
if iszero(fr)
38-
return build_solution(prob, alg, right, fr; retcode = ReturnCode.ExactSolutionRight,
38+
return build_solution(
39+
prob, alg, right, fr; retcode = ReturnCode.ExactSolutionRight,
3940
left, right)
4041
end
4142

lib/SimpleNonlinearSolve/src/bracketing/brent.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ function SciMLBase.solve(prob::IntervalNonlinearProblem, alg::Brent, args...;
2222
end
2323

2424
if iszero(fr)
25-
return build_solution(prob, alg, right, fr; retcode = ReturnCode.ExactSolutionRight,
25+
return build_solution(
26+
prob, alg, right, fr; retcode = ReturnCode.ExactSolutionRight,
2627
left, right)
2728
end
2829

lib/SimpleNonlinearSolve/src/bracketing/falsi.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ function SciMLBase.solve(prob::IntervalNonlinearProblem, alg::Falsi, args...;
2121
end
2222

2323
if iszero(fr)
24-
return build_solution(prob, alg, right, fr; retcode = ReturnCode.ExactSolutionRight,
24+
return build_solution(
25+
prob, alg, right, fr; retcode = ReturnCode.ExactSolutionRight,
2526
left, right)
2627
end
2728

lib/SimpleNonlinearSolve/src/bracketing/itp.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ function SciMLBase.solve(prob::IntervalNonlinearProblem, alg::ITP, args...;
6767
end
6868

6969
if iszero(fr)
70-
return build_solution(prob, alg, right, fr; retcode = ReturnCode.ExactSolutionRight,
70+
return build_solution(
71+
prob, alg, right, fr; retcode = ReturnCode.ExactSolutionRight,
7172
left, right)
7273
end
7374
ϵ = abstol

lib/SimpleNonlinearSolve/src/bracketing/ridder.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ function SciMLBase.solve(prob::IntervalNonlinearProblem, alg::Ridder, args...;
2121
end
2222

2323
if iszero(fr)
24-
return build_solution(prob, alg, right, fr; retcode = ReturnCode.ExactSolutionRight,
24+
return build_solution(
25+
prob, alg, right, fr; retcode = ReturnCode.ExactSolutionRight,
2526
left, right)
2627
end
2728

lib/SimpleNonlinearSolve/src/nlsolve/lbroyden.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,8 @@ function __static_solve(prob::NonlinearProblem{<:SArray}, alg::SimpleLimitedMemo
137137
init_α = inv(alg.alpha)
138138
end
139139

140-
converged, res = __unrolled_lbroyden_initial_iterations(prob, xo, fo, δx, abstol, U, Vᵀ,
140+
converged, res = __unrolled_lbroyden_initial_iterations(
141+
prob, xo, fo, δx, abstol, U, Vᵀ,
141142
threshold, ls_cache, init_α)
142143

143144
converged &&

lib/SimpleNonlinearSolve/test/core/rootfind_tests.jl

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@testsetup module RootfindingTesting
22
using Reexport
33
@reexport using AllocCheck,
4-
LinearSolve, StaticArrays, Random, LinearAlgebra, ForwardDiff, DiffEqBase
4+
LinearSolve, StaticArrays, Random, LinearAlgebra, ForwardDiff, DiffEqBase
55
import PolyesterForwardDiff
66

77
quadratic_f(u, p) = u .* u .- p
@@ -22,7 +22,7 @@ end
2222
const TERMINATION_CONDITIONS = [
2323
NormTerminationMode(), RelTerminationMode(), RelNormTerminationMode(),
2424
AbsTerminationMode(), AbsNormTerminationMode(), RelSafeTerminationMode(),
25-
AbsSafeTerminationMode(), RelSafeBestTerminationMode(), AbsSafeBestTerminationMode(),
25+
AbsSafeTerminationMode(), RelSafeBestTerminationMode(), AbsSafeBestTerminationMode()
2626
]
2727

2828
function benchmark_nlsolve_oop(f::F, u0, p = 2.0; solver) where {F}
@@ -35,15 +35,16 @@ function benchmark_nlsolve_iip(f!::F, u0, p = 2.0; solver) where {F}
3535
end
3636

3737
export quadratic_f, quadratic_f!, quadratic_f2, newton_fails, TERMINATION_CONDITIONS,
38-
benchmark_nlsolve_oop, benchmark_nlsolve_iip
38+
benchmark_nlsolve_oop, benchmark_nlsolve_iip
3939

4040
end
4141

4242
@testitem "First Order Methods" setup=[RootfindingTesting] begin
4343
@testset "$(alg)" for alg in (SimpleNewtonRaphson, SimpleTrustRegion,
4444
(args...; kwargs...) -> SimpleTrustRegion(args...; nlsolve_update_rule = Val(true),
4545
kwargs...))
46-
@testset "AutoDiff: $(nameof(typeof(autodiff))))" for autodiff in (AutoFiniteDiff(),
46+
@testset "AutoDiff: $(nameof(typeof(autodiff))))" for autodiff in (
47+
AutoFiniteDiff(),
4748
AutoForwardDiff(), AutoPolyesterForwardDiff())
4849
@testset "[OOP] u0: $(typeof(u0))" for u0 in ([1.0, 1.0],
4950
@SVector[1.0, 1.0], 1.0)

0 commit comments

Comments
 (0)