From e58002488f04233a6ba9217e981f3d4828d51a3f Mon Sep 17 00:00:00 2001 From: Gregor Boehl Date: Fri, 23 Jun 2023 11:43:52 +0200 Subject: [PATCH 1/3] bump version --- docs/guide/installation.rst | 3 ++- econpizza/__version__.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/guide/installation.rst b/docs/guide/installation.rst index 678c1ef..2d607de 100644 --- a/docs/guide/installation.rst +++ b/docs/guide/installation.rst @@ -1,7 +1,7 @@ Installation ============ -The package is under active development. Stable releases can be installed from the official Python repositories, which are updated frequently. The `changelog and release history `_ can be found on GitHub. +The package is under active development. Stable releases can be installed from the official Python repositories, which are updated frequently. Installing the `repository version `_ from PyPi is as simple as typing @@ -12,3 +12,4 @@ Installing the `repository version `_ from in your terminal or Anaconda Prompt. The current version is supporting Python versions 3.9 to 3.11 on Windows, Mac and Linux. +The `changelog and release history `_ can be found on GitHub. diff --git a/econpizza/__version__.py b/econpizza/__version__.py index 2b4562d..1ab444e 100644 --- a/econpizza/__version__.py +++ b/econpizza/__version__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -__version__ = '0.5.6' +__version__ = '0.6.0' From a0ccd28f3a7b80b12d7639af55b0a2bfd48403b4 Mon Sep 17 00:00:00 2001 From: Andreas Koundouros Date: Tue, 27 Jun 2023 10:17:46 +0200 Subject: [PATCH 2/3] correct marginal costs in HANK1 examples w/ and w/o end. labor --- econpizza/examples/hank_labor.yml | 8 +++++--- econpizza/examples/hank_with_comments.yml | 14 ++++++++------ 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/econpizza/examples/hank_labor.yml b/econpizza/examples/hank_labor.yml index 4f1fac8..01e70d5 100644 --- a/econpizza/examples/hank_labor.yml +++ b/econpizza/examples/hank_labor.yml @@ -10,7 +10,7 @@ functions_file: 'hank_labor_functions.py' definitions: | from jax.numpy import log, maximum from econpizza.tools import percentile, jax_print -variables: [ div, y, y_prod, w, pi, R, Rn, Rr, Rstar, tax, z, beta, C, N, B, Top10C, Top10A ] +variables: [ div, mc, y, y_prod, w, pi, R, Rn, Rr, Rstar, tax, z, beta, C, N, B, Top10C, Top10A ] parameters: [ sigma_c, sigma_l, theta, psi, phi_pi, phi_y, rho, rho_beta, rho_r, rho_z, chi ] shocks: [ e_beta, e_rstar, e_z ] @@ -55,7 +55,8 @@ equations: ~ N = y_prod/z # production function ~ div = - w*N + (1 - psi*(pi/piSS - 1)**2/2)*y_prod # dividends ~ y = (1 - psi*(pi/piSS - 1)**2/2)*y_prod # "effective" output - ~ psi*(pi/piSS - 1)*pi/piSS = (1-theta) + theta*w/z + psi*piPrime/R*(piPrime/piSS - 1)*piPrime/piSS*y_prodPrime/y_prod # NKPC + ~ psi*(pi/piSS - 1)*pi/piSS = (1-theta) + theta*mc + psi*piPrime/R*(piPrime/piSS - 1)*piPrime/piSS*y_prodPrime/y_prod # NKPC + ~ mc = w/z # marginal costs # government ~ Rr = RLag/pi # real rate ex-post @@ -92,7 +93,8 @@ steady_state: z: 1. # technology pi: 1.0 # inflation B: 5.6 # bond supply - w: (theta-1)/theta # wages + mc: (theta-1)/theta # marginal costs + w: mc*z div: 1 - w*N # dividends Rstar: 1.002 # steady stat target rate diff --git a/econpizza/examples/hank_with_comments.yml b/econpizza/examples/hank_with_comments.yml index bfc5641..12d5437 100644 --- a/econpizza/examples/hank_with_comments.yml +++ b/econpizza/examples/hank_with_comments.yml @@ -18,7 +18,7 @@ definitions: | from econpizza.tools import percentile, jax_print # these lists define the relevant models objects -variables: [ div, y, y_prod, w, pi, R, Rn, Rr, Rstar, tax, z, beta, C, n, B, Top10C, Top10A ] +variables: [ div, mc, y, y_prod, w, pi, R, Rn, Rr, Rstar, tax, z, beta, C, n, B, Top10C, Top10A ] parameters: [ sigma_c, sigma_l, theta, psi, phi_pi, phi_y, rho, rho_beta, rho_r, rho_z ] shocks: [ e_beta, e_rstar, e_z ] @@ -89,7 +89,8 @@ equations: ~ n = y_prod/z # production function ~ div = -w*n + (1 - psi*(pi/piSS - 1)**2/2)*y_prod # dividends ~ y = (1 - psi*(pi/piSS - 1)**2/2)*y_prod # "effective" output - ~ psi*(pi/piSS - 1)*pi/piSS = (1-theta) + theta*w + psi*piPrime/R*(piPrime/piSS - 1)*piPrime/piSS*y_prodPrime/y_prod # NKPC + ~ psi*(pi/piSS - 1)*pi/piSS = (1-theta) + theta*mc + psi*piPrime/R*(piPrime/piSS - 1)*piPrime/piSS*y_prodPrime/y_prod # NKPC + ~ mc = w/z # marginal costs # government ~ tax = (Rr-1)*BLag # balanced budget @@ -129,10 +130,11 @@ steady_state: beta: 0.98 # discount factor B: 5.6 # bond supply # definitions can be recursive: theta is defined above - w: (theta-1)/theta # wages - n: w**(1/sigma_l) # labor supply - div: 1 - w*n # dividends - z: y/n # technology + mc: (theta-1)/theta # marginal costs + #w: mc*z # wages + #n: w**(1/sigma_l) # labor supply + #div: 1 - w*n # dividends + #z: y/n # technology init_guesses: Rstar: 1.002 # steady state target rage From 79a615969173c9858d4bed0dc5f810fd56ebdda2 Mon Sep 17 00:00:00 2001 From: Gregor Boehl Date: Tue, 27 Jun 2023 11:43:14 +0200 Subject: [PATCH 3/3] fix grgrjax dep + fix tests --- econpizza/examples/hank_with_comments.yml | 8 ++++---- econpizza/testing/cache/hank_labor.npy | Bin 7064 -> 7472 bytes econpizza/testing/cache/hank_solid.npy | Bin 2984 -> 3152 bytes requirements.txt | 2 +- setup.py | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/econpizza/examples/hank_with_comments.yml b/econpizza/examples/hank_with_comments.yml index 12d5437..9235e3a 100644 --- a/econpizza/examples/hank_with_comments.yml +++ b/econpizza/examples/hank_with_comments.yml @@ -131,10 +131,10 @@ steady_state: B: 5.6 # bond supply # definitions can be recursive: theta is defined above mc: (theta-1)/theta # marginal costs - #w: mc*z # wages - #n: w**(1/sigma_l) # labor supply - #div: 1 - w*n # dividends - #z: y/n # technology + w: (mc*y)**(sigma_l/(1+sigma_l)) # wages + n: w**(1/sigma_l) # labor supply + z: y/n # technology + div: 1 - w*n # dividends init_guesses: Rstar: 1.002 # steady state target rage diff --git a/econpizza/testing/cache/hank_labor.npy b/econpizza/testing/cache/hank_labor.npy index d3c1fd283b762631d95ef0b40aa79a09c469b8f8..51f12a60f77644350f4583316f7477e03e11fed7 100644 GIT binary patch literal 7472 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 diff --git a/econpizza/testing/cache/hank_solid.npy b/econpizza/testing/cache/hank_solid.npy index 566fb68296a22aa0c894fdad151b81a2361400a0..db9ef866d9c6893a54d5c026d9130360f8139c58 100644 GIT binary patch literal 3152 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 diff --git a/requirements.txt b/requirements.txt index c8ad7d2..763a4ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # ubuntu seems to have issues with jax v0.4.6. Recheck when v0.4.7 is out jax>=0.4.13 jaxlib>=0.4.13 -grgrjax>=0.4.3 +grgrjax>=0.4.4 scipy pyyaml pytest diff --git a/setup.py b/setup.py index da671ec..2380506 100644 --- a/setup.py +++ b/setup.py @@ -36,7 +36,7 @@ install_requires=[ "jax>=0.4.13", "jaxlib>=0.4.13", - "grgrjax>=0.4.3", + "grgrjax>=0.4.4", "pyyaml", "scipy", ],