Skip to content

Commit 48d1826

Browse files
committed
more test fixes
1 parent b1f0fd2 commit 48d1826

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

src/inputoutput.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ has_var(ex, x) = x ∈ Set(get_variables(ex))
163163
(f_oop, f_ip), x_sym, p_sym, io_sys = generate_control_function(
164164
sys::AbstractODESystem,
165165
inputs = unbound_inputs(sys),
166-
disturbance_inputs = Any[];
166+
disturbance_inputs = disturbances(sys);
167167
implicit_dae = false,
168168
simplify = false,
169169
)

test/code_generation.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ end
7070
@parameters p[1:2] (f::Function)(..)
7171
@named sys = ODESystem(
7272
[D(x[0]) ~ p[1] * x[0] + x[2], D(x[1]) ~ p[2] * f(x) + x[2]], t)
73-
sys, = structural_simplify(sys, inputs = [x[2]], outputs = [])
73+
sys = structural_simplify(sys, inputs = [x[2]], outputs = [])
7474
@test is_parameter(sys, x[2])
7575
prob = ODEProblem(sys, [x[0] => 1.0, x[1] => 1.0], (0.0, 1.0),
7676
[p => ones(2), f => sum, x[2] => 2.0])

test/extensions/test_infiniteopt.jl

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ using ModelingToolkit: D_nounits as D, t_nounits as t, varmap_to_vars
2222
end
2323
@named model = Pendulum()
2424
model = complete(model)
25-
2625
inputs = [model.τ]
26+
outputs = [model.y]
27+
28+
model = structural_simplify(model; inputs, outputs)
2729
(f_oop, f_ip), dvs, psym, io_sys = ModelingToolkit.generate_control_function(
28-
model, inputs, split = false)
30+
model, split = false)
2931

30-
outputs = [model.y]
31-
f_obs = ModelingToolkit.build_explicit_observed_function(io_sys, outputs; inputs = inputs)
32+
f_obs = ModelingToolkit.build_explicit_observed_function(io_sys, [model.y]; inputs)
3233

3334
expected_state_order = [model.θ, model.ω]
3435
permutation = [findfirst(isequal(x), expected_state_order) for x in dvs] # This maps our expected state order to the actual state order

0 commit comments

Comments
 (0)