Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Make build explicit observed function return Expr when expression=true #3454

Merged
merged 5 commits into from
Mar 17, 2025
Merged

Fix: Make build explicit observed function return Expr when expression=true #3454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e87b804
fix: return `Expr` for `expression=true` in `build_explicit_observed_…
ashutosh-b-b Mar 12, 2025
6b7939a
test: add tests to check Expr is returned
ashutosh-b-b Mar 12, 2025
8386886
chore: fix formatting
ashutosh-b-b Mar 12, 2025
508cd8a
test: add testsets for obs func expr
ashutosh-b-b Mar 13, 2025
3d5fdd8
test: isolate tests into new testset
AayushSabharwal Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/systems/diffeqs/odesystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,12 +567,18 @@ function build_explicit_observed_function(sys, ts;
sys, ts, args...; p_start, p_end, filter_observed = obsfilter,
output_type, mkarray, try_namespaced = true, expression = Val{true})
if fns isa Tuple
if expression
return return_inplace ? fns : fns[1]
end
oop, iip = eval_or_rgf.(fns; eval_expression, eval_module)
f = GeneratedFunctionWrapper{(
p_start + is_dde(sys), length(args) - length(ps) + 1 + is_dde(sys), is_split(sys))}(
oop, iip)
return return_inplace ? (f, f) : f
else
if expression
return fns
end
f = eval_or_rgf(fns; eval_expression, eval_module)
f = GeneratedFunctionWrapper{(
p_start + is_dde(sys), length(args) - length(ps) + 1 + is_dde(sys), is_split(sys))}(
Expand Down
12 changes: 12 additions & 0 deletions test/odesystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1724,3 +1724,15 @@ end
@mtkbuild ode = ODESystem(D(x(t)) ~ mat * x(t), t; constraints = cons)
@test length(constraints(ModelingToolkit.get_constraintsystem(ode))) == 5
end

@testset "`build_explicit_observed_function` with `expression = true` returns `Expr`" begin
@variables x(t)
@mtkbuild sys = ODESystem(D(x) ~ 2x, t)
obsfn_expr = ModelingToolkit.build_explicit_observed_function(
sys, 2x + 1, expression = true)
@test obsfn_expr isa Expr
obsfn_expr_oop, obsfn_expr_iip = ModelingToolkit.build_explicit_observed_function(
sys, [x + 1, x + 2, x + t], return_inplace = true, expression = true)
@test obsfn_expr_oop isa Expr
@test obsfn_expr_iip isa Expr
end
Loading