MC changes for estimation

Author: Brian-Pacula

src/abstractmodel.jl

@@ -102,6 +102,34 @@ function (<=)(m::AbstractModel{T}, p::AbstractParameter{T}) where T
 end
 
 
+
+"""
+```
+(<=)(m::AbstractModel{T}, p::AbstractParameter{T}) where T
+```
+
+Syntax for adding a parameter to a model: m <= parameter.
+NOTE: If `p` is added to `m` and length(m.steady_state) > 0, `keys(m)` will not generate the
+index of `p` in `get_parameters(m)`.
+"""
+function (<=)(m::AbstractModel{T}, p::AbstractVectorParameter{V,T}) where {V,T}
+
+    if !in(p.key, keys(m.keys))
+
+        new_param_index = length(m.keys) + 1
+
+        # grow parameters and add the parameter
+        push!(get_parameters(m), p)
+
+        # add parameter location to dict
+        setindex!(m.keys, new_param_index, p.key)
+    else
+        # overwrite the previous parameter with the new one
+        setindex!(m, p, p.key)
+    end
+end
+
+
 """
 ```
 (<=)(m::AbstractModel{T}, p::AbstractVectorParameter{T}) where T

src/parameters.jl

@@ -497,7 +497,6 @@ function parameter_ad(key::Symbol,
 
     # If fixed=true, force bounds to match and leave prior as null.  We need to define new
     # variable names here because of lexical scoping.
-
     valuebounds_new = valuebounds
     transform_parameterization_new = transform_parameterization
     transform_new = transform
@@ -595,7 +594,7 @@ function parameter(p::UnscaledParameter{T,U}, newvalue::T) where {T <: Number, U
 end
 
 function parameter_ad(p::UnscaledParameterAD{S,T,U}, newvalue::Snew;
-                   change_value_type::Bool = false) where {S<:Real, Snew<:Real, T <: Number, U <: Transform}
+                      change_value_type::Bool = false) where {S<:Real, Snew<:Real, T <: Number, U <: Transform}
     p.fixed && return p    # if the parameter is fixed, don't change its value
     if !change_value_type && (typeof(p.value) != typeof(newvalue))
         error("Type of newvalue $(newvalue) does not match the type of the current value for parameter $(string(p.key)). Set keyword change_value_type = true if you want to overwrite the type of the parameter value.")
@@ -1173,8 +1172,10 @@ function update!(pvec::ParameterVector, values::AbstractVector{T};
         map!(tmp, pvec, pvec, values)
     else
         if typeof(pvec[1]) <: ParameterAD
+
             map!(parameter_ad, pvec, pvec, values[1:length(pvec)])
         else
+
             map!(parameter, pvec, pvec, values[1:length(pvec)])
         end
         # It is assumed that, if regime-switching, the regimes are toggled to regime 1 before calling update!
@@ -1190,10 +1191,12 @@ function update!(pvec::ParameterVector, values::AbstractVector{T};
                 if haskey(para.regimes, :value)
                     for key in keys(para.regimes[:value])
                         if key == 1
+
                             set_regime_val!(para, key, para.value)
                         else
                             # Note that set_regime_val! handles what to do if para is fixed, enforce valuebounds, etc.
                             i += 1
+
                             set_regime_val!(para, key, values[i])
                         end
                     end

src/regimes.jl

@@ -25,6 +25,7 @@ function set_regime_val!(p::Parameter{S},
         p.regimes[:value] = OrderedDict{Int,S}()
     end
 
+
     # First check if fixed and enforce valuebounds so
     # `set_regime_val!` mirrors `parameter(p::Parameter, newvalue::S)` functionality
     if haskey(p.regimes, :fixed) && haskey(p.regimes[:fixed], i) ? regime_fixed(p, i) : false
@@ -41,7 +42,7 @@ function set_regime_val!(p::Parameter{S},
         p.regimes[:value][i] = v
     elseif (p.valuebounds[1] <= v <= p.valuebounds[2]) || override_bounds
         p.regimes[:value][i] = v
-    elseif p.fixed
+    elseif p.fixed && regime_fixed(p,i)
         # When parameters are initialized as non-regime-switching and fixed,
         # the valuebounds is automatically set to (p.value, p.value).
         # Unless valuebounds are set to regime-switching, it is not possible
@@ -52,6 +53,7 @@ function set_regime_val!(p::Parameter{S},
                                "keyword `override_bounds` is set to `true`."))
     else
         throw(ParamBoundsError("New value of $(string(p.key)) ($(v)) is out of bounds ($(p.valuebounds))"))
+
     end
     return v
 end
@@ -324,7 +326,7 @@ function toggle_regime!(p::Parameter{S}, i::Int) where S <: Real
                     p.fixed = p.regimes[field][i]
                 end
             elseif haskey(p.regimes, field) && !haskey(p.regimes[field], i)
-                error("Regime $i for field $field not found")
+                error("Regime $i for field $field not found for parameter $(p.key)")
             end
         end
     end