Skip to content

Commit 7a234f1

Browse files
committed
format
1 parent 15a6236 commit 7a234f1

File tree

6 files changed

+15
-10
lines changed

6 files changed

+15
-10
lines changed

src/inputoutput.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ function generate_control_function(sys::AbstractODESystem, inputs = unbound_inpu
200200
check_simplified = true,
201201
kwargs...)
202202
# Remove this when the ControlFunction gets merged.
203-
if check_simplified && !iscomplete(sys)
203+
if check_simplified && !iscomplete(sys)
204204
error("A completed `ODESystem` is required. Call `complete` or `structural_simplify` on the system before creating the control function.")
205205
end
206206
isempty(inputs) && @warn("No unbound inputs were found in system.")

src/linearization.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ function markio!(state, orig_inputs, inputs, outputs, disturbances; check = true
607607
end
608608
(all(values(outputset)) || error(
609609
"Some specified outputs were not found in system. The following Dict indicates the found variables ",
610-
outputset))
610+
outputset))
611611
end
612612
state, orig_inputs
613613
end

src/systems/systems.jl

+4-2
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ function __structural_simplify(sys::AbstractSystem; simplify = false,
9393
end
9494
end
9595
if isempty(brown_vars)
96-
return structural_simplify!(state; simplify, inputs, outputs, disturbance_inputs, kwargs...)
96+
return structural_simplify!(
97+
state; simplify, inputs, outputs, disturbance_inputs, kwargs...)
9798
else
9899
Is = Int[]
99100
Js = Int[]
@@ -125,7 +126,8 @@ function __structural_simplify(sys::AbstractSystem; simplify = false,
125126
for (i, v) in enumerate(fullvars)
126127
if !iszero(new_idxs[i]) &&
127128
invview(var_to_diff)[i] === nothing]
128-
ode_sys = structural_simplify(sys; simplify, inputs, outputs, disturbance_inputs, kwargs...)
129+
ode_sys = structural_simplify(
130+
sys; simplify, inputs, outputs, disturbance_inputs, kwargs...)
129131
eqs = equations(ode_sys)
130132
sorted_g_rows = zeros(Num, length(eqs), size(g, 2))
131133
for (i, eq) in enumerate(eqs)

src/systems/systemstructure.jl

+3-3
Original file line numberDiff line numberDiff line change
@@ -659,10 +659,9 @@ end
659659

660660
function structural_simplify!(state::TearingState; simplify = false,
661661
check_consistency = true, fully_determined = true, warn_initialize_determined = true,
662-
inputs = Any[], outputs = Any[],
662+
inputs = Any[], outputs = Any[],
663663
disturbance_inputs = Any[],
664664
kwargs...)
665-
666665
if state.sys isa ODESystem
667666
ci = ModelingToolkit.ClockInference(state)
668667
ci = ModelingToolkit.infer_clocks!(ci)
@@ -725,7 +724,8 @@ function _structural_simplify!(state::TearingState; simplify = false,
725724
else
726725
check_consistency = true
727726
end
728-
has_io = !isempty(inputs) || !isempty(outputs) !== nothing || !isempty(disturbance_inputs)
727+
has_io = !isempty(inputs) || !isempty(outputs) !== nothing ||
728+
!isempty(disturbance_inputs)
729729
orig_inputs = Set()
730730
if has_io
731731
ModelingToolkit.markio!(state, orig_inputs, inputs, outputs, disturbance_inputs)

test/clock.jl

+4-2
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,11 @@ By inference:
6565
ci, varmap = infer_clocks(sys)
6666
eqmap = ci.eq_domain
6767
tss, inputs, continuous_id = ModelingToolkit.split_system(deepcopy(ci))
68-
sss = ModelingToolkit._structural_simplify!(deepcopy(tss[continuous_id]), inputs = inputs[continuous_id], outputs = [])
68+
sss = ModelingToolkit._structural_simplify!(
69+
deepcopy(tss[continuous_id]), inputs = inputs[continuous_id], outputs = [])
6970
@test equations(sss) == [D(x) ~ u - x]
70-
sss = ModelingToolkit._structural_simplify!(deepcopy(tss[1]), inputs = inputs[1], outputs = [])
71+
sss = ModelingToolkit._structural_simplify!(
72+
deepcopy(tss[1]), inputs = inputs[1], outputs = [])
7173
@test isempty(equations(sss))
7274
d = Clock(dt)
7375
k = ShiftIndex(d)

test/input_output_handling.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,8 @@ end
202202

203203
@named sys = ODESystem(eqs, t)
204204
sys = structural_simplify(sys, inputs = [u], disturbance_inputs = [d])
205-
f, dvs, ps, io_sys = ModelingToolkit.generate_control_function(sys; simplify, split, disturbance_argument = true)
205+
f, dvs, ps, io_sys = ModelingToolkit.generate_control_function(
206+
sys; simplify, split, disturbance_argument = true)
206207

207208
@test isequal(dvs[], x)
208209
@test isempty(ps)

0 commit comments

Comments
 (0)