Skip to content

Commit 44c4306

Browse files
committed
format
1 parent 93428f5 commit 44c4306

File tree

4 files changed

+18
-12
lines changed

4 files changed

+18
-12
lines changed

docs/src/basics/MTKLanguage.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ using ModelingToolkit: t
228228
end
229229
```
230230

231-
232231
#### `@discrete_events` begin block
233232

234233
- Defining discrete events as described [here](https://docs.sciml.ai/ModelingToolkit/stable/basics/Events/#Discrete-events-support).

src/systems/callbacks.jl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -244,9 +244,12 @@ struct SymbolicContinuousCallback <: AbstractCallback
244244
end # Default affect to nothing
245245
end
246246

247-
SymbolicContinuousCallback(p::Pair, args...; kwargs...) = SymbolicContinuousCallback(p[1], p[2], args...; kwargs...)
247+
function SymbolicContinuousCallback(p::Pair, args...; kwargs...)
248+
SymbolicContinuousCallback(p[1], p[2], args...; kwargs...)
249+
end
248250

249-
function SymbolicContinuousCallback(cb::SymbolicContinuousCallback, args...; iv = nothing, alg_eqs = Equation[], kwargs...)
251+
function SymbolicContinuousCallback(cb::SymbolicContinuousCallback, args...;
252+
iv = nothing, alg_eqs = Equation[], kwargs...)
250253
cb
251254
end
252255

@@ -461,7 +464,9 @@ struct SymbolicDiscreteCallback <: AbstractCallback
461464
end # Default affect to nothing
462465
end
463466

464-
SymbolicDiscreteCallback(p::Pair, args...; kwargs...) = SymbolicDiscreteCallback(p[1], p[2], args...; kwargs...)
467+
function SymbolicDiscreteCallback(p::Pair, args...; kwargs...)
468+
SymbolicDiscreteCallback(p[1], p[2], args...; kwargs...)
469+
end
465470
SymbolicDiscreteCallback(cb::SymbolicDiscreteCallback, args...; kwargs...) = cb
466471

467472
"""

src/systems/model_parsing.jl

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ function _model_macro(mod, name, expr, isconnector)
129129

130130
push!(exprs.args, :(alg_eqs = $(alg_equations)(var"#___sys___")))
131131
d_evt_exs = map(d_evts) do evt
132-
length(evt.args) == 2 ?
132+
length(evt.args) == 2 ?
133133
:($SymbolicDiscreteCallback($(evt.args[1]); iv = $iv, alg_eqs, $(evt.args[2]...))) :
134134
:($SymbolicDiscreteCallback($(evt.args[1]); iv = $iv, alg_eqs))
135135
end
@@ -138,8 +138,9 @@ function _model_macro(mod, name, expr, isconnector)
138138
:($Setfield.@set!(var"#___sys___".discrete_events=[$(d_evt_exs...)])))
139139

140140
c_evt_exs = map(c_evts) do evt
141-
length(evt.args) == 2 ?
142-
:($SymbolicContinuousCallback($(evt.args[1]); iv = $iv, alg_eqs, $(evt.args[2]...))) :
141+
length(evt.args) == 2 ?
142+
:($SymbolicContinuousCallback(
143+
$(evt.args[1]); iv = $iv, alg_eqs, $(evt.args[2]...))) :
143144
:($SymbolicContinuousCallback($(evt.args[1]); iv = $iv, alg_eqs))
144145
end
145146
!isempty(c_evts) && push!(exprs.args,
@@ -1133,9 +1134,9 @@ function parse_continuous_events!(c_evts, dict, body)
11331134
dict[:continuous_events] = []
11341135
Base.remove_linenums!(body)
11351136
for line in body.args
1136-
if length(line.args) == 3 && line.args[1] == :(=>)
1137+
if length(line.args) == 3 && line.args[1] == :(=>)
11371138
push!(c_evts, :(($line,)))
1138-
elseif length(line.args) == 2
1139+
elseif length(line.args) == 2
11391140
event = line.args[1]
11401141
kwargs = parse_event_kwargs(line.args[2])
11411142
push!(c_evts, :(($event, $kwargs)))
@@ -1150,9 +1151,9 @@ function parse_discrete_events!(d_evts, dict, body)
11501151
dict[:discrete_events] = []
11511152
Base.remove_linenums!(body)
11521153
for line in body.args
1153-
if length(line.args) == 3 && line.args[1] == :(=>)
1154+
if length(line.args) == 3 && line.args[1] == :(=>)
11541155
push!(d_evts, :(($line,)))
1155-
elseif length(line.args) == 2
1156+
elseif length(line.args) == 2
11561157
event = line.args[1]
11571158
kwargs = parse_event_kwargs(line.args[2])
11581159
push!(d_evts, :(($event, $kwargs)))

test/symbolic_indexing_interface.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ end
229229
@testset "`timeseries_parameter_index` on unwrapped scalarized timeseries parameter" begin
230230
@variables x(t)[1:2]
231231
@parameters p(t)[1:2, 1:2]
232-
ev = SymbolicContinuousCallback([x[1] ~ 2.0] => [p ~ -ones(2, 2)], discrete_parameters = [p])
232+
ev = SymbolicContinuousCallback(
233+
[x[1] ~ 2.0] => [p ~ -ones(2, 2)], discrete_parameters = [p])
233234
@mtkbuild sys = ODESystem(D(x) ~ p * x, t; continuous_events = [ev])
234235
p = ModelingToolkit.unwrap(p)
235236
@test timeseries_parameter_index(sys, p) === ParameterTimeseriesIndex(1, (1, 1))

0 commit comments

Comments
 (0)