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

Jump to bottom

Relax type constraints to allow callable parameters in pdeps #3079

Merged
merged 4 commits into from
Oct 5, 2024
Merged

Relax type constraints to allow callable parameters in pdeps #3079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5454834
refactor: relax type constraints to allow callable parameters in pdeps
SebastianM-C Sep 26, 2024
61d986c
refactor: avoid type parameters in IndexCache
SebastianM-C Sep 27, 2024
535fd52
test: add test for callable pdeps
SebastianM-C Sep 27, 2024
6f96622
test: fix pdeps test
SebastianM-C Oct 4, 2024
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
3 changes: 2 additions & 1 deletion src/systems/abstractsystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3090,7 +3090,7 @@ function process_parameter_dependencies(pdeps, ps)
end
for p in pdeps]
end
lhss = BasicSymbolic[]
lhss = []
for p in pdeps
if !isparameter(p.lhs)
error("LHS of parameter dependency must be a single parameter. Found $(p.lhs).")
Expand All @@ -3101,6 +3101,7 @@ function process_parameter_dependencies(pdeps, ps)
end
push!(lhss, p.lhs)
end
lhss = map(identity, lhss)
pdeps = topsort_equations(pdeps, union(ps, lhss))
ps = filter(ps) do p
!any(isequal(p), lhss)
Expand Down
5 changes: 3 additions & 2 deletions src/systems/index_cache.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ struct IndexCache
constant_idx::ParamIndexMap
nonnumeric_idx::NonnumericMap
observed_syms::Set{BasicSymbolic}
dependent_pars::Set{BasicSymbolic}
dependent_pars::Set{Union{BasicSymbolic, CallWithMetadata}}
discrete_buffer_sizes::Vector{Vector{BufferTemplate}}
tunable_buffer_size::BufferTemplate
constant_buffer_sizes::Vector{BufferTemplate}
Expand Down Expand Up @@ -275,7 +275,8 @@ function IndexCache(sys::AbstractSystem)
end
end

dependent_pars = Set{BasicSymbolic}()
dependent_pars = Set{Union{BasicSymbolic, CallWithMetadata}}()

for eq in parameter_dependencies(sys)
sym = eq.lhs
ttsym = default_toterm(sym)
Expand Down
23 changes: 23 additions & 0 deletions test/parameter_dependencies.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,29 @@ end
@test SciMLBase.successful_retcode(sol)
end

struct CallableFoo
p::Any
end

@register_symbolic CallableFoo(x)

(f::CallableFoo)(x) = f.p + x

@testset "callable parameters" begin
@variables y(t) = 1
@parameters p=2 (i::CallableFoo)(..)

eqs = [D(y) ~ i(t) + p]
@named model = ODESystem(eqs, t, [y], [p, i];
parameter_dependencies = [i ~ CallableFoo(p)])
sys = structural_simplify(model)

prob = ODEProblem(sys, [], (0.0, 1.0))
sol = solve(prob, Tsit5())

@test SciMLBase.successful_retcode(sol)
end

@testset "Clock system" begin
dt = 0.1
@variables x(t) y(t) u(t) yd(t) ud(t) r(t) z(t)
Expand Down
Loading