Skip to content

Commit d7a41d9

Browse files
Merge pull request #2532 from SciML/myb/struct
Specialize symbolic `Struct`
2 parents 5ac4469 + 33845cf commit d7a41d9

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ SpecialFunctions = "0.7, 0.8, 0.9, 0.10, 1.0, 2"
104104
StaticArrays = "0.10, 0.11, 0.12, 1.0"
105105
SymbolicIndexingInterface = "0.3.1"
106106
SymbolicUtils = "1.0"
107-
Symbolics = "5.20.1"
107+
Symbolics = "5.24"
108108
URIs = "1"
109109
UnPack = "0.1, 1.0"
110110
Unitful = "1.1"

src/systems/index_cache.jl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ struct BufferTemplate
33
length::Int
44
end
55

6+
function BufferTemplate(s::Type{<:Symbolics.Struct}, length::Int)
7+
T = Symbolics.juliatype(s)
8+
BufferTemplate(T, length)
9+
end
10+
611
const DEPENDENT_PORTION = :dependent
712
const NONNUMERIC_PORTION = :nonnumeric
813

src/systems/parameter_buffer.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
symconvert(::Type{Symbolics.Struct{T}}, x) where {T} = convert(T, x)
2+
symconvert(::Type{T}, x) where {T} = convert(T, x)
13
struct MTKParameters{T, D, C, E, N, F, G}
24
tunable::T
35
discrete::D
@@ -81,7 +83,7 @@ function MTKParameters(sys::AbstractSystem, p; tofloat = false, use_union = fals
8183
for (sym, val) in p
8284
sym = unwrap(sym)
8385
ctype = concrete_symtype(sym)
84-
val = convert(ctype, fixpoint_sub(val, p))
86+
val = symconvert(ctype, fixpoint_sub(val, p))
8587
done = set_value(sym, val)
8688
if !done && Symbolics.isarraysymbolic(sym)
8789
done = all(set_value.(collect(sym), val))

0 commit comments

Comments
 (0)