Skip to content

Commit c037622

Browse files
committed
fix formatting
1 parent fd39298 commit c037622

File tree

3 files changed

+27
-18
lines changed

3 files changed

+27
-18
lines changed

src/systems/callbacks.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ function compile_affect(affect::FunctionalAffect, sys, dvs, ps; kwargs...)
441441
end
442442

443443
function generate_timed_callback(cb, sys, dvs, ps; postprocess_affect_expr! = nothing,
444-
kwargs...)
444+
kwargs...)
445445
cond = condition(cb)
446446
as = compile_affect(affects(cb), sys, dvs, ps; expression = Val{false},
447447
postprocess_affect_expr!, kwargs...)
@@ -455,7 +455,7 @@ function generate_timed_callback(cb, sys, dvs, ps; postprocess_affect_expr! = no
455455
end
456456

457457
function generate_discrete_callback(cb, sys, dvs, ps; postprocess_affect_expr! = nothing,
458-
kwargs...)
458+
kwargs...)
459459
if is_timed_condition(cb)
460460
return generate_timed_callback(cb, sys, dvs, ps; postprocess_affect_expr!,
461461
kwargs...)

src/systems/jumps/jumpsystem.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ sol = solve(jprob, SSAStepper())
342342
```
343343
"""
344344
function JumpProcesses.JumpProblem(js::JumpSystem, prob, aggregator; callback = nothing,
345-
kwargs...)
345+
kwargs...)
346346
statetoid = Dict(value(state) => i for (i, state) in enumerate(states(js)))
347347
eqs = equations(js)
348348
invttype = prob.tspan[1] === nothing ? Float64 : typeof(1 / prob.tspan[2])

test/root_equations.jl

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ sys = structural_simplify(model)
338338
@test isempty(ModelingToolkit.continuous_events(sys))
339339

340340
let
341-
function testsol(osys, u0, p, tspan; tstops = Float64[], skipparamtest = false, kwargs...)
341+
function testsol(osys, u0, p, tspan; tstops = Float64[], skipparamtest = false,
342+
kwargs...)
342343
oprob = ODEProblem(osys, u0, tspan, p; kwargs...)
343344
sol = solve(oprob, Tsit5(); tstops = tstops, abstol = 1e-10, reltol = 1e-10)
344345
@test isapprox(sol(1.0000000001)[1] - sol(0.999999999)[1], 1.0; rtol = 1e-6)
@@ -401,22 +402,23 @@ let
401402
testsol(osys6, u0, p, tspan; tstops = [1.0, 2.0])
402403

403404
# mix a continuous event too
404-
cond3 = A ~ .1
405+
cond3 = A ~ 0.1
405406
affect3 = [k ~ 0.0]
406407
cb3 = cond3 => affect3
407408
@named osys7 = ODESystem(eqs, t, [A], [k, t1, t2], discrete_events = [cb1, cb2‵‵‵],
408409
continuous_events = [cb3])
409410
sol = testsol(osys7, u0, p, (0.0, 10.0); tstops = [1.0, 2.0], skipparamtest = true)
410-
@test isapprox(sol(10.0)[1], .1; atol=1e-10, rtol=1e-10)
411+
@test isapprox(sol(10.0)[1], 0.1; atol = 1e-10, rtol = 1e-10)
411412
end
412413

413414
let
414-
function testsol(ssys, u0, p, tspan; tstops = Float64[], skipparamtest = false, kwargs...)
415+
function testsol(ssys, u0, p, tspan; tstops = Float64[], skipparamtest = false,
416+
kwargs...)
415417
sprob = SDEProblem(ssys, u0, tspan, p; kwargs...)
416418
sol = solve(sprob, RI5(); tstops = tstops, abstol = 1e-10, reltol = 1e-10)
417419
@test isapprox(sol(1.0000000001)[1] - sol(0.999999999)[1], 1.0; rtol = 1e-4)
418420
!skipparamtest && (@test sprob.p[1] == 1.0)
419-
@test isapprox(sol(4.0)[1], 2 * exp(-2.0), atol=1e-4)
421+
@test isapprox(sol(4.0)[1], 2 * exp(-2.0), atol = 1e-4)
420422
sol
421423
end
422424

@@ -432,7 +434,8 @@ let
432434

433435
∂ₜ = Differential(t)
434436
eqs = [∂ₜ(A) ~ -k * A]
435-
@named ssys = SDESystem(eqs, Equation[], t, [A], [k, t1, t2], discrete_events = [cb1, cb2])
437+
@named ssys = SDESystem(eqs, Equation[], t, [A], [k, t1, t2],
438+
discrete_events = [cb1, cb2])
436439
u0 = [A => 1.0]
437440
p = [k => 0.0, t1 => 1.0, t2 => 2.0]
438441
tspan = (0.0, 4.0)
@@ -441,7 +444,8 @@ let
441444
cond1a = (t == t1)
442445
affect1a = [A ~ A + 1, B ~ A]
443446
cb1a = cond1a => affect1a
444-
@named ssys1 = SDESystem(eqs, Equation[], t, [A, B], [k, t1, t2], discrete_events = [cb1a, cb2])
447+
@named ssys1 = SDESystem(eqs, Equation[], t, [A, B], [k, t1, t2],
448+
discrete_events = [cb1a, cb2])
445449
u0′ = [A => 1.0, B => 0.0]
446450
sol = testsol(ssys1, u0′, p, tspan; tstops = [1.0, 2.0], check_length = false)
447451
@test sol(1.0000001, idxs = 2) == 2.0
@@ -453,7 +457,8 @@ let
453457
testsol(ssys‵, u0, p, tspan)
454458

455459
# mixing discrete affects
456-
@named ssys3 = SDESystem(eqs, Equation[], t, [A], [k, t1, t2], discrete_events = [cb1, cb2‵])
460+
@named ssys3 = SDESystem(eqs, Equation[], t, [A], [k, t1, t2],
461+
discrete_events = [cb1, cb2‵])
457462
testsol(ssys3, u0, p, tspan; tstops = [1.0])
458463

459464
# mixing with a func affect
@@ -462,29 +467,33 @@ let
462467
nothing
463468
end
464469
cb2‵‵ = [2.0] => (affect!, [], [k], nothing)
465-
@named ssys4 = SDESystem(eqs, Equation[], t, [A], [k, t1], discrete_events = [cb1, cb2‵‵])
470+
@named ssys4 = SDESystem(eqs, Equation[], t, [A], [k, t1],
471+
discrete_events = [cb1, cb2‵‵])
466472
testsol(ssys4, u0, p, tspan; tstops = [1.0])
467473

468474
# mixing with symbolic condition in the func affect
469475
cb2‵‵‵ = (t == t2) => (affect!, [], [k], nothing)
470-
@named ssys5 = SDESystem(eqs, Equation[], t, [A], [k, t1, t2], discrete_events = [cb1, cb2‵‵‵])
476+
@named ssys5 = SDESystem(eqs, Equation[], t, [A], [k, t1, t2],
477+
discrete_events = [cb1, cb2‵‵‵])
471478
testsol(ssys5, u0, p, tspan; tstops = [1.0, 2.0])
472-
@named ssys6 = SDESystem(eqs, Equation[], t, [A], [k, t1, t2], discrete_events = [cb2‵‵‵, cb1])
479+
@named ssys6 = SDESystem(eqs, Equation[], t, [A], [k, t1, t2],
480+
discrete_events = [cb2‵‵‵, cb1])
473481
testsol(ssys6, u0, p, tspan; tstops = [1.0, 2.0])
474482

475483
# mix a continuous event too
476-
cond3 = A ~ .1
484+
cond3 = A ~ 0.1
477485
affect3 = [k ~ 0.0]
478486
cb3 = cond3 => affect3
479-
@named ssys7 = SDESystem(eqs, Equation[], t, [A], [k, t1, t2], discrete_events = [cb1, cb2‵‵‵],
487+
@named ssys7 = SDESystem(eqs, Equation[], t, [A], [k, t1, t2],
488+
discrete_events = [cb1, cb2‵‵‵],
480489
continuous_events = [cb3])
481490
sol = testsol(ssys7, u0, p, (0.0, 10.0); tstops = [1.0, 2.0], skipparamtest = true)
482-
@test isapprox(sol(10.0)[1], .1; atol=1e-10, rtol=1e-10)
491+
@test isapprox(sol(10.0)[1], 0.1; atol = 1e-10, rtol = 1e-10)
483492
end
484493

485494
let rng = rng
486495
function testsol(jsys, u0, p, tspan; tstops = Float64[], skipparamtest = false,
487-
N = 40000, kwargs...)
496+
N = 40000, kwargs...)
488497
dprob = DiscreteProblem(jsys, u0, tspan, p)
489498
jprob = JumpProblem(jsys, dprob, Direct(); kwargs...)
490499
sol = solve(jprob, SSAStepper(); tstops = tstops)

0 commit comments

Comments
 (0)