update for set-or-update

jrising · Apr 23, 2021 · 1daf475 · 1daf475
1 parent bc53e78
commit 1daf475
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/OptiMimi.jl b/src/OptiMimi.jl
@@ -68,11 +68,11 @@ function setparameters(model::Model, components::Vector{Symbol}, names::Vector{S
     startindex = 1
     for (ii, len, isscalar) in Channel((chnl) -> nameindexes(model, components, names, chnl))
         if isscalar
-            set_param!(model, components[ii], names[ii], xx[startindex])
+            set_or_update_param!(model, components[ii], names[ii], xx[startindex])
         else
             shape = getdims(model, components[ii], names[ii])
             reshaped = reshape(collect(model.md.number_type, xx[startindex:(startindex+len - 1)]), tuple(shape...))
-            set_param!(model, components[ii], names[ii], reshaped)
+            set_or_update_param!(model, components[ii], names[ii], reshaped)
         end
         startindex += len
     end

diff --git a/src/metamimi.jl b/src/metamimi.jl
@@ -14,3 +14,15 @@ function getdimnames(model::Model, component::Symbol, name::Symbol)
         variable_dimensions(model, component, name)
     end
 end
+
+"""
+Avoid the distinction between set_param! and update_param!
+"""
+function set_or_update_param!(model::Model, component::Symbol, name::Symbol, value)
+    try
+        update_param!(model, name, value)
+    catch
+        set_param!(model, component, name, value)
+    end
+end
+