Skip to content

Commit a62fe60

Browse files
Merge pull request #3236 from AayushSabharwal/as/mtkmodel-nonnumeric-params
fix: fix nonnumeric parameters in `@mtkmodel`
2 parents ac39aab + d0748e6 commit a62fe60

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

src/systems/model_parsing.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@ function parse_variable_arg(dict, mod, arg, varclass, kwargs, where_types)
923923
end
924924

925925
push!(varexpr.args, metadata_expr)
926-
return vv isa Num ? name : :($name...), varexpr
926+
return symbolic_type(vv) == ScalarSymbolic() ? name : :($name...), varexpr
927927
else
928928
return vv
929929
end

test/model_parsing.jl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -979,3 +979,14 @@ end
979979
@test MultipleExtend.structure[:extend][1] == [:inmodel, :b, :inmodel_b]
980980
@test tosymbol.(parameters(multiple_extend)) == [:b, :inmodel_b₊p, :inmodel₊p]
981981
end
982+
983+
struct CustomStruct end
984+
@testset "Nonnumeric parameters" begin
985+
@mtkmodel MyModel begin
986+
@parameters begin
987+
p::CustomStruct
988+
end
989+
end
990+
@named sys = MyModel(p = CustomStruct())
991+
@test ModelingToolkit.defaults(sys)[@nonamespace sys.p] == CustomStruct()
992+
end

0 commit comments

Comments
 (0)