From 38c85eac29753c0f270f15c7f387ebe42d0c6a8a Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 13 Aug 2024 05:11:30 -0400 Subject: [PATCH 1/8] change range of nominal ubi parameters --- ogcore/default_parameters.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ogcore/default_parameters.json b/ogcore/default_parameters.json index 23e4018b5..f642435e3 100644 --- a/ogcore/default_parameters.json +++ b/ogcore/default_parameters.json @@ -1254,7 +1254,7 @@ "description": "Dollar (nominal) amount of universal basic income (UBI) per child age 0 through 17.", "section_1": "Fiscal Policy Parameters", "section_2": "Spending", - "notes": "The universal basic income (UBI) per child ages 0 through 17 can range from $0 per year to $7,200 per year (max $600 per month).", + "notes": "The universal basic income (UBI) per child ages 0 through 17 can take positive or negative values (e.g., a negative value may be used to implement a head tax).", "type": "float", "value": [ { @@ -1263,8 +1263,8 @@ ], "validators": { "range": { - "min": 0.0, - "max": 7200.0 + "min": -99e9, + "max": 99e9 } } }, @@ -1273,7 +1273,7 @@ "description": "Dollar (nominal) amount of universal basic income (UBI) per adult age 18 to 64.", "section_1": "Fiscal Policy Parameters", "section_2": "Spending", - "notes": "The universal basic income (UBI) per adult age 18 through 64 can range from $0 per year to $18,000 per year ($1,500 per month).", + "notes": "The universal basic income (UBI) per adult age 18 through 64 can take positive or negative values (e.g., a negative value may be used to implement a head tax).", "type": "float", "value": [ { @@ -1282,8 +1282,8 @@ ], "validators": { "range": { - "min": 0.0, - "max": 18000.0 + "min": -99e9, + "max": 99e9 } } }, @@ -1292,7 +1292,7 @@ "description": "Dollar (nominal) amount of universal basic income (UBI) per adult age 65 and over.", "section_1": "Fiscal Policy Parameters", "section_2": "Spending", - "notes": "The universal basic income (UBI) per adult age 65 and over can range from $0 per year to $12,000 per year ($1,000 per month).", + "notes": "The universal basic income (UBI) per adult age 65 can take positive or negative values (e.g., a negative value may be used to implement a head tax).", "type": "float", "value": [ { @@ -1301,8 +1301,8 @@ ], "validators": { "range": { - "min": 0.0, - "max": 12000.0 + "min": 99e9, + "max": -99e9 } } }, From 1f923cefae80402565ec9d9212f1feab31a4d796 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 13 Aug 2024 05:12:52 -0400 Subject: [PATCH 2/8] add description of alpha_I --- ogcore/default_parameters.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogcore/default_parameters.json b/ogcore/default_parameters.json index f642435e3..7629d11dc 100644 --- a/ogcore/default_parameters.json +++ b/ogcore/default_parameters.json @@ -730,7 +730,7 @@ }, "alpha_I": { "title": "Exogenous fraction of GDP that goes towards government investment in infrastructure (public capital)", - "description": "", + "description": "Exogenous fraction of GDP that goes towards government investment in infrastructure (public capital)", "section_1": "Fiscal Policy Parameters", "section_2": "Spending", "notes": "", From 3cb193f8f143d77799654b6c95f45e4fec4ab9b1 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 13 Aug 2024 05:18:54 -0400 Subject: [PATCH 3/8] fix range --- ogcore/default_parameters.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ogcore/default_parameters.json b/ogcore/default_parameters.json index 7629d11dc..c464129ca 100644 --- a/ogcore/default_parameters.json +++ b/ogcore/default_parameters.json @@ -1301,8 +1301,8 @@ ], "validators": { "range": { - "min": 99e9, - "max": -99e9 + "min": -99e9, + "max": 99e9 } } }, From c8ba5ed2779e7927d63b378006abb6df95d132f6 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 13 Aug 2024 05:19:15 -0400 Subject: [PATCH 4/8] extrapolate alpha_I --- ogcore/parameters.py | 1 + 1 file changed, 1 insertion(+) diff --git a/ogcore/parameters.py b/ogcore/parameters.py index f900d5bd9..fd653da1b 100644 --- a/ogcore/parameters.py +++ b/ogcore/parameters.py @@ -158,6 +158,7 @@ def compute_default_params(self): tp_param_list = [ "alpha_G", "alpha_T", + "alpha_I", "world_int_rate_annual", "adjustment_factor_for_cit_receipts", "tau_bq", From 6490c1f645a0d9d3c7779815c530f5ad04f104e6 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 13 Aug 2024 05:35:19 -0400 Subject: [PATCH 5/8] make sure vectors conform --- ogcore/TPI.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ogcore/TPI.py b/ogcore/TPI.py index 15016fcd0..34a9aad2c 100644 --- a/ogcore/TPI.py +++ b/ogcore/TPI.py @@ -593,7 +593,7 @@ def run_TPI(p, client=None): if p.baseline_spending: I_g[: p.T] = Ig_baseline[: p.T] else: - I_g = fiscal.get_I_g(Y, p.alpha_I) + I_g = fiscal.get_I_g(Y[:p.T], p.alpha_I[:p.T]) if p.baseline: K_g0 = p.initial_Kg_ratio * Y[0] else: @@ -945,7 +945,7 @@ def run_TPI(p, client=None): B[: p.T], K_demand_open_vec.sum(-1), D_d[: p.T], p.zeta_K[: p.T] ) if not p.baseline_spending: - I_g = fiscal.get_I_g(Y, p.alpha_I) + I_g = fiscal.get_I_g(Y[:p.T], p.alpha_I[:p.T]) if p.baseline: K_g0 = p.initial_Kg_ratio * Y[0] K_g = fiscal.get_K_g(K_g0, I_g, p, "TPI") From 851c361bf6e8975e9bfb8742d4db42b090341a12 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 13 Aug 2024 05:51:12 -0400 Subject: [PATCH 6/8] format --- ogcore/TPI.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ogcore/TPI.py b/ogcore/TPI.py index 34a9aad2c..52765667b 100644 --- a/ogcore/TPI.py +++ b/ogcore/TPI.py @@ -593,7 +593,7 @@ def run_TPI(p, client=None): if p.baseline_spending: I_g[: p.T] = Ig_baseline[: p.T] else: - I_g = fiscal.get_I_g(Y[:p.T], p.alpha_I[:p.T]) + I_g = fiscal.get_I_g(Y[: p.T], p.alpha_I[: p.T]) if p.baseline: K_g0 = p.initial_Kg_ratio * Y[0] else: @@ -945,7 +945,7 @@ def run_TPI(p, client=None): B[: p.T], K_demand_open_vec.sum(-1), D_d[: p.T], p.zeta_K[: p.T] ) if not p.baseline_spending: - I_g = fiscal.get_I_g(Y[:p.T], p.alpha_I[:p.T]) + I_g = fiscal.get_I_g(Y[: p.T], p.alpha_I[: p.T]) if p.baseline: K_g0 = p.initial_Kg_ratio * Y[0] K_g = fiscal.get_K_g(K_g0, I_g, p, "TPI") From 67db0e8e3862c04d16584963892d12b3b109f525 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Tue, 13 Aug 2024 22:54:25 -0400 Subject: [PATCH 7/8] bump version and update changelog --- CHANGELOG.md | 15 +++++++++++++++ ogcore/__init__.py | 2 +- setup.py | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 892b933b9..eb27070ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.11.16] - 2024-08-13 12:00:00 + +### Added + +- Description of `alpha_I` in docs +- Updates valide range of the nominal UBI parameters + +### Bug Fix + +- Extrapolate `alpha_I` +- Ensure `alpha_I` shape conforms in `TPI.py` +- Fix formatting of labels in `constants.py` + +- ## [0.11.15] - 2024-07-30 12:00:00 ### Bug Fix @@ -282,6 +296,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Version [0.7.0] on August 30, 2021 was the first time that the OG-USA repository was detached from all of the core model logic, which was named OG-Core. Before this version, OG-USA was part of what is now the [`OG-Core`](https://github.com/PSLmodels/OG-Core) repository. In the next version of OG-USA, we adjusted the version numbering to begin with 0.1.0. This initial version of 0.7.0, was sequential from what OG-USA used to be when the OG-Core project was called OG-USA. - Any earlier versions of OG-USA can be found in the [`OG-Core`](https://github.com/PSLmodels/OG-Core) repository [release history](https://github.com/PSLmodels/OG-Core/releases) from [v.0.6.4](https://github.com/PSLmodels/OG-Core/releases/tag/v0.6.4) (Jul. 20, 2021) or earlier. +[0.11.16]: https://github.com/PSLmodels/OG-Core/compare/v0.11.15...v0.11.16 [0.11.15]: https://github.com/PSLmodels/OG-Core/compare/v0.11.14...v0.11.15 [0.11.14]: https://github.com/PSLmodels/OG-Core/compare/v0.11.13...v0.11.14 [0.11.13]: https://github.com/PSLmodels/OG-Core/compare/v0.11.11...v0.11.13 diff --git a/ogcore/__init__.py b/ogcore/__init__.py index e901b4fe9..18ff55530 100644 --- a/ogcore/__init__.py +++ b/ogcore/__init__.py @@ -20,4 +20,4 @@ from ogcore.txfunc import * from ogcore.utils import * -__version__ = "0.11.15" +__version__ = "0.11.16" diff --git a/setup.py b/setup.py index d6ab47615..f430ca8d7 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setuptools.setup( name="ogcore", - version="0.11.15", + version="0.11.16", author="Jason DeBacker and Richard W. Evans", license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", description="A general equilibribum overlapping generations model for fiscal policy analysis", From f96b39186dfb92343d9db3412fc5d6c504e6b3da Mon Sep 17 00:00:00 2001 From: jdebacker Date: Sun, 18 Aug 2024 22:29:57 -0400 Subject: [PATCH 8/8] fix typos, update release date --- CHANGELOG.md | 6 ++---- setup.py | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a34788940..9c328e72f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [0.11.17] - 2024-08-14 12:00:00 +## [0.11.17] - 2024-08-18 12:00:00 ### Added @@ -14,12 +14,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Bug Fix -- Extrapolate `alpha_I` +- Extrapolate `alpha_I` in `parameters.py` - Ensure `alpha_I` shape conforms in `TPI.py` - Fix formatting of labels in `constants.py` -- - ## [0.11.16] - 2024-08-10 12:00:00 ### Added diff --git a/setup.py b/setup.py index b480e7562..b84cfb189 100755 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ version="0.11.17", author="Jason DeBacker and Richard W. Evans", license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication", - description="A general equilibribum overlapping generations model for fiscal policy analysis", + description="A general equilibrium overlapping generations model for fiscal policy analysis", long_description_content_type="text/markdown", long_description=longdesc, url="https://github.com/PSLmodels/OG-Core/",