Skip to content

Commit baec6f3

Browse files
claudeChrisRackauckas
authored andcommitted
Fix JuliaFormatter line splits across DelayDiffEq.jl
- Combine split arithmetic expressions (integrator.tdir * integrator.t) - Combine split function constructor calls in fpsolve utilities - Combine split test assertions for better readability - Keep semantically related expressions on single lines under 120 chars This follows Catalyst.jl PR #1306 formatting guidelines to improve readability by avoiding unnecessary line splits that make code harder to follow. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
1 parent 3dc2cf1 commit baec6f3

File tree

6 files changed

+10
-26
lines changed

6 files changed

+10
-26
lines changed

src/fpsolve/utils.jl

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,13 @@ function build_fpsolver(alg, fpalg::Union{NLFunctional, NLAnderson}, u, uEltypeN
2424
dzold = zero(u)
2525
z₊old = zero(u)
2626

27-
fpcache = FPAndersonCache(
28-
atmp, dz, dzold, z₊old, Δz₊s, Q, R, γs, 0, fpalg.aa_start,
29-
fpalg.droptol)
27+
fpcache = FPAndersonCache(atmp, dz, dzold, z₊old, Δz₊s, Q, R, γs, 0, fpalg.aa_start, fpalg.droptol)
3028
end
3129

3230
# build solver
3331
ηold = one(uTolType)
3432

35-
FPSolver{typeof(fpalg), true, uTolType, typeof(fpcache)}(fpalg, uTolType(fpalg.κ),
36-
uTolType(fpalg.fast_convergence_cutoff),
37-
ηold, 10000,
38-
fpalg.max_iter,
39-
SlowConvergence, fpcache, 0)
33+
FPSolver{typeof(fpalg), true, uTolType, typeof(fpcache)}(fpalg, uTolType(fpalg.κ), uTolType(fpalg.fast_convergence_cutoff), ηold, 10000, fpalg.max_iter, SlowConvergence, fpcache, 0)
4034
end
4135

4236
function build_fpsolver(alg, fpalg::Union{NLFunctional, NLAnderson}, u, uEltypeNoUnits,

src/integrators/interface.jl

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,10 +418,7 @@ function DiffEqBase.reinit!(integrator::DDEIntegrator, u0 = integrator.sol.prob.
418418
# erase array of tracked discontinuities
419419
if order_discontinuity_t0 OrdinaryDiffEqCore.alg_maximum_order(integrator.alg)
420420
resize!(integrator.tracked_discontinuities, 1)
421-
integrator.tracked_discontinuities[1] = Discontinuity(
422-
integrator.tdir *
423-
integrator.t,
424-
order_discontinuity_t0)
421+
integrator.tracked_discontinuities[1] = Discontinuity(integrator.tdir * integrator.t, order_discontinuity_t0)
425422
else
426423
resize!(integrator.tracked_discontinuities, 0)
427424
end

test/interface/backwards.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ end
3232

3333
sol = solve!(dde_int)
3434
@test sol.errors[:l∞] < 3.9e-12 # 3.9e-15
35-
@test dde_int.tracked_discontinuities ==
36-
[Discontinuity(-2.0, 1), Discontinuity(-1.0, 2)]
35+
@test dde_int.tracked_discontinuities == [Discontinuity(-2.0, 1), Discontinuity(-1.0, 2)]
3736
@test isempty(dde_int.d_discontinuities_propagated)
3837
@test isempty(dde_int.opts.d_discontinuities)
3938
end

test/interface/dependent_delays.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ end
2121

2222
@test getfield.(dde_int.tracked_discontinuities, :t)
2323
getfield.(dde_int2.tracked_discontinuities, :t)
24-
@test getfield.(dde_int.tracked_discontinuities, :order) ==
25-
getfield.(dde_int2.tracked_discontinuities, :order)
24+
@test getfield.(dde_int.tracked_discontinuities, :order) == getfield.(dde_int2.tracked_discontinuities, :order)
2625

2726
# worse than results above with constant delays specified as scalars
2827
@test sol2.errors[:l∞] < 3.2e-3

test/interface/discontinuities.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ end
6565
@test length(integrator.opts.d_discontinuities) == 2 &&
6666
issubset([Discontinuity(0.3, 4), Discontinuity(0.6, 5)],
6767
integrator.opts.d_discontinuities.valtree)
68-
@test integrator.opts.d_discontinuities_cache ==
69-
[Discontinuity(0.3, 4), Discontinuity(0.6, 5)]
68+
@test integrator.opts.d_discontinuities_cache == [Discontinuity(0.3, 4), Discontinuity(0.6, 5)]
7069
end
7170

7271
# discontinuities induced by callbacks

test/interface/saveat.jl

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ end
3535

3636
# time point of solution
3737
if saveat isa Number
38-
@test sol2.t ==
39-
(save_start ? [0.0, 25.0, 50.0, 75.0, 100.0] : [25.0, 50.0, 75.0, 100.0])
38+
@test sol2.t == (save_start ? [0.0, 25.0, 50.0, 75.0, 100.0] : [25.0, 50.0, 75.0, 100.0])
4039
else
4140
@test sol2.t == (save_start ? [0.0, 25.0, 50.0, 75.0] : [25.0, 50.0, 75.0])
4241
end
@@ -64,8 +63,7 @@ end
6463

6564
# time point of solution
6665
if saveat isa Number
67-
@test sol2.t ==
68-
(save_end ? [0.0, 25.0, 50.0, 75.0, 100.0] : [0.0, 25.0, 50.0, 75.0])
66+
@test sol2.t == (save_end ? [0.0, 25.0, 50.0, 75.0, 100.0] : [0.0, 25.0, 50.0, 75.0])
6967
else
7068
@test sol2.t == (save_end ? [25.0, 50.0, 75.0, 100.0] : [25.0, 50.0, 75.0])
7169
end
@@ -92,8 +90,7 @@ end
9290
@test sol2.u == dde_int2.sol.u
9391

9492
# time points of solution
95-
@test symdiff(sol.t, sol2.t) ==
96-
(save_start ? [25.0, 50.0, 75.0] : [0.0, 25.0, 50.0, 75.0])
93+
@test symdiff(sol.t, sol2.t) == (save_start ? [25.0, 50.0, 75.0] : [0.0, 25.0, 50.0, 75.0])
9794

9895
# history is equal to solution above
9996
@test sol.t == dde_int2.integrator.sol.t
@@ -117,8 +114,7 @@ end
117114
@test sol2.u == dde_int2.sol.u
118115

119116
# time points of solution
120-
@test symdiff(sol.t, sol2.t) ==
121-
(save_end ? [25.0, 50.0, 75.0] : [100.0, 25.0, 50.0, 75.0])
117+
@test symdiff(sol.t, sol2.t) == (save_end ? [25.0, 50.0, 75.0] : [100.0, 25.0, 50.0, 75.0])
122118

123119
# history is equal to solution above
124120
@test sol.t == dde_int2.integrator.sol.t

0 commit comments

Comments
 (0)