Skip to content

Commit 3dc2cf1

Browse files
SciML BotChrisRackauckas
authored andcommitted
Apply JuliaFormatter to fix code formatting
- Applied JuliaFormatter with SciML style guide - Formatted 11 files 🤖 Generated by OrgMaintenanceScripts.jl
1 parent b5213a8 commit 3dc2cf1

File tree

11 files changed

+51
-28
lines changed

11 files changed

+51
-28
lines changed

docs/pages.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
pages = [
22
"DelayDiffEq.jl: DDE solvers" => "index.md",
33
"Solver API" => "solvers/api.md"
4-
]
4+
]

src/DelayDiffEq.jl

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
module DelayDiffEq
22

33
using Reexport: @reexport
4-
import OrdinaryDiffEqCore, OrdinaryDiffEqNonlinearSolve, OrdinaryDiffEqDifferentiation, OrdinaryDiffEqRosenbrock
4+
import OrdinaryDiffEqCore, OrdinaryDiffEqNonlinearSolve, OrdinaryDiffEqDifferentiation,
5+
OrdinaryDiffEqRosenbrock
56
@reexport using OrdinaryDiffEq
67

78
using DataStructures: BinaryMinHeap
89
using LinearAlgebra: opnorm, I
910
using Logging: @logmsg
10-
using RecursiveArrayTools: copyat_or_push!, recursivecopy, recursivecopy!, recursive_bottom_eltype, recursive_unitless_bottom_eltype, recursive_unitless_eltype
11+
using RecursiveArrayTools: copyat_or_push!, recursivecopy, recursivecopy!,
12+
recursive_bottom_eltype, recursive_unitless_bottom_eltype,
13+
recursive_unitless_eltype
1114
using SimpleUnPack: @unpack
1215
using ForwardDiff: ForwardDiff
1316

@@ -16,7 +19,7 @@ import SimpleNonlinearSolve
1619
import SymbolicIndexingInterface as SII
1720

1821
using SciMLBase: AbstractDDEAlgorithm, AbstractDDEIntegrator, AbstractODEIntegrator,
19-
DEIntegrator
22+
DEIntegrator
2023

2124
using Base: deleteat!
2225
import FastBroadcast: @..
@@ -32,10 +35,13 @@ using OrdinaryDiffEqFunctionMap: FunctionMap
3235
using OrdinaryDiffEqCore: AutoSwitch, CompositeAlgorithm
3336
using OrdinaryDiffEq: OrdinaryDiffEq
3437
using SciMLBase: CallbackSet, DAEProblem, DDEProblem, DESolution, ODEProblem, ReturnCode,
35-
VectorContinuousCallback, addat!, addat_non_user_cache!, deleteat_non_user_cache!,
36-
du_cache, full_cache, get_tmp_cache, isinplace, reeval_internals_due_to_modification!,
38+
VectorContinuousCallback, addat!, addat_non_user_cache!,
39+
deleteat_non_user_cache!,
40+
du_cache, full_cache, get_tmp_cache, isinplace,
41+
reeval_internals_due_to_modification!,
3742
reinit!, resize_non_user_cache!, savevalues!, u_cache, user_cache,
38-
step!, terminate!, u_modified!, get_proposed_dt, set_proposed_dt!, auto_dt_reset!,
43+
step!, terminate!, u_modified!, get_proposed_dt, set_proposed_dt!,
44+
auto_dt_reset!,
3945
add_tstop!, add_saveat!, get_du, get_du!, addsteps!,
4046
change_t_via_interpolation!, isadaptive
4147
using DiffEqBase: initialize!

src/discontinuity_type.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ Base.convert(::Type{T}, d::Discontinuity) where {T <: Number} = convert(T, d.t)
3838
Base.convert(::Type{T}, d::Discontinuity{T}) where {T <: Number} = d.t
3939

4040
# Fix ForwardDiff ambiguities
41-
function Base.convert(::Type{ForwardDiff.Dual{T, V, N}}, ::Discontinuity{ForwardDiff.Dual{T, V, N}}) where {N, V, T}
42-
throw(MethodError(convert, (ForwardDiff.Dual{T, V, N}, Discontinuity{ForwardDiff.Dual{T, V, N}})))
41+
function Base.convert(::Type{ForwardDiff.Dual{T, V, N}},
42+
::Discontinuity{ForwardDiff.Dual{T, V, N}}) where {N, V, T}
43+
throw(MethodError(convert, (
44+
ForwardDiff.Dual{T, V, N}, Discontinuity{ForwardDiff.Dual{T, V, N}})))
4345
end
4446
function Base.convert(::Type{ForwardDiff.Dual{T, V, N}}, ::Discontinuity) where {N, V, T}
4547
throw(MethodError(convert, (ForwardDiff.Dual{T, V, N}, Discontinuity)))

src/fpsolve/fpsolve.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
OrdinaryDiffEqNonlinearSolve.initial_η(fpsolver::FPSolver, integrator::DDEIntegrator) = fpsolver.ηold
1+
function OrdinaryDiffEqNonlinearSolve.initial_η(fpsolver::FPSolver, integrator::DDEIntegrator)
2+
fpsolver.ηold
3+
end
24

35
OrdinaryDiffEqCore.apply_step!(fpsolver::FPSolver, integrator::DDEIntegrator) = nothing
46

src/fpsolve/functional.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ function OrdinaryDiffEqNonlinearSolve.compute_step!(fpsolver::FPSolver{<:NLFunct
1010
compute_step_fixedpoint!(fpsolver, integrator)
1111
end
1212

13-
function OrdinaryDiffEqNonlinearSolve.compute_step!(fpsolver::FPSolver{<:NLAnderson, false},
13+
function OrdinaryDiffEqNonlinearSolve.compute_step!(
14+
fpsolver::FPSolver{<:NLAnderson, false},
1415
integrator::DDEIntegrator)
1516
@unpack cache, iter = fpsolver
1617
@unpack aa_start = cache

src/integrators/interface.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,8 @@ function DiffEqBase.reinit!(integrator::DDEIntegrator, u0 = integrator.sol.prob.
375375
# update order of initial discontinuity and propagated discontinuities
376376
integrator.order_discontinuity_t0 = order_discontinuity_t0
377377
maximum_order = OrdinaryDiffEqCore.alg_maximum_order(integrator.alg)
378-
tstops_propagated, d_discontinuities_propagated = initialize_tstops_d_discontinuities_propagated(
378+
tstops_propagated,
379+
d_discontinuities_propagated = initialize_tstops_d_discontinuities_propagated(
379380
tType,
380381
tstops,
381382
d_discontinuities,
@@ -507,11 +508,11 @@ function DiffEqBase.addsteps!(integrator::DDEIntegrator, args...)
507508
end
508509

509510
function DiffEqBase.change_t_via_interpolation!(integrator::DDEIntegrator,
510-
t, modify_save_endpoint::Type{Val{T}} = Val{false}, reinitialize_alg = nothing) where T
511+
t, modify_save_endpoint::Type{Val{T}} = Val{false},
512+
reinitialize_alg = nothing) where {T}
511513
OrdinaryDiffEqCore._change_t_via_interpolation!(integrator, t, modify_save_endpoint, reinitialize_alg)
512514
end
513515

514-
515516
# update integrator when u is modified by callbacks
516517
function OrdinaryDiffEqCore.handle_callback_modifiers!(integrator::DDEIntegrator)
517518
integrator.reeval_fsal = true # recalculate fsalfirst after applying step

src/integrators/utils.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ function advance_ode_integrator!(integrator::DDEIntegrator, always_calc_begin =
3535
# has to be done before updates to ODE integrator, otherwise history function
3636
# is incorrect
3737
if iscomposite(alg)
38-
OrdinaryDiffEqCore._ode_addsteps!(k, t, uprev, u, dt, f, p, cache.caches[cache.current],
38+
OrdinaryDiffEqCore._ode_addsteps!(
39+
k, t, uprev, u, dt, f, p, cache.caches[cache.current],
3940
always_calc_begin, true, true)
4041
else
41-
OrdinaryDiffEqCore._ode_addsteps!(k, t, uprev, u, dt, f, p, cache, always_calc_begin,
42+
OrdinaryDiffEqCore._ode_addsteps!(
43+
k, t, uprev, u, dt, f, p, cache, always_calc_begin,
4244
true, true)
4345
end
4446
@inbounds for i in 1:length(k)
@@ -82,7 +84,8 @@ function update_ode_integrator!(integrator::DDEIntegrator, always_calc_begin = f
8284
ode_integrator.t != t + dt && error("cannot update ODE integrator")
8385

8486
if iscomposite(alg)
85-
OrdinaryDiffEqCore._ode_addsteps!(k, t, uprev, u, dt, f, p, cache.caches[cache.current],
87+
OrdinaryDiffEqCore._ode_addsteps!(
88+
k, t, uprev, u, dt, f, p, cache.caches[cache.current],
8689
always_calc_begin, true, true)
8790
else
8891
OrdinaryDiffEqCore._ode_addsteps!(k, t, uprev, u, dt, f, p, cache,

src/solve.jl

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ function SciMLBase.__init(prob::SciMLBase.AbstractDDEProblem,
1818
save_everystep = isempty(saveat),
1919
save_on = true,
2020
save_start = save_everystep || isempty(saveat) ||
21-
saveat isa Number || prob.tspan[1] in saveat,
21+
saveat isa Number || prob.tspan[1] in saveat,
2222
save_end = nothing,
2323
callback = nothing,
2424
dense = save_everystep && isempty(saveat),
2525
calck = (callback !== nothing && callback != CallbackSet()) || # Empty callback
26-
dense, # and no dense output
26+
dense, # and no dense output
2727
dt = zero(eltype(prob.tspan)),
2828
dtmin = DiffEqBase.prob2dtmin(prob; use_end_time = false),
2929
dtmax = eltype(prob.tspan)(prob.tspan[end] - prob.tspan[1]),
@@ -130,7 +130,8 @@ function SciMLBase.__init(prob::SciMLBase.AbstractDDEProblem,
130130
rate_prototype = rate_prototype_of(u0, tspan)
131131

132132
# get states (possibly different from the ODE integrator!)
133-
u, uprev, uprev2 = u_uprev_uprev2(u0, alg;
133+
u, uprev,
134+
uprev2 = u_uprev_uprev2(u0, alg;
134135
alias_u0 = alias_u0,
135136
adaptive = adaptive,
136137
allow_extrapolation = allow_extrapolation,
@@ -150,10 +151,12 @@ function SciMLBase.__init(prob::SciMLBase.AbstractDDEProblem,
150151
f_with_history = ODEFunctionWrapper(f, history)
151152

152153
# initialize output arrays of the solution
153-
save_idxs, saved_subsystem = SciMLBase.get_save_idxs_and_saved_subsystem(prob, save_idxs)
154+
save_idxs,
155+
saved_subsystem = SciMLBase.get_save_idxs_and_saved_subsystem(prob, save_idxs)
154156

155157
k = typeof(rate_prototype)[]
156-
ts, timeseries, ks = solution_arrays(u, tspan, rate_prototype;
158+
ts, timeseries,
159+
ks = solution_arrays(u, tspan, rate_prototype;
157160
timeseries_init = timeseries_init,
158161
ts_init = ts_init,
159162
ks_init = ks_init,
@@ -181,7 +184,8 @@ function SciMLBase.__init(prob::SciMLBase.AbstractDDEProblem,
181184
stats = stats)
182185

183186
# retrieve time stops, time points at which solutions is saved, and discontinuities
184-
tstops_internal = OrdinaryDiffEqCore.initialize_tstops(tType, tstops, d_discontinuities,
187+
tstops_internal = OrdinaryDiffEqCore.initialize_tstops(
188+
tType, tstops, d_discontinuities,
185189
tspan)
186190
saveat_internal = OrdinaryDiffEqCore.initialize_saveat(tType, saveat, tspan)
187191
d_discontinuities_internal = OrdinaryDiffEqCore.initialize_d_discontinuities(
@@ -193,7 +197,8 @@ function SciMLBase.__init(prob::SciMLBase.AbstractDDEProblem,
193197
tspan)
194198

195199
maximum_order = OrdinaryDiffEqCore.alg_maximum_order(alg)
196-
tstops_propagated, d_discontinuities_propagated = initialize_tstops_d_discontinuities_propagated(
200+
tstops_propagated,
201+
d_discontinuities_propagated = initialize_tstops_d_discontinuities_propagated(
197202
tType,
198203
tstops,
199204
d_discontinuities,

src/utils.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,15 +284,17 @@ function build_history_function(prob, alg, rate_prototype, reltol, differential_
284284

285285
# initialize output arrays
286286
ode_k = typeof(rate_prototype)[]
287-
ode_ts, ode_timeseries, ode_ks = solution_arrays(ode_u, tspan, rate_prototype;
287+
ode_ts, ode_timeseries,
288+
ode_ks = solution_arrays(ode_u, tspan, rate_prototype;
288289
timeseries_init = (),
289290
ts_init = (),
290291
ks_init = (),
291292
save_idxs = nothing,
292293
save_start = true)
293294

294295
# obtain cache (we alias uprev2 and uprev)
295-
ode_cache = OrdinaryDiffEqCore.alg_cache(alg.alg, ode_u, rate_prototype, uEltypeNoUnits,
296+
ode_cache = OrdinaryDiffEqCore.alg_cache(
297+
alg.alg, ode_u, rate_prototype, uEltypeNoUnits,
296298
uBottomEltypeNoUnits, tTypeNoUnits, ode_uprev,
297299
ode_uprev, ode_f, t0, zero(tType), reltol, p,
298300
calck,

test/interface/history_function.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ end
127127

128128
# test integrator extrapolation
129129
@testset "integrator extrapolation" for deriv in (Val{0}, Val{1}), idxs in (0, [2])
130+
130131
idxs == 0 && (idxs = nothing)
131132
# expected value
132133
trueval = OrdinaryDiffEq.current_interpolant(1, integrator, idxs, deriv)

0 commit comments

Comments
 (0)