From 2d3fdc32584935da116019f88381f1e432cfe01e Mon Sep 17 00:00:00 2001 From: mmcky Date: Thu, 8 Apr 2021 10:48:13 +1000 Subject: [PATCH 1/6] update QuantEcon.py https://github.com/QuantEcon/QuantEcon.py/pull/569 --- lectures/linear_models.md | 4 ++-- lectures/perm_income_cons.md | 2 +- lectures/samuelson.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lectures/linear_models.md b/lectures/linear_models.md index aeaeb9aa9..cc48009d2 100644 --- a/lectures/linear_models.md +++ b/lectures/linear_models.md @@ -734,7 +734,7 @@ sample_size = 500_000 ar = LinearStateSpace(A_2, C_2, G_2, mu_0=np.ones(4)) fig, ax = plt.subplots() x, y = ar.simulate(sample_size) -mu_x, mu_y, Sigma_x, Sigma_y = ar.stationary_distributions() +mu_x, mu_y, Sigma_x, Sigma_y, Sigma_yx = ar.stationary_distributions() f_y = norm(loc=float(mu_y), scale=float(np.sqrt(Sigma_y))) y = y.flatten() ygrid = np.linspace(ymin, ymax, 150) @@ -920,7 +920,7 @@ def cross_plot(A, ar = LinearStateSpace(A, C, G, mu_0=np.ones(4)) if steady_state == 'True': - μ_x, μ_y, Σ_x, Σ_y = ar.stationary_distributions() + μ_x, μ_y, Σ_x, Σ_y, Σ_yx = ar.stationary_distributions() ar_state = LinearStateSpace(A, C, G, mu_0=μ_x, Sigma_0=Σ_x) ymin, ymax = -0.6, 0.6 diff --git a/lectures/perm_income_cons.md b/lectures/perm_income_cons.md index 2fefa8fb9..2c5def65d 100644 --- a/lectures/perm_income_cons.md +++ b/lectures/perm_income_cons.md @@ -345,7 +345,7 @@ G = np.array([[0., 1., 0.]]) μ_z0 = np.array([[1.0], [0.0], [0.0]]) Σ_z0 = np.zeros((3, 3)) Lz = qe.LinearStateSpace(A, C, G, mu_0=μ_z0, Sigma_0=Σ_z0) -μ_z, μ_y, Σ_z, Σ_y = Lz.stationary_distributions() +μ_z, μ_y, Σ_z, Σ_y, Σ_yx = Lz.stationary_distributions() # Mean vector of state for the savings problem mxo = np.vstack([μ_z, 0.0]) diff --git a/lectures/samuelson.md b/lectures/samuelson.md index 244658e52..c1918f4db 100644 --- a/lectures/samuelson.md +++ b/lectures/samuelson.md @@ -1316,7 +1316,7 @@ class SamuelsonLSS(LinearStateSpace): # values for simulation if stationary == True: try: - self.μ_x, self.μ_y, self.σ_x, self.σ_y = \ + self.μ_x, self.μ_y, self.σ_x, self.σ_y, self.σ_yx = \ self.stationary_distributions() self.μ_0 = self.μ_y self.Σ_0 = self.σ_y From ae06af997ab39f79d75fb1664943f88aa36bf49f Mon Sep 17 00:00:00 2001 From: mmcky Date: Thu, 8 Apr 2021 12:22:24 +1000 Subject: [PATCH 2/6] catch execution errors for CI --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4cc2c646..64de906d0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,7 @@ jobs: - name: Build HTML shell: bash -l {0} run: | - jb build lectures --path-output ./ + jb build -W --keep-going lectures --path-output ./ - name: Save Build as Artifact uses: actions/upload-artifact@v1 with: From d0219c6c444814703fca0c17728a57c68884b2cb Mon Sep 17 00:00:00 2001 From: mmcky Date: Fri, 16 Apr 2021 14:37:22 +1000 Subject: [PATCH 3/6] TEST: test against new release of QuantEcon --- environment.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/environment.yml b/environment.yml index 5b5a2f2b4..6d3618ebf 100644 --- a/environment.yml +++ b/environment.yml @@ -15,4 +15,5 @@ dependencies: - jupytext - ghp-import - jupinx + - git+https://github.com/quantecon/QuantEcon.py@new-release From 0cd5656572bb3274e34986de57aadae112b4c4cf Mon Sep 17 00:00:00 2001 From: mmcky Date: Fri, 16 Apr 2021 14:51:12 +1000 Subject: [PATCH 4/6] add .git for install from quantecon.py@new-release --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 35f93e504..5f7a86d4c 100644 --- a/environment.yml +++ b/environment.yml @@ -17,5 +17,5 @@ dependencies: - jupinx # Temporary Fixes - tornado>=6.1 - - git+https://github.com/quantecon/QuantEcon.py@new-release + - git+https://github.com/quantecon/QuantEcon.py.git@new-release From 6303fbc41940294caa687c3a81e15ffa2b7398ec Mon Sep 17 00:00:00 2001 From: mmcky Date: Fri, 16 Apr 2021 14:57:52 +1000 Subject: [PATCH 5/6] use correct branch name --- environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment.yml b/environment.yml index 5f7a86d4c..027d98ec5 100644 --- a/environment.yml +++ b/environment.yml @@ -17,5 +17,5 @@ dependencies: - jupinx # Temporary Fixes - tornado>=6.1 - - git+https://github.com/quantecon/QuantEcon.py.git@new-release + - git+https://github.com/quantecon/QuantEcon.py.git@new-version From 9428a59b610ab4d6f8544fc4e71c032ff40b8541 Mon Sep 17 00:00:00 2001 From: mmcky Date: Mon, 19 Apr 2021 12:23:40 +1000 Subject: [PATCH 6/6] update environment --- environment.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 027d98ec5..38cdc94bd 100644 --- a/environment.yml +++ b/environment.yml @@ -8,7 +8,7 @@ dependencies: - pip: - jupyter-book - sphinx-multitoc-numbering - - git+https://github.com/quantecon/quantecon-book-theme + - quantecon-book-theme - sphinx-tojupyter - sphinxext-rediraffe - sphinx-exercise @@ -17,5 +17,4 @@ dependencies: - jupinx # Temporary Fixes - tornado>=6.1 - - git+https://github.com/quantecon/QuantEcon.py.git@new-version