From be221565adfeaf735592ae5bebb9b117c8ff2c11 Mon Sep 17 00:00:00 2001 From: contradict Date: Sun, 12 Nov 2023 09:39:57 -0800 Subject: [PATCH] Formatting --- src/systems/abstractsystem.jl | 12 +++++++----- test/variable_scope.jl | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/systems/abstractsystem.jl b/src/systems/abstractsystem.jl index 2851d2fe02..69e0e86545 100644 --- a/src/systems/abstractsystem.jl +++ b/src/systems/abstractsystem.jl @@ -394,7 +394,7 @@ end abstract type SymScope end struct LocalScope <: SymScope end -function LocalScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, N}}) where N +function LocalScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, N}}) where {N} apply_to_variables(sym) do sym setmetadata(sym, SymScope, LocalScope()) end @@ -403,7 +403,7 @@ end struct ParentScope <: SymScope parent::SymScope end -function ParentScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, N}}) where N +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()))) @@ -414,16 +414,18 @@ struct DelayParentScope <: SymScope parent::SymScope N::Int end -function DelayParentScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, M}}, N) where M +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)) end end -DelayParentScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, N}}) where N = 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, Symbolics.Arr{Num, N}}) where N +function GlobalScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num, N}}) where {N} apply_to_variables(sym) do sym setmetadata(sym, SymScope, GlobalScope()) end diff --git a/test/variable_scope.jl b/test/variable_scope.jl index a435f142b7..7efdc43028 100644 --- a/test/variable_scope.jl +++ b/test/variable_scope.jl @@ -75,8 +75,8 @@ ps = ModelingToolkit.getname.(parameters(level3)) @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 +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"))