Skip to content

Apply scoping to array inside getindex operation #2354

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+47 −11
Open

Apply scoping to array inside getindex operation #2354

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
ee32000
Add test for scoping of array paramters
contradict Nov 12, 2023
102f6fd
Allow attaching scope metadata to arrays
contradict Nov 12, 2023
fd24537
Convert XXXScope(x[1]) to XXXScope(x)[1]
contradict Nov 14, 2023
8b1084a
Format test
contradict Nov 14, 2023
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
50 changes: 39 additions & 11 deletions src/systems/abstractsystem.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,38 +394,66 @@ end
abstract type SymScope end

struct LocalScope <: SymScope end
function LocalScope(sym::Union{Num, Symbolic})
function LocalScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, N}}) where {N}
apply_to_variables(sym) do sym
setmetadata(sym, SymScope, LocalScope())
if istree(sym) && operation(sym) == getindex
args = arguments(sym)
a1 = setmetadata(args[1], SymScope, LocalScope())
similarterm(sym, operation(sym), [a1, args[2:end]...])
else
setmetadata(sym, SymScope, LocalScope())
end
end
end

struct ParentScope <: SymScope
parent::SymScope
end
function ParentScope(sym::Union{Num, Symbolic})
function ParentScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, N}}) where {N}
apply_to_variables(sym) do sym
setmetadata(sym, SymScope,
ParentScope(getmetadata(value(sym), SymScope, LocalScope())))
if istree(sym) && operation(sym) == getindex
args = arguments(sym)
a1 = setmetadata(args[1], SymScope,
ParentScope(getmetadata(value(args[1]), SymScope, LocalScope())))
similarterm(sym, operation(sym), [a1, args[2:end]...])
else
setmetadata(sym, SymScope,
ParentScope(getmetadata(value(sym), SymScope, LocalScope())))
end
end
end

struct DelayParentScope <: SymScope
parent::SymScope
N::Int
end
function DelayParentScope(sym::Union{Num, Symbolic}, N)
function DelayParentScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, M}}, N) where {M}
apply_to_variables(sym) do sym
setmetadata(sym, SymScope,
DelayParentScope(getmetadata(value(sym), SymScope, LocalScope()), N))
if istree(sym) && operation(sym) == getindex
args = arguments(sym)
a1 = setmetadata(args[1], SymScope,
DelayParentScope(getmetadata(value(args[1]), SymScope, LocalScope()), N))
similarterm(sym, operation(sym), [a1, args[2:end]...])
else
setmetadata(sym, SymScope,
DelayParentScope(getmetadata(value(sym), SymScope, LocalScope()), N))
end
end
end
DelayParentScope(sym::Union{Num, Symbolic}) = DelayParentScope(sym, 1)
function DelayParentScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, N}}) where {N}
DelayParentScope(sym, 1)
end

struct GlobalScope <: SymScope end
function GlobalScope(sym::Union{Num, Symbolic})
function GlobalScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, N}}) where {N}
apply_to_variables(sym) do sym
setmetadata(sym, SymScope, GlobalScope())
if istree(sym) && operation(sym) == getindex
args = arguments(sym)
a1 = setmetadata(args[1], SymScope, GlobalScope())
similarterm(sym, operation(sym), [a1, args[2:end]...])
else
setmetadata(sym, SymScope, GlobalScope())
end
end
end

Expand Down
8 changes: 8 additions & 0 deletions test/variable_scope.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,11 @@ ps = ModelingToolkit.getname.(parameters(level3))
@test isequal(ps[4], :level2₊level0₊d)
@test isequal(ps[5], :level1₊level0₊e)
@test isequal(ps[6], :f)

@parameters xx[1:2]
arr_p = [ParentScope(xx[1]), xx[2]]
arr0 = ODESystem(Equation[], t, [], arr_p; name = :arr0)
arr1 = ODESystem(Equation[], t, [], []; name = :arr1) ∘ arr0
arr_ps = ModelingToolkit.getname.(parameters(arr1))
@test isequal(arr_ps[1], Symbol("xx"))
@test isequal(arr_ps[2], Symbol("arr0₊xx"))