Merge branch 'master' into delete

Author: corakingdon

src/core/references.jl

@@ -11,6 +11,19 @@ function set_param!(ref::ComponentReference, name::Symbol, value)
     set_param!(parent(ref), compdef, name, unique_name, value)
 end
 
+"""
+    update_param!(ref::ComponentReference, name::Symbol, value)
+
+Update a component parameter as `update_param!(reference, name, value)`.
+This uses the unique name :compname_paramname in the model's external parameter list, 
+and updates the parameter only in the referenced component to that value.
+"""
+function update_param!(ref::ComponentReference, name::Symbol, value)
+    compdef = find_comp(ref)
+    unique_name = Symbol("$(compdef.name)_$name")
+    update_param!(parent(ref), unique_name, value)
+end
+
 """
     Base.setindex!(ref::ComponentReference, value, name::Symbol)
 
@@ -19,7 +32,13 @@ This creates a unique name :compname_paramname in the model's external parameter
 and sets the parameter only in the referenced component to that value.
 """
 function Base.setindex!(ref::ComponentReference, value, name::Symbol)
-    set_param!(ref, name, value)
+    compdef = find_comp(ref)
+    unique_name = Symbol("$(compdef.name)_$name")
+    if has_parameter(parent(ref), unique_name)
+        update_param!(ref, name, value)
+    else
+        set_param!(ref, name, value)
+    end
 end
 
 """

src/core/types/model.jl

@@ -24,6 +24,11 @@ mutable struct Model <: AbstractModel
     function Model(m::Model)
         return new(deepcopy(m.md), nothing)
     end
+
+    # Create a model from a ModelInstance (temporary for explore call)
+    function Model(mi::ModelInstance)
+        return new(deepcopy(mi.md), deepcopy(mi))
+    end
 end
 
 """

src/explorer/explore.jl

@@ -52,6 +52,12 @@ function explore(m::Model; title = "Electron")
 
 end
 
+function explore(mi::ModelInstance; title = "Electron")
+    m = Model(mi)
+    m.md.dirty = false # we need this to get explorer working, but it's a hack and should be temporary!
+    explore(m)
+end
+
 """
     explore(sim_inst::SimulationInstance; title="Electron", model_index::Int = 1, scen_name::Union{Nothing, String} = nothing, results_output_dir::Union{Nothing, String} = nothing)
 

test/test_references.jl

@@ -52,4 +52,9 @@ connect_param!(refC, refA, :v1)
 run(m)
 @test m[:C, :v1] == collect(1:10)
 
+# test `update_param!` for references
+refA[:p1] = 10
+run(m)
+@test m[:foo, :p1] == 10
+
 end