Merge pull request #2929 from AayushSabharwal/as/mtkparams-methods

fix: several MTKParameters fixes
SciML · Oct 23, 2024 · 1f2d943 · 1f2d943
2 parents 57dcc7e + 94f1c3d
commit 1f2d943
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/systems/parameter_buffer.jl b/src/systems/parameter_buffer.jl
@@ -59,7 +59,7 @@ function MTKParameters(
     end
     p = Dict()
     missing_params = Set()
-    pdeps = has_parameter_dependencies(sys) ? parameter_dependencies(sys) : nothing
+    pdeps = has_parameter_dependencies(sys) ? parameter_dependencies(sys) : []
 
     for sym in all_ps
         ttsym = default_toterm(sym)
@@ -92,7 +92,7 @@ function MTKParameters(
         delete!(missing_params, ttsym)
     end
 
-    if pdeps !== nothing
+    if !isempty(pdeps)
         for eq in pdeps
             sym = eq.lhs
             expr = eq.rhs
@@ -279,10 +279,7 @@ function SciMLStructures.canonicalize(::SciMLStructures.Tunable, p::MTKParameter
     arr = p.tunable
     repack = let p = p
         function (new_val)
-            if new_val !== p.tunable
-                copyto!(p.tunable, new_val)
-            end
-            return p
+            return SciMLStructures.replace(SciMLStructures.Tunable(), p, new_val)
         end
     end
     return arr, repack, true
@@ -303,12 +300,9 @@ for (Portion, field, recurse) in [(SciMLStructures.Discrete, :discrete, 1)
                                   (Nonnumeric, :nonnumeric, 1)]
     @eval function SciMLStructures.canonicalize(::$Portion, p::MTKParameters)
         as_vector = buffer_to_arraypartition(p.$field)
-        repack = let as_vector = as_vector, p = p
+        repack = let p = p
             function (new_val)
-                if new_val !== as_vector
-                    update_tuple_of_buffers(new_val, p.$field)
-                end
-                p
+                return SciMLStructures.replace(($Portion)(), p, new_val)
             end
         end
         return as_vector, repack, true
@@ -678,6 +672,10 @@ end
     return len
 end
 
+Base.size(ps::MTKParameters) = (length(ps),)
+
+Base.IndexStyle(::Type{T}) where {T <: MTKParameters} = IndexLinear()
+
 Base.getindex(p::MTKParameters, pind::ParameterIndex) = parameter_values(p, pind)
 
 Base.setindex!(p::MTKParameters, val, pind::ParameterIndex) = set_parameter!(p, val, pind)

diff --git a/test/mtkparameters.jl b/test/mtkparameters.jl
@@ -53,7 +53,7 @@ for (portion, values) in [(Tunable(), [1.0, 5.0, 6.0, 7.0])
     SciMLStructures.replace!(portion, ps, ones(length(buffer)))
     # make sure it is in-place
     @test all(isone, canonicalize(portion, ps)[1])
-    repack(zeros(length(buffer)))
+    global ps = repack(zeros(length(buffer)))
     @test all(iszero, canonicalize(portion, ps)[1])
 end