Merge pull request #7 from thorek1:ready_for_PR

Ready_for_PR

.github/workflows/CompatHelper.yml

@@ -15,7 +15,7 @@ jobs:
         run: which julia
         continue-on-error: true
       - name: Install Julia, but only if it is not already available in the PATH
-        uses: julia-actions/setup-julia@v1
+        uses: julia-actions/setup-julia@latest
         with:
           version: '1'
           arch: ${{ runner.arch }}

.github/workflows/ci.yml

@@ -4,25 +4,31 @@ on:
 #   - pull_request
 jobs:
   test:
+    env: 
+      GKS_ENCODING: "utf8"
+      GKSwstype: "nul"
     name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         version:
-#           - '1.0'
-          - '1.8'
-          # - 'nightly'
+          - '1'
+          # - '^1.9.0-0' #^1-0 and ^1.9-0 are not recognised
+          # - 'nightly' # fails
         os:
           - ubuntu-latest
-          # - macOS-latest
-          # - windows-latest
+          # - macOS-latest #slow
+          # - windows-latest #slow
         arch:
           - x64
-          # - aarch64
+          # - aarch64 #fails (wrong naming?)
+        include:
+          - os: ubuntu-latest
+            prefix: xvfb-run
     steps:
       - uses: actions/checkout@v3
-      - uses: julia-actions/setup-julia@v1
+      - uses: julia-actions/setup-julia@latest
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
@@ -37,9 +43,12 @@ jobs:
             ${{ runner.os }}-test-
             ${{ runner.os }}-
       - run: pip3 install sympy
-      - uses: julia-actions/julia-buildpkg@v1
-      - uses: julia-actions/julia-runtest@v1
-      - uses: julia-actions/julia-processcoverage@v1
+      - uses: julia-actions/julia-buildpkg@latest
+      - uses: julia-actions/julia-runtest@latest
+        with:
+          prefix: ${{ matrix.prefix }}  # for `xvfb-run`
+
+      - uses: julia-actions/julia-processcoverage@latest
       - uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/documentation.yml

@@ -9,14 +9,17 @@ on:
 
 jobs:
   build:
+    env: 
+      GKS_ENCODING: "utf8"
+      GKSwstype: "nul"
     permissions:
       contents: write
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: julia-actions/setup-julia@v1
+      - uses: julia-actions/setup-julia@latest
         with:
-          version: '1.8'
+          version: '1'
       - run: pip3 install sympy
       - name: Install dependencies
         run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
@@ -26,6 +29,6 @@ jobs:
           DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # If authenticating with SSH deploy key
         #run: julia --project=docs/ docs/make.jl      
         run: julia --project=docs/ --code-coverage=user docs/make.jl
-      - uses: julia-actions/julia-processcoverage@v1
+      - uses: julia-actions/julia-processcoverage@latest
       - uses: codecov/codecov-action@v3
 

.gitignore

@@ -31,8 +31,16 @@ Manifest.toml
 *.java
 .vscode
 *.pdf
-*.csv
+# *.csv
 *.gz
 *.log
 .ipynb_checkpoints/
-*.svg
+*.svg
+irf*.png
+*.xls
+test/fix_RBC.jl
+test/fix_SW03_SS.jl
+test/fix_sw03.jl
+test/figure out SS.jl
+test/debug_test.jl
+test/macrotoolstest.jl

Project.toml

@@ -1,4 +1,3 @@
-
 name = "MacroModelling"
 uuid = "687ffad2-3618-405e-ac50-e0f7b9c75e44"
 authors = ["Thore Kockerols <[email protected]>"]
@@ -8,6 +7,7 @@ version = "0.1.0"
 AxisKeys = "94b1ba4f-4ee9-5380-92f1-94cde586c3c5"
 BlockTriangularForm = "adeb47b7-70bf-415a-bb24-c358563e873a"
 ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
+DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
 FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
@@ -16,6 +16,7 @@ LaTeXStrings = "b964fa9f-0449-5b57-a5c2-d3ea65f4040f"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 LinearMaps = "7a12625a-238d-50fd-b39a-03d52299707e"
 MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
+NLboxsolve = "57734975-34ee-4662-b82a-2ecfa01d03df"
 Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
 OptimizationNLopt = "4e6fcdb7-1186-4e1f-a706-475e75c168bb"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
@@ -29,26 +30,27 @@ Subscripts = "2b7f82d5-8785-4f63-971e-f18ddbeb808e"
 SymPy = "24249f21-da20-56a4-8eb1-6a02cf4ae2e6"
 
 [compat]
-julia = "1.8"
-AxisKeys =  "^0.2"
-BlockTriangularForm =  "^0.1"
-ComponentArrays =  "^0.13"
-DocStringExtensions =  "^0.9"
-FiniteDifferences =  "^0.12"
-ForwardDiff =  "^0.10"
-IterativeSolvers =  "^0.9"
-LaTeXStrings =  "^1"
-LinearMaps =  "^3"
-MacroTools =  "^0.5"
-Optimization =  "^3"
-OptimizationNLopt =  "^0.1"
+AxisKeys = "^0.2"
+BlockTriangularForm = "^0.1"
+ComponentArrays = "^0.13"
+DocStringExtensions = "^0.9"
+FiniteDifferences = "^0.12"
+ForwardDiff = "^0.10"
+IterativeSolvers = "^0.9"
+LaTeXStrings = "^1"
+LinearMaps = "^3"
+MacroTools = "^0.5"
+NLboxsolve = "^0.4"
+Optimization = "^3"
+OptimizationNLopt = "^0.1"
 Plots = "^1.36.3"
-RuntimeGeneratedFunctions =  "^0.5"
-SnoopPrecompile =  "^1"
-SpecialFunctions =  "^2"
-StatsFuns =  "^1"
-Subscripts =  "^0.1"
-SymPy =  "^1"
+RuntimeGeneratedFunctions = "^0.5"
+SnoopPrecompile = "^1"
+SpecialFunctions = "^2"
+StatsFuns = "^1"
+Subscripts = "^0.1"
+SymPy = "^1"
+julia = "1.8"
 
 [extras]
 FiniteDifferences = "26cc04aa-876d-5657-8c51-4c34ba976000"

docs/Project.toml

@@ -1,5 +1,17 @@
 [deps]
+ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
+CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
+DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
+DynamicPPL = "366bfd00-2699-11ea-058f-f148b4cae6d8"
+MCMCChains = "c7f686f2-ff18-58e9-bc7b-31028e88f75d"
+MCMCDiagnosticTools = "be115224-59cd-429b-ad48-344e309966f0"
+Optimization = "7f7a1694-90dd-40f0-9382-eb1efda571ba"
+OptimizationNLopt = "4e6fcdb7-1186-4e1f-a706-475e75c168bb"
+OptimizationOptimisers = "42dfb2eb-d2b4-4451-abcd-913932933ac1"
+Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
+StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
+Turing = "fce5fe82-541a-59a6-adf8-730c64b5f9a0"
 
 [compat]
 Documenter = "0.27"

docs/make.jl

@@ -10,7 +10,8 @@ makedocs(
     pages = ["Introduction" => "index.md",
     "Tutorials" => ["Installation" => "tutorials/install.md",
                     "RBC" => "tutorials/rbc.md",
-                    "Smets and Wouters (2003)" => "tutorials/sw03.md"],
+                    "Smets and Wouters (2003)" => "tutorials/sw03.md",
+                    "Estimation" => "tutorials/estimation.md"],
     # "How-to guides" => "how_to.md",
     # "Model syntax" => "dsl.md",
     "API" => "api.md",