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

Flatten for complex #2935

Merged
merged 3 commits into from
Aug 8, 2024
Merged

Flatten for complex #2935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
deb0b90
Add test for complex equations
contradict Aug 7, 2024
17311e7
Flatten equations to handle complex equations.
contradict Aug 6, 2024
9eb7e8c
Run formatter
contradict Aug 7, 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
10 changes: 8 additions & 2 deletions src/systems/model_parsing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ for f in (:connector, :mtkmodel)
end
end

flatten_equations(eqs::Vector{Equation}, eq::Equation) = vcat(eqs, [eq])
flatten_equations(eq::Vector{Equation}, eqs::Vector{Equation}) = vcat(eq, eqs)
function flatten_equations(eqs::Vector{Union{Equation, Vector{Equation}}})
foldl(flatten_equations, eqs; init = Equation[])
end

function _model_macro(mod, name, expr, isconnector)
exprs = Expr(:block)
dict = Dict{Symbol, Any}(
Expand All @@ -56,7 +62,7 @@ function _model_macro(mod, name, expr, isconnector)
push!(exprs.args, :(variables = []))
push!(exprs.args, :(parameters = []))
push!(exprs.args, :(systems = ODESystem[]))
push!(exprs.args, :(equations = Equation[]))
push!(exprs.args, :(equations = Union{Equation, Vector{Equation}}[]))
push!(exprs.args, :(defaults = Dict{Num, Union{Number, Symbol, Function}}()))

Base.remove_linenums!(expr)
Expand Down Expand Up @@ -106,7 +112,7 @@ function _model_macro(mod, name, expr, isconnector)
@inline pop_structure_dict!.(
Ref(dict), [:constants, :defaults, :kwargs, :structural_parameters])

sys = :($ODESystem($Equation[equations...], $iv, variables, parameters;
sys = :($ODESystem($(flatten_equations)(equations), $iv, variables, parameters;
name, systems, gui_metadata = $gui_metadata, defaults))

if ext[] === nothing
Expand Down
16 changes: 16 additions & 0 deletions test/complex.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using ModelingToolkit
using ModelingToolkit: t_nounits as t
using Test

@mtkmodel ComplexModel begin
@variables begin
x(t)
y(t)
z(t)::Complex
end
@equations begin
z ~ x + im * y
end
end
@named mixed = ComplexModel()
@test length(equations(mixed)) == 2
1 change: 1 addition & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ end
@safetestset "Initial Values Test" include("initial_values.jl")
@safetestset "Discrete System" include("discrete_system.jl")
@safetestset "Equation Type Accessors Test" include("equation_type_accessors.jl")
@safetestset "Equations with complex values" include("complex.jl")
end
end

Expand Down
Loading