Merge branch 'master' of https://github.com/EconForge/Dolo.jl

EconForge · Oct 28, 2024 · f6b60bd · f6b60bd
1 parent ca2beb4
commit f6b60bd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -13,6 +13,7 @@ DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 Dolang = "e5c7262c-e9d2-5620-ad8e-1af14eb8a8e3"
+DoloYAML = "5444aaa2-d204-4231-b785-bc52d56d058b"
 FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
 FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"
 Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0"
@@ -43,8 +44,8 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
 
 [weakdeps]
-Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
+Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 oneAPI = "8f75cd03-7ff8-4ecb-9b8f-daf728133b1b"
 
 [extensions]
@@ -53,5 +54,6 @@ DolooneAPIExt = "oneAPI"
 
 [compat]
 Dolang = "3.3.0"
+DoloYAML = "0.1.0"
 LabelledArrays = "≥1.16.0"
 Plots = "1.40.8"
diff --git a/demo.jl b/demo.jl
@@ -1,12 +1,15 @@
 using Dolo
 using DoloYAML
 
-# model = include("examples/ymodels/consumption_savings.jl")
-model = include("examples/ymodels/rbc_iid.yaml")
+model = include("examples/ymodels/consumption_savings_iid.jl")
+# model = include("examples/ymodels/rbc_iid.yaml")
+
 Dolo.time_iteration(model; improve=false)
 
 dmodel = Dolo.discretize(model)
 
+Dolo.time_iteration(dmodel)
+
 wk = Dolo.time_iteration_workspace(dmodel; improve=true)
 
 using FiniteDiff

diff --git a/src/Dolo.jl b/src/Dolo.jl
@@ -101,6 +101,8 @@ module Dolo
         using Dolo: YModel
         export SGrid, CGrid, CSpace, GSpace, CartesianSpace, GridSpace, transition, arbitrage, MvNormal, MarkovChain
         export YModel, bounds, reward
+        export rouwenhorst
+        export SMatrix, SVector
     end