WIP

EconForge · Sep 13, 2023 · 866b749 · 866b749
1 parent 0ffa98f
commit 866b749
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/algos/simul.jl b/src/algos/simul.jl
@@ -5,8 +5,9 @@ end
 
 ### transition function
 
-function τ(dmodel::Dolo.DYModel{M}, ss::T, a::SVector) where M<:Union{Dolo.YModel{<:Dolo.VAR1},Dolo.YModel{<:Dolo.MarkovChain}}  where T<:QP
 
+# TODO We should differentiate here whether dproc has a markov chain or something else
+function τ(dmodel::Dolo.DYModel{M}, ss::T, a::SVector) where M<:Union{Dolo.YModel{<:Dolo.VAR1},Dolo.YModel{<:Dolo.MarkovChain}}  where T<:QP
 
     (i,_) = ss.loc
     s_ = ss.val
@@ -21,7 +22,9 @@ function τ(dmodel::Dolo.DYModel{M}, ss::T, a::SVector) where M<:Union{Dolo.YMod
             P[i,j],
             let 
                 S_exo = Q[j]
-                S_endo = SVector(transition(dmodel.model, s_, a, Q[j])...)
+                S_endo = SVector(
+                    transition(dmodel.model, s_, a, Q[j])...
+                )
                 S = SVector(S_exo..., S_endo...)
                 QP((j,S_endo),S)
                 # (loc=(j,S_endo),val=S)

diff --git a/src/utils.jl b/src/utils.jl
@@ -99,9 +99,10 @@ function calibrated(model::YModel, group)
     elseif group==:exogenous
         vars = variables(model.exogenous)
     elseif group==:parameters
-       return SVector(
-            (v for (k,v) in model.calibration if 
-                !(k in union(variables(model.states), variables(model.controls), variables(model.exogenous)))
+        vars = union(variables(model.states), variables(model.controls), variables(model.exogenous))
+        return SVector(
+            (v for (k,v) in pairs(model.calibration) if 
+                !(k in vars)
             )...
        )
     else